Commit graph

16148 commits

Author SHA1 Message Date
István Váradi
2e7cc96228 Do not include glib.h with extern C (2)
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2021-03-10 07:48:23 +01:00
Nextcloud bot
d258faa117
[tx-robot] updated from transifex 2021-03-10 04:00:48 +00:00
István Váradi
17e27ce4ed
Merge pull request #2972 from ivaradi/no-externc-glib
Do no include glib.h with extern C
2021-03-09 13:30:20 +01:00
István Váradi
db321d25ef Do no include glib.h with extern C
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2021-03-09 10:29:14 +01:00
Nextcloud bot
4760e892ad
[tx-robot] updated from transifex 2021-03-09 03:52:13 +00:00
Nextcloud bot
ad34531f02
[tx-robot] updated from transifex 2021-03-08 03:51:36 +00:00
Nextcloud bot
2e80adcf26
[tx-robot] updated from transifex 2021-03-07 03:47:27 +00:00
Nextcloud bot
de06b10af9
[tx-robot] updated from transifex 2021-03-06 03:52:05 +00:00
Felix Weilbach
f17c52dccd
Merge pull request #2948 from nextcloud/bugfix/conflict-dialog-issue
Fix crash when opening conflict dialog
2021-03-05 14:31:59 +01:00
Felix Weilbach
63dbb90bbd Iteration
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-03-05 11:32:44 +00:00
Felix Weilbach
ef5abac567 Fix crashes with conflict dialog
When the client runs and a conflict gets detected, the sync engine runs
two times.

On the first run, the sync engine detects the conflict, marks the
file as a conflict and propagates that to the GUI. This leads to an
error notification with the original filename in the main dialog.

The sync engine runs then a second time. On this second run, the file
that originally caused the conflict is not anymore a conflict
file. Instead, the sync engine detects the conflicted copy and
propagates that file as a conflict to the GUI.

When opening the conflict dialog with the original file name (not the
conflicted copy) a crash happens. Usually, the two sync runs are really
fast, so the user does not notice the first notification. However, a
problem can occur if a conflict gets created while the client is not
running. Since then, the client does not do two sync runs. It does only
run once.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-03-05 11:32:44 +00:00
Nextcloud bot
101d3e5d7d
[tx-robot] updated from transifex 2021-03-05 03:51:13 +00:00
Felix Weilbach
3796876c8e
Merge pull request #2958 from nextcloud/bugfix/vfs-win-download-large-files
VFS Windows: Fix download of large files
2021-03-04 22:51:42 +01:00
Felix Weilbach
523f1bcadd VFS Windows: Fix download of large files
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-03-04 09:05:17 +01:00
Nextcloud bot
226ec38f5c
[tx-robot] updated from transifex 2021-03-04 03:53:22 +00:00
Nextcloud bot
23d76b0920
[tx-robot] updated from transifex 2021-03-03 03:51:17 +00:00
Felix Weilbach
97cd61140e
Merge pull request #2931 from elsiehupp/build-instructions
Improve OSX build Instructions
2021-03-01 19:15:34 +01:00
Elsie Hupp
b33ea05271 Update OSX build instructions
Signed-off-by: Elsie Hupp <9206310+elsiehupp@users.noreply.github.com>
2021-03-01 15:26:32 +00:00
Nextcloud bot
2d6faebb10
[tx-robot] updated from transifex 2021-03-01 03:48:16 +00:00
Nextcloud bot
7179fd88e8
[tx-robot] updated from transifex 2021-02-28 03:46:22 +00:00
Kevin Ottens
f32a8b3236
Merge pull request #2951 from nextcloud/enhancement/better_logging_of_cfpapi_error
Log error message from CFAPI
2021-02-27 18:56:35 +01:00
Felix Weilbach
4d05979be5 Log error message from CFAPI
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-02-27 17:44:26 +00:00
Nextcloud bot
8e32bea212
[tx-robot] updated from transifex 2021-02-27 03:51:14 +00:00
Nextcloud bot
6e3b3fccfc
[tx-robot] updated from transifex 2021-02-26 03:48:56 +00:00
Nextcloud bot
b5ca1f2f4b
[tx-robot] updated from transifex 2021-02-25 03:50:19 +00:00
Tobias Kaminsky
f8c031ee93
Merge pull request #2949 from nextcloud/staleAction
Move from stale bot to stale action
2021-02-24 16:50:49 +01:00
tobiasKaminsky
3de6ce9ee9
Move from stale bot to stale action
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2021-02-24 08:02:56 +01:00
Nextcloud bot
26b3ad1e1c
[tx-robot] updated from transifex 2021-02-24 03:56:01 +00:00
Nextcloud bot
26a08fa51b
[tx-robot] updated from transifex 2021-02-19 03:53:20 +00:00
allexzander
ebdec26e27
Merge pull request #2935 from nextcloud/do-not-auto-start-debug-build
Do not add debug build to startup programs.
2021-02-18 15:45:34 +02:00
allexzander
88a21c0665 Do not add debug build to startup programs.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-02-18 13:19:06 +00:00
Tobias Kaminsky
6c9cfa319b
Merge pull request #2937 from nextcloud/staleSecondTry
Stale: issue must have bug and must not have approved label
2021-02-18 12:54:17 +01:00
tobiasKaminsky
8dded9310c
Stale: issue must have bug and must not have approved label
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2021-02-18 10:42:18 +01:00
Nextcloud bot
dafd37711a
[tx-robot] updated from transifex 2021-02-18 03:52:54 +00:00
Nextcloud bot
41c547e705
[tx-robot] updated from transifex 2021-02-17 03:46:45 +00:00
allexzander
e6ec648e3b
Merge pull request #2925 from nextcloud/fix-incorrect-logger-output-for-non-latin-strings
Fix incorrect logger output for non-Latin strings.
2021-02-16 16:13:16 +02:00
allexzander
4d66d209bc Fix incorrect logger output for non-latin strings.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2021-02-16 09:30:08 +02:00
Nextcloud bot
642320c007
[tx-robot] updated from transifex 2021-02-16 03:48:18 +00:00
Nextcloud bot
10cd83fbb4
[tx-robot] updated from transifex 2021-02-15 03:43:56 +00:00
Nextcloud bot
be8521cdab
[tx-robot] updated from transifex 2021-02-14 03:41:47 +00:00
Kevin Ottens
0996b13386
Merge pull request #2928 from nextcloud/add_missing_override_specifier
Add missing override specifier
2021-02-13 11:32:46 +01:00
Felix Weilbach
29e1a82f56 Add missing override specifer to WebFlowCredentials
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-02-13 10:22:01 +00:00
Nextcloud bot
6a3260ec26
[tx-robot] updated from transifex 2021-02-13 03:44:20 +00:00
Camila
24ab49da18
Merge pull request #2914 from marcohald/master
Configuration Options for Windows Registry
2021-02-12 19:06:04 +01:00
marcohald
6032f2baef
Merge branch 'master' into master 2021-02-12 15:19:34 +01:00
Marco Hald
43ed8423e5 Configuration Options for Windows Registry
Added the configuration  options
        confirmExternalStorage
        crashReporter
        newBigFolderSizeLimit
        useNewBigFolderSizeLimit
    to the Windows registry

Signed-off-by: Marco Hald <marcohald@users.noreply.github.com>
2021-02-12 12:23:51 +01:00
Kevin Ottens
81831fd69a
Merge pull request #2919 from nextcloud/validate_ssl_providers_certificate
Validate the providers ssl certificate
2021-02-12 10:50:41 +01:00
Felix Weilbach
74d07e28cf Validate the providers ssl certificate
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
2021-02-12 08:25:59 +00:00
Nextcloud bot
6ff3d67f61
[tx-robot] updated from transifex 2021-02-12 03:44:56 +00:00
Nextcloud bot
c6cd25c5ce
[tx-robot] updated from transifex 2021-02-11 03:44:29 +00:00