chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-15 10:42:45 +01:00
Code
17,272 Commits 4 Branches 173 Tags 91 MiB
v3.4.1
Commit Graph

17272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthieu Gallien
0861be0937
Merge pull request #3811 from nextcloud/feature/sync-progress-in-main-dialog 
Sync progress in main dialog
 2021-10-12 18:30:09 +02:00
Felix Weilbach
4c11f6763e Show sync progress in main dialog 
Fixes #3662

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-10-12 16:14:24 +00:00
Matthieu Gallien
375dc92454
Merge pull request #3880 from madpilot78/Fix_Test_Build_Non_Linux 
Fix BUILD_TESTING on non Linux unices
 2021-10-12 18:12:31 +02:00
Guido Falsi
5667a6aad2 Fix BUILD_TESTING on non Linux unices 
vfs_xattr is build only if LINUX is defined, but when building tests it is depended upon when UNIX is defined.

This patch requires it only when LINUX is defined.

Signed-off-by: Guido Falsi <mad@madpilot.net>
 2021-10-12 16:32:24 +02:00
Matthieu Gallien
bfc7c862e6
Merge pull request #3842 from philips/ignore-Spotlight-V100 
sync-exclude: add .Spotlight-V100
 2021-10-12 13:39:32 +02:00
Nextcloud bot
34b12b7420
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-12 03:51:17 +00:00
Matthieu Gallien
de2b25b563
Merge pull request #3876 from nextcloud/bugfix/macOsBuildFailure 
fix macOs build after targets name are not changed by branding
 2021-10-11 15:52:35 +02:00
Matthieu Gallien
d76778e3ee fix macOs build after targets name are not changed by branding 
target names used to be variable depending on branding
now the target names are always constant but generated output file names
are set according to active branding

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2021-10-11 07:41:29 +00:00
Nextcloud bot
59b3971d37
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-11 03:48:47 +00:00
Nextcloud bot
57a74eabcc
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-10 03:50:02 +00:00
Nextcloud bot
b6530a3992
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-09 04:06:55 +00:00
Matthieu Gallien
14e294e574
Merge pull request #3878 from nextcloud/bugfix/missing-copyright-headers 
Add missing copyright headers
 2021-10-08 17:43:27 +02:00
Felix Weilbach
2da6dab403 Add missing copyright headers 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-10-08 13:19:10 +02:00
Nextcloud bot
18b8693c43
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-08 03:49:52 +00:00
Brandon Philips
98a3682ac3 sync-exclude: add .Spotlight-V100 
The .Spotlight-V100 is added by macOS's Spotlight indexer to external
volumes. NextCloud fails to sync when this file exists. So, ignore it.

Signed-off-by: Brandon Philips <brandon@ifup.org>
 2021-10-07 08:11:59 -07:00
Nextcloud bot
0b2a055c79
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-07 03:51:25 +00:00
Kevin Ottens
91a9e82fc8
Merge pull request #3871 from nextcloud/display_proper_endpoint_in_warning 
Display the right endpoint in the warning in case of error
 2021-10-06 13:12:36 +02:00
Kevin Ottens
5fe63a4d9a Display the right endpoint in the warning in case of error 
At that point in time _pollEndpoint isn't set yet. All the checks are
against pollEndpoint so display that one in the warning. Otherwise one
always end up with an empty URL in the logs which is not very useful for
debugging purposes.

Signed-off-by: Kevin Ottens <kevin.ottens@enioka.com>
 2021-10-06 10:17:38 +00:00
Matthieu Gallien
820ca38270
Merge pull request #3870 from nextcloud/bugfix/brandedDllNames 
ensure DLL are generated with branded names
 2021-10-06 11:51:09 +02:00
Matthieu Gallien
833237b2e4 use alias target for internal libraries 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2021-10-06 07:56:33 +00:00
Matthieu Gallien
c751fd5672 ensure DLL are generated with branded names 
cmake distinct runtime and library

on unix dynamic shared libraries are library kind of objects
on windows they are runtime kind of objects

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
 2021-10-06 07:56:33 +00:00
Nextcloud bot
f7a34b8bdc
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-06 03:48:28 +00:00
Matthieu Gallien
a2a08ebd21
Merge pull request #3737 from nextcloud/feature/file-activity-dialog 
Add file activity dialog
 2021-10-05 15:08:45 +02:00
Felix Weilbach
0c9dce1154 Add file activity dialog 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-10-05 12:41:34 +00:00
Nextcloud bot
883c78ea61
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-05 03:48:52 +00:00
Felix Weilbach
db3a38751f
Merge pull request #3682 from nextcloud/bugfix/use-build-app-image-from-brander 
Use build-appimage.sh from Brander
 2021-10-04 15:36:58 +02:00
Felix Weilbach
ae3d10d3a7 Use build-appimage.sh from Brander 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-10-04 12:51:17 +00:00
Nextcloud bot
087b908445
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-04 03:52:27 +00:00
Nextcloud bot
40ffc3fd44
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-03 03:54:04 +00:00
Nextcloud bot
d86f349dad
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-10-01 03:52:13 +00:00
Matthieu Gallien
19f3f11b8d
Merge pull request #3844 from nextcloud/bugfix/remove-temporary-solution-for-file-restoration-via-datafingerprint 
Remove Temporary solution for file restoration issue due to set the data-fingerprint.
 2021-09-30 13:40:33 +02:00
alex-z
6cafcc1124 Remove Temporary solution for file restoration issue due to failing to set the data-fingerprint. 
Signed-off-by: alex-z <blackslayer4@gmail.com>
 2021-09-30 08:39:47 +00:00
Matthieu Gallien
a7be4044bc
Merge pull request #3823 from madpilot78/argp_cleanup 
Fix argp references on FreeBSD
 2021-09-30 09:21:19 +02:00
Nextcloud bot
b566f19538
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-09-30 04:17:00 +00:00
Guido Falsi
b0b70d1e77 Check for argp library before depending on it. 
Signed-off-by: Guido Falsi <madpilot@freebsd.org>
 2021-09-29 15:46:07 +02:00
Guido Falsi
5f036641b9 Add -largp on non linux systems. 
Signed-off-by: Guido Falsi <madpilot@freebsd.org>
 2021-09-29 15:46:07 +02:00
Nextcloud bot
5fa0828724
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-09-29 03:54:18 +00:00
Matthieu Gallien
fe344462a3 Merge branch 'Trafo-fix/WindowsPlaceholderShortCutMenu' 2021-09-28 11:21:41 +02:00
Mathias Eggert
51cfe76d65 add ContextMenuOptIn to COM registration, to allow Placeholder support. Issue #3584 
Signed-off-by: Mathias Eggert <mathias.eggert@nexenio.com>
 2021-09-28 11:20:30 +02:00
Nextcloud bot
155f686c4f
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-09-28 03:55:51 +00:00
Matthieu Gallien
739a5f5fdc
Merge pull request #3841 from nextcloud/bugfix/vfs-docs 
Make virtual files feature documentation more understandable
 2021-09-27 23:35:43 +02:00
Felix Weilbach
b6108cb9fe Make virtual files feature documentation more understandable 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-09-27 20:42:19 +00:00
Matthieu Gallien
6f03a9ffe1
Merge pull request #3827 from nextcloud/bugfix/dont-log-encryption 
Don't log encryption data in release mode
 2021-09-27 22:28:33 +02:00
Felix Weilbach
d6e60cd8d4 Don't log encryption data in release mode 
We deliver our builds to users with debug logging enabled to have an
easier time finding problems. However, logging all the encryption data
in this loop is too much and should not be done in release mode.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-09-27 19:50:38 +00:00
Matthieu Gallien
26a361973c
Merge pull request #3825 from nextcloud/clang-format-cpp11-uni 
Setup clang-format for cpp11 universal init
 2021-09-27 21:49:24 +02:00
Felix Weilbach
b10be3e52e Set maximum line length in clang-format 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-09-27 15:40:55 +00:00
Felix Weilbach
2a6886dc70 Use C++11 brace style in clang-format 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-09-27 15:40:55 +00:00
Matthieu Gallien
8af4d905f1
Merge pull request #3713 from nextcloud/feature/share-server-permissions 
Use default sharing permissions from server
 2021-09-27 12:52:31 +02:00
Camila
1de38a13f3 Extend TestCapabilities with shareDefaultPermissions tests. 
Signed-off-by: Camila <hello@camila.codes>
 2021-09-27 08:53:45 +00:00
Camila
df38e5c08b Apply server default permissions for federated file sharing too. 
See nextcloud/server#24729 comments.

Signed-off-by: Camila <hello@camila.codes>
 2021-09-27 08:53:45 +00:00