1
0
Fork 0
Commit Graph

16343 Commits

Author SHA1 Message Date
Nextcloud bot 6be88c6d37
[tx-robot] updated from transifex 2021-02-08 03:44:42 +00:00
Nextcloud bot ca0591c4e0
[tx-robot] updated from transifex 2021-02-07 03:45:41 +00:00
Nextcloud bot 2bce09801e
[tx-robot] updated from transifex 2021-02-06 03:48:23 +00:00
allexzander 496f174232
Merge pull request #2904 from ivaradi/ui-namespace
Move FolderCreationDialog into the OCC namespace
2021-02-05 19:19:56 +02:00
István Váradi 92f1074fcc Put FolderCreationDialog into the OCC namespace.
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2021-02-05 16:27:25 +01:00
Nextcloud bot f455f9969f
[tx-robot] updated from transifex 2021-02-05 03:48:33 +00:00
Kevin Ottens 1c1301e482
Merge pull request #2892 from nextcloud/repair_e2ee_on_non_remote_root_sync_folder
Repair E2EE on sync folders which don't point to the root of the server on the remote end
2021-02-04 13:24:18 +01:00
Kevin Ottens 856f0567a7 Make sure we pass a full remote path to LSCOL jobs
Indeed the path we have is supposedly not fully qualified in case of a
sync folder which doesn't point to / on the remote end. But LSCOL works
with absolute paths on the server so make sure this is what we give it
out.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-02-04 11:16:48 +00:00
Kevin Ottens dd83efb543 The e2eMangledName was relative to the remote folder, repair it
This got broken during the huge discovery refactoring. I wrongly passed
the mangled name as is out of discovery, but coming from listing jobs it
was fully qualified while the jobs at propagation time and the db expect
those paths to be relative to the remote folder.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-02-04 11:16:48 +00:00
allexzander 2c8fa40fb6
Merge pull request #2897 from nextcloud/allow-creation-of-new-folders-from-the-settings-dialog
Allow creation of new folders from the Settings Dialog.
2021-02-04 10:28:05 +02:00
allexzander 81a090b362 Allow creation of new folders from the Settings Dialog.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-02-04 10:05:18 +02:00
Nextcloud bot 93b26bc666
[tx-robot] updated from transifex 2021-02-04 03:43:39 +00:00
allexzander a94c109646
Merge pull request #2901 from nextcloud/win-tests-compilation-hot-fix
Win tests compilation fix.
2021-02-03 20:12:56 +02:00
allexzander 3d266b9246 Win tests compilation fix. For Windows, the build was failing because of not being able to locate #include <sqlite3.h> in tests.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-02-03 13:52:10 +02:00
Nextcloud bot 6d634c79ee
[tx-robot] updated from transifex 2021-02-03 03:58:51 +00:00
Felix Weilbach 6803256cb3
Merge pull request #2900 from nextcloud/make_sure_theme_resources_are_loaded
Load the theme resource explictly
2021-02-02 19:34:50 +01:00
Kevin Ottens 55fd0562de
Load the theme resource explictly
Otherwise they won't be loaded automatically at startup leading to lots
of missing icons. Since they're now in a static library they need that
explicit loading.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-02-02 18:33:45 +01:00
Camila 0521dce174
Merge pull request #2834 from nextcloud/compile_nextcloud_as_lib
Compile nextcoud gui as separate library
2021-02-02 14:44:40 +01:00
Felix Weilbach d8493a9b3b Add automoc property to updater
Signed-off-by: Felix Weilbach <felix.weilbach@t-online.de>
2021-02-02 13:35:04 +00:00
Felix Weilbach 02dd363feb Add test utils library
The test utils library collects all dependencies that are needed for
tests and gets automatically linked with every test.

Signed-off-by: Felix Weilbach <felix.weilbach@t-online.de>
2021-02-02 13:35:04 +00:00
Felix Weilbach 73a41d8e34 Compile nextcoud gui as separate library
Compiling nextcoud gui as a separate library. This is needed to more
easily write tests. The whole nextcloud application can now be linked
against the tests.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-02-02 13:35:04 +00:00
Kevin Ottens c19f048774
Merge pull request #2894 from nextcloud/fix-docs
Documentation: break line in config example.
2021-02-02 11:40:11 +01:00
Camila 3087a09c45
Documentation: break line in config example.
Also make sure the following note is not displayed as one block with the
config example.

Minor change: fix typo.

Signed-off-by: Camila <hello@camila.codes>
2021-02-02 10:51:34 +01:00
Nextcloud bot b66d48a5d7
[tx-robot] updated from transifex 2021-02-02 03:40:51 +00:00
Nextcloud bot cf2adc0446
[tx-robot] updated from transifex 2021-02-01 03:46:58 +00:00
Nextcloud bot 2fc7947c7b
[tx-robot] updated from transifex 2021-01-31 03:43:48 +00:00
Nextcloud bot a1d264aaac
[tx-robot] updated from transifex 2021-01-30 03:51:02 +00:00
Nextcloud bot 79be34ce32
[tx-robot] updated from transifex 2021-01-29 03:49:40 +00:00
Nextcloud bot 5ee4c7a0ff
[tx-robot] updated from transifex 2021-01-28 03:59:43 +00:00
Kevin Ottens d176b96b43
Merge pull request #2874 from nextcloud/more_active_stalebot
Reduce exempt labels list to give a chance to stale bot to do something
2021-01-27 19:33:18 +01:00
Kevin Ottens cc681d094a Reduce exempt labels list to give a chance to stale bot to do something
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-27 18:15:26 +00:00
Kevin Ottens ab6ba2212a
Merge pull request #2877 from nextcloud/revert_2875
Revert "Specify PUBLIC for the link targets to make them visible to w…
2021-01-27 19:14:16 +01:00
Kevin Ottens 1456d6e433
Revert "Specify PUBLIC for the link targets to make them visible to windeployqt"
This reverts commit 002abdc38b.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-27 19:06:23 +01:00
allexzander ac5a277e39
Merge pull request #2872 from nextcloud/use-push-notifications-for-activities-in-tray
Use push notifications for Tray activities/notifications fetch trigger.
2021-01-27 20:02:04 +02:00
allexzander 8c4d5333c1 Use push notifications for Tray activities/notifications fetch trigger.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-01-27 19:53:28 +02:00
Kevin Ottens f2ffa74a7b
Merge pull request #2875 from nextcloud/make_qtwebsockets_visible_to_windeployqt
Specify PUBLIC for the link targets to make them visible to windeployqt
2021-01-27 18:07:51 +01:00
Kevin Ottens 002abdc38b
Specify PUBLIC for the link targets to make them visible to windeployqt
I went full steam on making it all public which is not really required,
it's only really QtWebSockets we're after. Could always be fine tuned
later on if this works as expected.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-27 18:00:26 +01:00
Kevin Ottens c7d9e11d89
Merge pull request #2867 from nextcloud/fix_file_resolve_dialog
Start file conflict resolve dialog asynchronous
2021-01-27 09:10:32 +01:00
Felix Weilbach 51d8cf8102 Start file conflict resolve dialog asynchronous
Fixes #2804

Signed-off-by: Felix Weilbach <felix.weilbach@t-online.de>
2021-01-27 08:01:25 +00:00
Kevin Ottens 71f0b45412
Merge pull request #2732 from nextcloud/Valdnet-patch-2
Replace dots with ellipses and add spaces.
2021-01-27 08:59:48 +01:00
Valdnet d8a88fd047 Replace dots with ellipses and add spaces. 2021-01-27 07:36:52 +00:00
Nextcloud bot 4567c2b0a2
[tx-robot] updated from transifex 2021-01-27 03:47:28 +00:00
Kevin Ottens 90a7f583b2
Merge pull request #2868 from nextcloud/vfs_cfapi_dont_mistake_unpinned_directory_for_files_to_dehydrate
Don't treat new folders in unpinned folders as files to dehydrate
2021-01-26 18:27:24 +01:00
Kevin Ottens ebfe51b7e7 Don't treat new folders in unpinned folders as files to dehydrate
This would only happen if the parent of the newly created folder would
be explicitly set to online only, hence why it went under the radar
previously.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-26 17:09:24 +00:00
Kevin Ottens d119fc4749
Merge pull request #2733 from nextcloud/Valdnet-patch-3
Move space in "owncloudadvancedsetuppage.cpp"
2021-01-26 18:07:30 +01:00
Valdnet 817d460b84 Move space in "owncloudadvancedsetuppage.cpp" 2021-01-26 16:40:46 +00:00
Kevin Ottens 56b7ec70f4
Merge pull request #2840 from nextcloud/avoid_keeping_account_alive_from_subobject
Avoid keeping Account alive via a shared ptr in ClientSideEncryption
2021-01-26 14:00:27 +01:00
Kevin Ottens d20fc1a6ce Remove unused method
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-26 11:20:13 +00:00
Kevin Ottens 4168c0d082 Avoid keeping Account alive via a shared ptr in ClientSideEncryption
This account object was really only used during the initialization phase
or for forgetting the sensitive data. So let's receive it as parameter
there and pass it on from job to job as needed.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-26 11:20:13 +00:00
Kevin Ottens 737158e9b4
Merge pull request #2865 from nextcloud/vfs_cfapi_dont_get_stuck
VFS CfAPI implementation shouldn't get stuck
2021-01-26 12:19:07 +01:00