chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-17 14:48:09 +02:00
Code Activity
17,214 Commits 4 Branches 173 Tags
v3.4.0-do-not-use
Commit Graph
17214 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
allexzander c89d351d97 Fix incorrect type when reading the 'logExpire' property from config. 
Signed-off-by: allexzander <blackslayer4@gmail.com>
 2021-03-12 10:23:31 +02:00
Nextcloud bot 90a06aa57b [tx-robot] updated from transifex 2021-03-12 03:48:03 +00:00
Felix WeilbachandGitHub 72858da27b Merge pull request #2967 from nextcloud/bugfix/fix-missing-error-handling-download-encrypted 
Add missing error handling for downloads of client side encryption
 2021-03-11 14:40:40 +01:00
Felix WeilbachandFelix Weilbach (Rebase PR Action) 88426de4dd Add missing error handling for downloads of client side encryption 
The missing error handlers can cause the sync to hang forever

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-11 10:59:08 +00:00
Felix WeilbachandGitHub 6fac2d1e40 Merge pull request #2976 from nextcloud/refactor/split-out-valuable-activities 
Split content of User::isValueableActivity()
 2021-03-11 11:57:55 +01:00
Felix WeilbachandFelix Weilbach (Rebase PR Action) e3ac63e9ff Rename isActivityIgnored() to isUnsolvableconflict() 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-11 09:42:38 +00:00
Felix WeilbachandFelix Weilbach (Rebase PR Action) 05d31e2e53 Split content of User::isValueableActivity() 
Refactoring of User::isValueableactivity() because of changes
introduced with merge commit f17c52d.

Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-11 09:42:38 +00:00
Nextcloud bot 0ce965e8da [tx-robot] updated from transifex 2021-03-11 03:51:50 +00:00
CamilaandGitHub ed8f081b4a Merge pull request #2986 from nextcloud/bump-version-3.1.81 
Bump version to 3.1.81
v3.2.0-rc1 		2021-03-10 15:31:22 +01:00
Felix Weilbach 18b282d213 Bump version to 3.1.81 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-10 15:06:47 +01:00
Felix WeilbachandGitHub b5cf820b42 Merge pull request #2895 from nextcloud/wizard_ui_improvements 
Improve wizard ui
 2021-03-10 12:54:43 +01:00
Felix Weilbach e0b7ef15b2 Restyle wizard pages 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-10 09:55:40 +01:00
Felix Weilbach f55e5b1885 Restyle wizard 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-10 09:55:40 +01:00
Felix Weilbach 9185956069 Split out wizard welcome page 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-10 09:55:40 +01:00
Felix Weilbach 05d2a87840 Add new wizard icons and remove obsolete ones 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-10 09:55:40 +01:00
Felix WeilbachandGitHub 344b28d2f8 Merge pull request #2979 from ivaradi/no-externc-glib2 
Do not include glib.h with extern C (2)
 2021-03-10 09:54:48 +01:00
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áradiandGitHub 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 WeilbachandGitHub 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 WeilbachandFelix Weilbach (Rebase PR Action) 63dbb90bbd Iteration 
Signed-off-by: Felix Weilbach <felix.weilbach@nextcloud.com>
 2021-03-05 11:32:44 +00:00
Felix WeilbachandFelix Weilbach (Rebase PR Action) 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 WeilbachandGitHub 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 WeilbachandGitHub 97cd61140e Merge pull request #2931 from elsiehupp/build-instructions 
Improve OSX build Instructions
 2021-03-01 19:15:34 +01:00
Elsie HuppandFelix Weilbach (Rebase PR Action) 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 OttensandGitHub 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 WeilbachandKevin Ottens (Rebase PR Action) 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 KaminskyandGitHub 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
allexzanderandGitHub 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
allexzanderandallexzander (Rebase PR Action) 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 KaminskyandGitHub 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