1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-10-26 15:42:48 +02:00
Commit Graph

16800 Commits

Author SHA1 Message Date
Felix Weilbach
a9d05b3eca Add pull request template
I'm tierd of telling people to signoff their work:)

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-04-22 15:02:44 +02:00
Felix Weilbach
52bb707d54
Merge pull request #3179 from nextcloud/Valdnet-patch-2
l10n: Change to an ellipsis
2021-04-22 09:46:34 +02:00
Valdnet
796b4e4e72 l10n: Change to an ellipsis
Reported on Transifex.

Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
2021-04-22 07:40:15 +00:00
Nextcloud bot
811d54fd24
[tx-robot] updated from transifex 2021-04-22 03:56:47 +00:00
Nextcloud bot
2240452804
[tx-robot] updated from transifex 2021-04-21 11:25:21 +00:00
Matthieu Gallien
b3daa9b8ab
Merge pull request #3174 from nextcloud/bug/avoidAssertEmptyDateHeader
avoid an assert by delaying access to response timestamp when in error
2021-04-21 09:22:31 +02:00
Matthieu Gallien
782a2fdf06 avoid an assert by delaying access to response timestamp when in error
when canceling the sync of a big directory, I can get some network
request that are aborted before a Date reply header has been read

in this case we would always access
AbstractNetworkJob::responseTimestamp() and fire the assert even if we
know that the network reply has an error

delay the access to after the possible errors have been dealt with

Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
2021-04-20 17:42:17 +02:00
Felix Weilbach
596992c2ea
Merge pull request #3127 from nextcloud/feature/add-note-to-group-share
Add note to user and group share
2021-04-20 13:47:50 +02:00
Felix Weilbach
275e46f0db Show progess indicator
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-04-20 07:13:23 +00:00
Felix Weilbach
c3fac23903 Don't delete note and expiration date on toggle
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-04-20 07:13:23 +00:00
Felix Weilbach
8711d5bf49 Don't use unnecessary layout element
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-04-20 07:13:23 +00:00
Felix Weilbach
2851528595 Show user/group note on share if already set
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-04-20 07:13:23 +00:00
Felix Weilbach
22a3b19e08 Add expire date to user and group share
Fixes #3100

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-04-20 07:13:23 +00:00
Felix Weilbach
946a51e4c1 Add note to user and group share
Fixes #3104

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-04-20 07:13:23 +00:00
Nextcloud bot
87f3073b87
[tx-robot] updated from transifex 2021-04-20 03:56:46 +00:00
Matthieu Gallien
20357ca7fa Revert "Add CMake option to enable address sanitizers"
This reverts commit 3000e26640.

This was not intended for a direct push

Signed-off-by: Matthieu Gallien <matthieu_gallien@yahoo.fr>
2021-04-19 17:54:09 +02:00
Felix Weilbach
3000e26640 Add CMake option to enable address sanitizers
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-04-19 15:38:59 +02:00
allexzander
da0b03b01c
Merge pull request #3167 from nextcloud/bugfix/fix-documentation-markup-warnings
Documentation. Fix incorrect syntax warnings and incorrect indentation before the 'image' element.
2021-04-19 11:24:10 +03:00
allexzander
21d39dea87 Documentation. Fix incorrect syntax warnings and incorrect indentation before image elements.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-04-19 10:32:53 +03:00
allexzander
801a3ff9d4
Merge pull request #3136 from nextcloud/E2EE-and-VFS
E2EE and VFS
2021-04-19 09:32:30 +03:00
Jos Poortvliet
cd598a00f7 Documentation: E2EE and VFS
Describe the relation between E2EE and VFS.

Signed-off-by: Jos Poortvliet <jospoortvliet@gmail.com>
2021-04-19 09:24:11 +03:00
Nextcloud bot
41bf68bc9c
[tx-robot] updated from transifex 2021-04-19 03:59:18 +00:00
Nextcloud bot
58992b0010
[tx-robot] updated from transifex 2021-04-18 03:53:09 +00:00
Nextcloud bot
f584971423
[tx-robot] updated from transifex 2021-04-17 03:55:03 +00:00
allexzander
66b625abdc
Merge pull request #3146 from nextcloud/bugfix/fix-incorrect-image-elements
Documentation. Fix incorrect format usage for images and subheaders.
2021-04-16 17:16:47 +03:00
allexzander
4fad07179d Documentation. Fix incorrect subheader format.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-04-16 14:04:28 +00:00
allexzander
988e928d74 Documentation. Fix incorrect image elements.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-04-16 14:04:28 +00:00
allexzander
7d9d75e90a
Merge pull request #3150 from nextcloud/bugfix/vfs-documentation-show-experimental
Documentation: Correct option to enable virtual files on Linux/macOS
2021-04-16 17:02:54 +03:00
Felix Weilbach
315fdb0be8 Documentation: Correct option to enable virtual files on Linux/macOS
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-04-16 15:27:48 +02:00
allexzander
218e69e510
Merge pull request #3125 from nextcloud/bugfix/windows-navigation-panel-display-vfs-sync-folder
Display VFS sync folder within the navigation panel on Windows.
2021-04-16 10:43:24 +03:00
allexzander
d65c91ea36 Display VFS sync folder within the navigation panel on Windows.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-04-16 07:18:44 +00:00
Nextcloud bot
1374966567
[tx-robot] updated from transifex 2021-04-16 03:59:43 +00:00
Felix Weilbach
f77723e3a7
Merge pull request #3111 from nicolasfella/sharedmimeinfo
Copy FindSharedMimeInfo from ECM
2021-04-15 16:46:55 +02:00
Nicolas Fella
2548455f45 Copy FindSharedMimeInfo from ECM
Instead of relying on ECM being installed.

We copy other stuff from ECM so be consistent.

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
2021-04-15 14:32:46 +00:00
Felix Weilbach
8e3ddcc79c
Merge pull request #3133 from nicolasfella/cmaketest
Remove redundant CMake code
2021-04-15 16:31:34 +02:00
Nicolas Fella
2ad03d96ac Remove redundant CMake code
The same is done somewhere below

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
2021-04-15 14:13:36 +00:00
allexzander
63a02a988f
Merge pull request #3138 from nextcloud/feature/windows-msi-force-minimum-supported-os
Windows MSI. Do not allow installing Nextcloud client on < Windows 10 or < 1709
2021-04-15 14:35:00 +03:00
allexzander
c88e76a4a9 Minimum supported Windows 10, build 1709.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-04-15 13:47:37 +03:00
Felix Weilbach
a74d9ec516
Merge pull request #3124 from nextcloud/bugfix/cmake-require-sqlite-only-on-unix
CMake: Require sqlite3 only on Unix
2021-04-15 09:04:14 +02:00
Felix Weilbach
da1e5c448a CMake: Use own SQLite3 on macOS and Windows
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-04-15 08:51:06 +02:00
Nextcloud bot
89677fe22f
[tx-robot] updated from transifex 2021-04-15 03:57:09 +00:00
rakekniven
0fa95bdfb1
Merge pull request #3121 from castillo92/patch-1
Update sharedialog.cpp
2021-04-14 20:39:03 +02:00
rakekniven
03e7d8da28
Merge branch 'master' into patch-1 2021-04-14 17:11:27 +02:00
Nicolas Fella
b1fc7d4b52
Merge pull request #3112 from nicolasfella/threads
Use imported target for Threads
2021-04-14 13:17:22 +02:00
Nicolas Fella
70033cda1f Use imported target for Threads
Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
2021-04-14 11:07:04 +00:00
Felix Weilbach
71658b0974
Merge pull request #3119 from nextcloud/feature/cmake-add-feature-summary
Add feature summary to CMake
2021-04-14 10:23:59 +02:00
Felix Weilbach
f3eed2ad1e Add feature summary to CMake
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-04-14 09:51:31 +02:00
castillo92
98a4bb8cce
Update sharedialog.cpp
The original sentence uses the word "share" three times and is too redundant when translated into other languages
2021-04-14 09:24:35 +02:00
allexzander
a5330aeb24
Merge pull request #3046 from nextcloud/bugfix/msi-do-not-reboot-silent-installation
Do not schedule reboot when installing MSI in silent mode unless 'SCHEDULE_REBOOT is set.
2021-04-14 10:17:19 +03:00
allexzander
7d2ab1f3fe Do not schedule reboot when installing MSI in silent mode unless 'SCHEDULE_REBOOT' is set.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-04-14 06:59:21 +00:00