Commit graph

16026 commits

Author SHA1 Message Date
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
Kevin Ottens
21035d48a6 Don't crash when the same request is filled twice
The OS might request the same file again if we take too much time to
fulfill a request. So in case it's queueing the same one again instead
of bailing out just fail the second one and let the first one finish
properly.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-26 10:58:14 +00:00
Kevin Ottens
d3c7218ee8 Be a bit more resilient with errors
In case we'd been to slow to fullfill or we're still processing a
cancelled request better not just crash. We still log the issue though.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-26 10:58:14 +00:00
Nextcloud bot
6a4da69a62
[tx-robot] updated from transifex 2021-01-26 03:45:50 +00:00
Kevin Ottens
76d0fb254b
Merge pull request #2734 from nextcloud/Valdnet-patch-4
Move space in "folderwizard.cpp"
2021-01-25 18:51:15 +01:00
Valdnet
f365ec1e4c Move space in "folderwizard.cpp" 2021-01-25 17:42:38 +00:00
Kevin Ottens
24ee350ef3
Merge pull request #2735 from nextcloud/Valdnet-patch-5
Change the quotation marks
2021-01-25 18:41:31 +01:00
Valdnet
8539dc7dc6 Change the quotation marks 2021-01-25 17:33:46 +00:00
Kevin Ottens
8c66b9f89e
Merge pull request #2814 from nextcloud/files_push_notifications
Add push notifications for file changes
2021-01-25 18:17:39 +01:00
Felix Weilbach
78f00acaa2 Add push notifications for file changes
Resolves #2802

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-01-25 17:01:09 +00:00
Kevin Ottens
fd604ddc9e
Merge pull request #2864 from nextcloud/fixes_for_wizard_advanced_setup
Fixes for wizard advanced setup
2021-01-25 17:45:02 +01:00
Kevin Ottens
4992bfa8ef
Ensure the right radio is selected when selective sync is picked
This got broken previously when trying to reconcile during a
cherry-pick. This also repairs the case when the theme tells us the
default is to not select anything (not that we're using this right now
but in case we'd like to brand this).

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-25 16:53:21 +01:00
Kevin Ottens
2b2dac10ef
It's not really recommended anymore at least not on Windows
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-25 16:24:44 +01:00
allexzander
bc753d5fba
Merge pull request #2853 from nextcloud/e2ee-fix-rename-root-folder-issue
E2ee fix rename root folder issue & Fix upload stuck issue due to incorrect Lock/Unlock sequence
2021-01-25 10:44:25 +02:00
allexzander
eb80f54dcf E2EE Fix incorrect name of a nested encrypted item in the Settings dialog when the root folder is non-encrypted and it is renamed.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-01-25 10:35:54 +02:00
allexzander
483a874cb6 Fix folder upload issue due to wrong Lock/Unlock order
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-01-25 10:35:30 +02:00
allexzander
79fe231acc Fix E2EE root folder rename issue.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-01-25 10:35:30 +02:00
Kevin Ottens
18f5b841e3
Merge pull request #2859 from nicolasfella/qt5153
Fix build against Qt 5.15.3
2021-01-25 09:35:08 +01:00