Skip to content
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

Jump to bottom

Add optional checks for space/periods when renaming, depending on server #3085

Merged
merged 4 commits into from
Oct 8, 2024
Merged

Add optional checks for space/periods when renaming, depending on server #3085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59a75a6
WIP
mpivchev Oct 2, 2024
ab918ae
Merge branch 'develop' of https://github.com/nextcloud/ios into wcf-fix
mpivchev Oct 8, 2024
ccd005a
WIP
mpivchev Oct 8, 2024
1abe264
WIP
mpivchev Oct 8, 2024
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
10 changes: 0 additions & 10 deletions Nextcloud.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1731,7 +1731,6 @@
F7CE8AFB1DC1F8D8009CAE48 /* Share.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = Share.appex; sourceTree = BUILT_PRODUCTS_DIR; };
F7CEE5FE2BA9A5C9003EFD89 /* NCTrashGridCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCTrashGridCell.xib; sourceTree = "<group>"; };
F7CEE5FF2BA9A5C9003EFD89 /* NCTrashGridCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCTrashGridCell.swift; sourceTree = "<group>"; };
F7CF16A22A4D7C7A000FF107 /* NCMoreUserCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCMoreUserCell.xib; sourceTree = "<group>"; };
F7D1611F23CF19E30039EBBF /* NCViewerRichWorkspace.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCViewerRichWorkspace.storyboard; sourceTree = "<group>"; };
F7D1C4AB2C9484FD00EC6D44 /* NCMedia+CollectionViewDataSourcePrefetching.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCMedia+CollectionViewDataSourcePrefetching.swift"; sourceTree = "<group>"; };
F7D2C772246470CA008513AE /* XLForm.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XLForm.framework; path = Carthage/Build/iOS/XLForm.framework; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2073,14 +2072,6 @@
path = Tests;
sourceTree = "<group>";
};
F33AAF982A601465006ECCBD /* Recovered References */ = {
isa = PBXGroup;
children = (
F7CF16A22A4D7C7A000FF107 /* NCMoreUserCell.xib */,
);
name = "Recovered References";
sourceTree = "<group>";
};
F37208762BAB4B4B006B5430 /* Common */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -3147,7 +3138,6 @@
F70716E32987F81500E72C1D /* File Provider Extension UI.appex */,
C04E2F202A17BB4D001BAD85 /* NextcloudIntegrationTests.xctest */,
C0046CDA2A17B98400D87C9D /* NextcloudUITests.xctest */,
F33AAF982A601465006ECCBD /* Recovered References */,
);
sourceTree = "<group>";
};
Expand Down
2 changes: 0 additions & 2 deletions iOSClient/Extensions/UIAlertController+Extension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ extension UIAlertController {
textField.autocapitalizationType = .words
}

print(account)

// only allow saving if folder name exists
NotificationCenter.default.addObserver(
forName: UITextField.textDidChangeNotification,
Expand Down
3 changes: 2 additions & 1 deletion iOSClient/Supporting Files/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1110,8 +1110,9 @@
"_poll_desc_" = "Please complete the log in process in your browser";

// MARK: File name validator
"_file_name_validator_error_ends_with_space_period_" = "Name ends with a space or a period.";
"_file_name_validator_error_ends_with_space_period_" = "Name must not contain spaces at the beginning or end.";
"_file_name_validator_error_reserved_name_" = "\"%@\" is a forbidden name.";
"_file_name_validator_error_forbidden_file_extension_" = "\".%@\" is a forbidden file extension.";
"_file_name_validator_error_invalid_character_" = "Name contains an invalid character: \"%@\".";
"_file_name_validator_error_space_" = "Name must not contain spaces at the beginning or end.";
"_please_rename_file_" = "Please rename the file or folder.";
Loading