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
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
d119fc4749
Merge pull request #2733 from nextcloud/Valdnet-patch-3
...
Move space in "owncloudadvancedsetuppage.cpp"
2021-01-26 18:07:30 +01:00
817d460b84
Move space in "owncloudadvancedsetuppage.cpp"
2021-01-26 16:40:46 +00:00
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
d20fc1a6ce
Remove unused method
...
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-26 11:20:13 +00:00
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
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
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
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
6a4da69a62
[tx-robot] updated from transifex
2021-01-26 03:45:50 +00:00
76d0fb254b
Merge pull request #2734 from nextcloud/Valdnet-patch-4
...
Move space in "folderwizard.cpp"
2021-01-25 18:51:15 +01:00
f365ec1e4c
Move space in "folderwizard.cpp"
2021-01-25 17:42:38 +00:00
24ee350ef3
Merge pull request #2735 from nextcloud/Valdnet-patch-5
...
Change the quotation marks
2021-01-25 18:41:31 +01:00
8539dc7dc6
Change the quotation marks
2021-01-25 17:33:46 +00:00
8c66b9f89e
Merge pull request #2814 from nextcloud/files_push_notifications
...
Add push notifications for file changes
2021-01-25 18:17:39 +01:00
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
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
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
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
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
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
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
79fe231acc
Fix E2EE root folder rename issue.
...
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-01-25 10:35:30 +02:00
18f5b841e3
Merge pull request #2859 from nicolasfella/qt5153
...
Fix build against Qt 5.15.3
2021-01-25 09:35:08 +01:00
ab064c92b6
Fix build against Qt 5.15.3
...
Use QLatin1Char to prevent build error due to stricter QT_NO_CAST_FROM_ASCII
Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
2021-01-25 08:19:49 +00:00
398101ae3d
Merge pull request #2860 from nextcloud/rakekniven-patch-2
...
Removed blank before colon
2021-01-25 09:18:46 +01:00
c3403b83ef
Removed blank before colon
...
Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
2021-01-25 08:08:13 +00:00
04df193539
[tx-robot] updated from transifex
2021-01-25 03:44:11 +00:00
a916e5a64d
[tx-robot] updated from transifex
2021-01-24 03:42:11 +00:00
b8a56e0b4b
[tx-robot] updated from transifex
2021-01-22 03:47:57 +00:00
b43701822f
Merge pull request #2845 from nextcloud/default_to_colored_systray_on_linux
...
Default to colored systray on linux
2021-01-21 08:01:58 +01:00
48f0c54a90
Fix the branding detection for monochrome icons on Mac
...
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-21 06:39:11 +00:00
96b2b2a509
Revert "Make monochrome icons the default on Linux and Mac OS."
...
This reverts commit 016410dbaa
2021-01-21 06:39:11 +00:00
fdaf04e4e5
[tx-robot] updated from transifex
2021-01-21 03:46:57 +00:00
7f51355dc8
Merge pull request #2844 from nextcloud/handle_svg_branded_clients
...
Handle SVG branded clients
2021-01-20 16:08:01 +01:00
471bb25e62
Use APPLICATION_ICON_SET for themed icons
...
We now favor APPLICATION_ICON_SET to isBranded() regarding the decision
to use PNG or SVG for icons.
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-20 15:11:57 +01:00
88986749a4
Use the SVG wizard logo when APPLICATION_ICON_SET says so
...
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-20 15:09:58 +01:00
4b4437787f
Add the APPLICATION_ICON_SET option
...
Also mention the svg possibly used in the wizard
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-20 10:41:16 +01:00
0b135ae644
Reference the wizard_logo.svg file from the resources
...
Somehow this was missing
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-20 10:10:22 +01:00
93e8aea19e
[tx-robot] updated from transifex
2021-01-20 03:47:11 +00:00
b1780f9b03
[tx-robot] updated from transifex
2021-01-19 03:45:22 +00:00
6bded34856
[tx-robot] updated from transifex
2021-01-18 03:44:21 +00:00
d87538da8b
[tx-robot] updated from transifex
2021-01-17 03:43:43 +00:00
d30ae39890
[tx-robot] updated from transifex
2021-01-16 03:42:11 +00:00
e353d79881
[tx-robot] updated from transifex
2021-01-15 03:49:34 +00:00
0d33ed048f
Merge pull request #2827 from nextcloud/apply_version_suffix_to_msi_filename
...
Integrate the version suffix to the MSI filename
2021-01-14 21:14:46 +01:00
576a25161b
Integrate the version suffix to the MSI filename
...
This should be enough to reinstate the "-daily" marker in the filename
for daily builds.
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2021-01-14 19:24:42 +00:00
bc78ee0ca8
Merge pull request #2826 from nextcloud/reference_coding_style_wiki_page
...
Reference coding style wiki page from CONTRIBIUTING.md
2021-01-14 19:01:36 +01:00
60a3c27d84
Merge branch 'master' into reference_coding_style_wiki_page
2021-01-14 09:49:55 -08:00
Kevin Ottens