chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-10-18 01:42:46 +02:00
Code
16,931 Commits 4 Branches 173 Tags 91 MiB
v3.3.6-lnk
Commit Graph

16931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
allexzander
32dd91e650
Merge pull request #3066 from nextcloud/bugfix/temporary-solution-for-file-restoration-via-datafingerprint 
Temporary solution for file restoration issue due to failing the data…
 2021-04-14 09:49:57 +03:00
allexzander
bc919bcc8c Temporary solution for file restoration issue due to failing the dataFingerprint on client. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-14 06:42:48 +00:00
Nextcloud bot
0e6e240f09
[tx-robot] updated from transifex 2021-04-14 03:59:35 +00:00
Felix Weilbach
43cae72d4d
Merge pull request #3022 from nextcloud/feature/display-invalid-filenames-as-warning 
Display invalid filenames as warning
 2021-04-13 17:35:43 +02:00
Felix Weilbach
696979cb0e Display invalid filenames as warning 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-13 14:58:51 +00:00
Felix Weilbach
b736355985 Add notification cache 
The notification cache helps to not display duplicate desktop
notifications to the user.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-13 14:58:50 +00:00
Felix Weilbach
9c4a9958f7
Merge pull request #3031 from nextcloud/feature/push-notifications-ping-server 
Push notifications: Ping server
 2021-04-13 14:27:55 +02:00
Felix Weilbach
b256c6e694 Ping websocket server 
This helps the client to recognize if the websocket server is still alive.

Fixes #2983

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-13 12:19:40 +00:00
Felix Weilbach
d7499b0746 Refactor push notification test utils 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-13 12:19:40 +00:00
Nicolas Fella
c49be218ec
Merge pull request #3092 from nextcloud/cloudproviders2 
Only include libcloudproviders dir when cloudproviders is found
 2021-04-13 13:38:03 +02:00
Nicolas Fella
b8879dbf07 Only include libcloudproviders dir when cloudproviders is found 
Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
 2021-04-13 11:29:29 +00:00
Nicolas Fella
478ca784b1
Merge pull request #3093 from nicolasfella/dolphin2 
[shellintegration] Simplify cmake code
 2021-04-13 13:28:04 +02:00
Nicolas Fella
df3ebb11f6 [shellintegration] Simplify cmake code 
We don't need ECM to check for KIO

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
 2021-04-13 11:22:19 +00:00
Valdnet
e2ad407259
Merge pull request #3087 from nextcloud/Valdnet-patch-2 
l10n: Unify spelling
 2021-04-13 12:42:25 +02:00
Valdnet
e628a51735 l10n: Unify spelling 
Spelling unification in Nextcloud applications.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-13 12:24:57 +02:00
allexzander
909248f058
Merge pull request #3089 from nextcloud/feature/add-vfs-and-status-feature-doc 
Added documentation for VFS and Status Feature.
 2021-04-13 12:38:17 +03:00
allexzander
b4d01afd86 Added documentation for VFS and Status Feature. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-13 10:18:27 +03:00
Felix Weilbach
f882dee8dc
Merge pull request #3059 from nextcloud/inotify 
Improve Inotify cmake code
 2021-04-13 08:46:54 +02:00
Nicolas Fella
3bc66bea66 Improve Inotify cmake code 
Use the FindInotify from ECM. It handles the case of Linux vs BSD
correctly automatically.

Also only find Inotify on Linux and BSD

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
 2021-04-13 06:36:14 +00:00