Commit Graph
17214 Commits
Author SHA1 Message Date
Matthew SetterandKevin Ottens eb0e7fa032 Correct incorrect reference to OSX Menu bar
This fixes https://github.com/owncloud/documentation/issues/4109.
2020-12-15 10:57:52 +01:00
Markus GoetzandKevin Ottens 215afba89e Share Dialog: Disable workaround for macOS too #6185 2020-12-15 10:57:52 +01:00
Christian KammandKevin Ottens 6347aeeed2 CMake: Add a default placeholder_suffix
To make themes work that don't define it explicitly.
2020-12-15 10:57:51 +01:00
Markus GoetzandKevin Ottens 8dcfd50a7d Placeholders: Support for macOS #6290 2020-12-15 10:57:51 +01:00
Olivier GoffartandKevin Ottens 600b1a72c1 Fix test: QTemporaryDir::filePath was added in Qt 5.9 2020-12-15 10:57:51 +01:00
Christian KammandKevin Ottens 765c12dae1 LocalDiscoveryTracker: Separate from Folder and move to libsync
To allow relevant code to be closer together and for testing in
unittests without having to get a gui Folder.

See #6120
2020-12-15 10:57:51 +01:00
Olivier GoffartandKevin Ottens 7969067f80 Logger: Guard zlib usage by ZLIB_FOUND
Similar to the use for the checksum.
I know that zlib is required in principle, but i don't have it
in one of my test building environment, and it is easier to just
disable it.
2020-12-15 10:57:51 +01:00
Kevin Ottens b1dc14977f Get TestDownload to pass
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 10:57:51 +01:00
Olivier GoffartandKevin Ottens 4eb8997519 Download: Remove useless code and add a test
From issue #7015, the code is wrong because the path is the file system path and
not the path on the DB.
But since this is a conflict, this means the reconcile will still want to download
the file from the server next sync, so we need not to worry about this case
2020-12-15 10:57:50 +01:00
Olivier GoffartandKevin Ottens 718843ffce Download: Use the <s:message> from the reply in the error message if any
Issue: #6459
2020-12-15 10:57:50 +01:00
Olivier GoffartandKevin Ottens 50223d889b Add a test for resuming downloads 2020-12-15 10:57:50 +01:00
Christian KammandKevin Ottens 9c6a76d280 Doc: Add showExperimentalOptions to conffile.rst 2020-12-15 10:57:50 +01:00
Christian KammandKevin Ottens 27c8bce0b9 Wizards: Show placeholder option only if showExperimentalOptions is set
This config file option will also control other features in the future.
2020-12-15 10:57:50 +01:00
Christian KammandKevin Ottens aee8b9f3c5 Wizards: Add placeholder option and warning to account wizard
Also add the warning dialog to the option in the folder wizard.
2020-12-15 10:57:50 +01:00
Christian KammandKevin Ottens 7dc65b060d NSIS: Register placeholder extension
Also change the placeholder suffix config option to not include the dot,
the dotless form is needed in the nsis script.
2020-12-15 10:57:50 +01:00
Christian KammandKevin Ottens 6a37a7a42c Placeholders: Fix migration issues
Some edgecases weren't covered and didn't have tests yet.
2020-12-15 10:57:49 +01:00
Christian KammandKevin Ottens 40f2303166 SyncOptions: Add default placeholder suffix
Otherwise each test has to set this up anew.
2020-12-15 10:57:49 +01:00
Christian KammandKevin Ottens 12d6f680f2 Placeholders: Ignore placeholder files in older clients
To do this, we add the placeholder extension to the user exclude file
automatically. However, newer clients shouldn't use that exclude
pattern: so we also add version directives that allow making exclude
patterns dependent on the client version.
2020-12-15 10:57:49 +01:00
Christian KammandKevin Ottens d6078f958b Placeholders: Download from shell integration 2020-12-15 10:57:49 +01:00
Olivier GoffartandKevin Ottens 91f53521ae Placeholder: The extension is now a branding option 2020-12-15 10:57:49 +01:00
Olivier GoffartandKevin Ottens a2bdd5b9a5 Placeholders: Fixup clicking on placeholder after previous change
Now that the name in the db is the name of the placeholder file,
we need to adjust the call to downloadPlaceholder
2020-12-15 10:57:49 +01:00
Christian KammandKevin Ottens b1de184bc8 Placeholders: Safe migration to older client versions
Now the db entries for placeholders will have the full placeholder
paths. That way older clients will, on remote discovery, delete the
placeholders and download the real files.
2020-12-15 10:57:48 +01:00
Christian KammandKevin Ottens 0cd83a2c09 Placeholders: Deal with conflicts when a placeholder exists
So "foo.owncloud" exists but the user adds a new "foo".
2020-12-15 10:57:48 +01:00
Olivier GoffartandKevin Ottens d233e5f8d7 Placeholders: install mimetype on linux 2020-12-15 10:57:48 +01:00
Olivier GoffartandKevin Ottens 7eeb99ba24 Placeholders: Add an checkbox in the FolderWizard to enable the placeholder feature 2020-12-15 10:57:48 +01:00
Olivier GoffartandKevin Ottens 1049fb74d9 Placeholders: Move the placeholder option from the account to the folder 2020-12-15 10:57:48 +01:00
Olivier GoffartandKevin Ottens 6ce7c7a56b PlaceHolders: Trigger a download of the placeholder and open it 2020-12-15 10:57:48 +01:00
Christian KammandKevin Ottens f5cf03b6a6 On-demand downloading: Placeholder-file based prototype
- Controled by an option.
- New remote files start out as ItemTypePlaceholder, are created with a
  .owncloud extension.
- When their db entry is set to ItemTypePlaceholderDownload the next
  sync run will download them.
- Files that aren't in the placeholder state sync as usual.
- See test cases in testsyncplaceholders.

Missing:
- User ui for triggering placeholder file download
- Maybe: Going back from file to placeholder?
2020-12-15 10:57:43 +01:00
CamilaandGitHub c50b1cc37c Merge pull request #2714 from nextcloud/ensure_sync_after_conflict_resolution
Ensure a sync happens after a conflict resolution
2020-12-15 10:48:43 +01:00
Kevin OttensandCamila (Rebase PR Action) 8c4bd2bb52 Ensure a sync happens after a conflict resolution
You'd expect that after a conflict resolution the file watcher would
pick up the change and trigger a sync. For some reason it doesn't seem
to happen on at least some Ubuntu systems. In such cases the user would
then still have a stale conflict entry in the activity list and wouldn't
be able to do anything with it.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 09:40:57 +00:00
CamilaandGitHub 75a97bdaf3 Merge pull request #2713 from nextcloud/usermodel_properly_check_out_of_bound_index
UserModel: check indices are inside the user list
2020-12-15 10:37:58 +01:00
Kevin OttensandKevin Ottens (Rebase PR Action) d640076454 UserModel: check indices are inside the user list
The model was just checking for the user list being empty or not which
is overly optimistic. Indeed there might be cases where the id is
actually outside the boundaries so properly check for this.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 08:43:32 +00:00
Nextcloud bot 94c4e3044c [tx-robot] updated from transifex 2020-12-15 03:48:34 +00:00
Kevin OttensandGitHub 2415d9525b Merge pull request #2708 from nextcloud/fix_new_account_wizard_open
Have the new account wizard open again
2020-12-14 16:28:31 +01:00
Kevin Ottens 5ed397a430 Have the new account wizard open again
UserModel can't be connected to AccountSettings if the settings dialog
doesn't exist. This is the case now since we delay the creation of that
dialog and free it after use.

Instead it should be properly channeled through the Systray object all
the way up to OwncloudGui which knows how to handle this properly.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-14 15:58:52 +01:00
CamilaandGitHub be1fb77488 Merge pull request #2692 from nextcloud/fix-issue-1029
Handle the warning message when unchecking folders for syncing.
2020-12-14 12:54:05 +01:00
Camila b4dc682690 Handle the warning message when unchecking folders for syncing.
Split widgets and slot to handle the refreshing of the view:
- refreshSelectiveSyncStatus is connected to signal dirtyChanged
and will handle big folder warning.
- slotSelectiveSyncChanged  which is connected to dataChanged signal
and will handle the selective sync warning. It fixes #1029 because
it looks for the checkbox state before showing the warning.

Signed-off-by: Camila <hello@camila.codes>
2020-12-14 12:36:51 +01:00
Nextcloud bot 0b985f2743 [tx-robot] updated from transifex 2020-12-14 03:48:55 +00:00
Nextcloud bot 8c47d62fa2 [tx-robot] updated from transifex 2020-12-13 03:44:59 +00:00
Nextcloud bot 2de52c351a [tx-robot] updated from transifex 2020-12-12 03:47:17 +00:00
Nextcloud bot dc229480b3 [tx-robot] updated from transifex 2020-12-11 03:46:02 +00:00
Kevin OttensandGitHub 7f0e64ef67 Merge pull request #2698 from nextcloud/themed-icons-v2
Use the icon color property to color the icons in the tray window header.
2020-12-10 19:06:40 +01:00
Camila cfbd22b5e7 Use the icon color property to color the icons in the tray window header.
The icon color is set with APPLICATION_WIZARD_HEADER_TITLE_COLOR in the
theme.

Signed-off-by: Camila <hello@camila.codes>
2020-12-10 17:43:45 +01:00
Kevin OttensandGitHub 5b534761bf Merge pull request #2697 from nextcloud/v3.1.5
Bump master version to 3.1.50
2020-12-10 14:18:35 +01:00
allexzander 7b575fc643 Bump master version to 3.1.5
Signed-off-by: allexzander <blackslayer4@gmail.com>
2020-12-10 14:54:25 +02:00
allexzander 6c651f1cb6 Bump master version to 3.1.5
Signed-off-by: allexzander <blackslayer4@gmail.com>
2020-12-10 14:44:58 +02:00
Kevin OttensandGitHub 7f4ffd0f72 Merge pull request #2696 from nextcloud/v.3.1.0
Bump master version to 3.1.0
v3.1.0
2020-12-10 12:16:47 +01:00
allexzander e6b06d0a6b Bump master version to 3.1.0
Signed-off-by: allexzander <blackslayer4@gmail.com>
2020-12-10 12:47:51 +02:00
Nextcloud bot e160788204 [tx-robot] updated from transifex 2020-12-10 03:53:56 +00:00
Nextcloud bot f5d4ac518f [tx-robot] updated from transifex 2020-12-09 03:44:40 +00:00