Skip to content

Nmc/2346 file conflict #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
harshada-15-tsys wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Nmc/2346 file conflict #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb8b1c2
NMC 2346 - More Details option removed from file conflict dialogue alert
TSI-amrutwaghmare Oct 9, 2023
a31b9c2
NMC 2346 - File Conflict changes
harshada-15-tsys Dec 15, 2025
de7fe34
NMC 2346 - File Conflict changes
harshada-15-tsys Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion iOSClient/Main/Create/NCCreateFormUploadConflict.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
cell.switchAlreadyExistingFile.onTintColor = NCBrandColor.shared.getElement(account: metadataNewFile.account)
cell.ocId = metadataNewFile.ocId
cell.delegate = self
cell.setBidiSafeFilename(metadataNewFile.fileNameView, isDirectory: metadataNewFile.directory, titleLabel: cell.labelFileName, extensionLabel: cell.labelExtensionFileName)
cell.labelFileName.text = metadataNewFile.fileNameView
cell.labelDetailAlreadyExistingFile.text = ""
cell.labelDetailNewFile.text = ""

Expand Down
1 change: 0 additions & 1 deletion iOSClient/Main/Create/NCCreateFormUploadConflictCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import UIKit
class NCCreateFormUploadConflictCell: UITableViewCell {

@IBOutlet weak var labelFileName: UILabel!
@IBOutlet weak var labelExtensionFileName: UILabel!

@IBOutlet weak var imageAlreadyExistingFile: UIImageView!
@IBOutlet weak var imageNewFile: UIImageView!
Expand Down
Loading