chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-06 02:42:45 +01:00
Code
16,714 Commits 4 Branches 173 Tags 91 MiB
v3.3.0
Commit Graph

16714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nextcloud bot
f119e4cf64
[tx-robot] updated from transifex 2021-04-13 03:56:05 +00:00
Matthieu Gallien
8102d51b99
Merge pull request #3065 from nicolasfella/dolphincmake 
[dolphin] Clean up CMake code
 2021-04-12 16:22:18 +02:00
Nicolas Fella
e207cfdbfc [dolphin] Clean up CMake code 
Remove some stuff that is not needed.

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
 2021-04-12 13:27:46 +00:00
Matthieu Gallien
a1f78c4330
Merge pull request #3003 from nextcloud/fix-and-comment-default-build-type 
Remove non-functional default CMAKE_BUILD_TYPE
 2021-04-12 14:16:44 +02:00
Elsie Hupp
1183b3f7b9 Remove non-functional default CMAKE_BUILD_TYPE 
Signed-off-by: Elsie Hupp <9206310+elsiehupp@users.noreply.github.com>
 2021-04-12 11:26:08 +00:00
Felix Weilbach
efdd46fb6d
Merge pull request #3058 from nicolasfella/cloudproviders 
Use FindPkgConfig to find libcloudproviders and related libs
 2021-04-12 13:15:38 +02:00
Nicolas Fella
b34a901838 Use FindPkgConfig to find libcloudproviders and related libs 
Instead of using custom find modules.

This allows using imported targets which make the code much nicer.

Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
 2021-04-12 10:00:08 +00:00
Nextcloud bot
e74746c4e7
[tx-robot] updated from transifex 2021-04-12 03:55:08 +00:00
Nextcloud bot
96c51faa9c
[tx-robot] updated from transifex 2021-04-11 03:53:37 +00:00
Nextcloud bot
c956a462e2
[tx-robot] updated from transifex 2021-04-10 04:06:36 +00:00
Felix Weilbach
4efe00feca
Merge pull request #3075 from nextcloud/bugfix/embed-version-info-win 
Embed version and icon into windows executable
 2021-04-09 14:29:46 +02:00
Felix Weilbach
c49dc440bb Embed version and icon into windows executable 
These changes are necessary because of changing the compilation
process for the gui from a single executable to static lib +
executable in commit 0521dce174.
Otherwise the version and icon information will be lost.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-04-09 13:53:12 +02:00
Nextcloud bot
5e15f4f2c6
[tx-robot] updated from transifex 2021-04-09 03:55:46 +00:00
allexzander
b6371bf39b
Merge pull request #3073 from nextcloud/bump_version_to_3.2.5 
Bump version to 3.2.50
 2021-04-08 11:26:20 +03:00
allexzander
740e1d2f0d Bump version to 3.2.50. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-08 11:09:49 +03:00
allexzander
5e6c31b262
Merge pull request #3072 from nextcloud/bump-version-3.2.0 
Bump version to 3.2.0.
 2021-04-08 10:47:24 +03:00
allexzander
8550bfa8f1 Bump version to 3.2.0. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-04-08 10:38:10 +03:00