chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-27 06:42:46 +01:00
Code
11,276 Commits 4 Branches 173 Tags 91 MiB
v2.4.0-rc2
Commit Graph

11276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Klaas Freitag
2d110540ee Dolphin Plugin: Use the Application name for the socket path (#5172) 
do not hardcode.

This should fix #5165
 2016-09-12 14:12:33 +02:00
Markus Goetz
907918dca3 FolderWatcher: Act on relative paths #5116 (#5153) 
(cherry picked from commit d5a481f132)
 2016-09-12 14:09:13 +02:00
Christian Kamm
5ffaf3a90f Set discovery thread priority to low #5017 
(cherry picked from commit bd7ec19644)
 2016-09-12 14:09:13 +02:00
Olivier Goffart
1040e7b57b ExcludeFiles: Fix when the folder casing is not the same in the settings and in the FS 
If the folder has different case in the settings and in the FS, we should
not ignore all the files. This is important for the files system watcher.

(cherry picked from commit 98268d102f)
 2016-09-12 14:09:12 +02:00
Olivier Goffart
65c49e1de6 CleanupPollsJob: Fix possible leak 
Missing deleteLater when the CleanupPollsJob aborts.
This is only a problem if the SyncEngine is kept alive a long time. Which is
usually not the case in the configuration where poll jobs are used.

(cherry picked from commit 3465024898)
 2016-09-12 14:09:12 +02:00
Christian Kamm
4abaee7736 Recall: Copy instead of move recalled file #5150 
That was an unintentional change in
2662203fb7

Also expand the test case to cover this.

(cherry picked from commit af9c4d0e2f)
 2016-09-12 14:09:12 +02:00
Markus Goetz
3cdcd8dea0 Selective Sync: Fix request loop and show error in view (#5154) 
I got into a situation where the model would endlessly request the directory
contents from the server because we did not notice yet that the server
is actually in maintenance mode while we were expanding the tree view when
changing the tab to the account or when just expanding it by clicking.
(cherry picked from commit 524220d090)
 2016-09-12 14:09:12 +02:00
Christian Kamm
cb19ebc9e3 ShareLink: Ensure the password line edit is enabled #5117 
(cherry picked from commit b541fea793)
 2016-09-12 14:09:12 +02:00
Daniel Molkentin
37adaa7872 Update owner to be ownCloud GmbH 
Fixes #5079

(cherry picked from commit a83c5598e8)
 2016-09-12 14:09:12 +02:00
Christian Kamm
9d93afb2a1 Switch target version of this branch to 2.2.4 2016-09-12 14:07:33 +02:00
Markus Goetz
d5a481f132 FolderWatcher: Act on relative paths #5116 (#5153) 2016-09-12 14:03:11 +02:00
Olivier Goffart
1d09f6b60f Allow to disable Shiboleth to build without QtWebkit (#5166) 2016-09-11 16:14:08 +02:00
Olivier Goffart
98268d102f ExcludeFiles: Fix when the folder casing is not the same in the settings and in the FS 
If the folder has different case in the settings and in the FS, we should
not ignore all the files. This is important for the files system watcher.
 2016-09-11 12:12:10 +02:00
Olivier Goffart
9e895a6ecc FolderStatusModel: Fix beginInsertRow/endInsertRow 
We need to do the change between the begin and the end call so the selection
don't get broken
 2016-09-11 12:12:10 +02:00
Olivier Goffart
7c75a39bc1 Chunking-NG: Some fixup after feedback from the pull request #5102 2016-09-10 12:30:14 +02:00
Markus Goetz
524220d090 Selective Sync: Fix request loop and show error in view (#5154) 
I got into a situation where the model would endlessly request the directory
contents from the server because we did not notice yet that the server
is actually in maintenance mode while we were expanding the tree view when
changing the tab to the account or when just expanding it by clicking.
 2016-09-06 11:11:03 +02:00
Christian Kamm
af9c4d0e2f Recall: Copy instead of move recalled file #5150 
That was an unintentional change in
2662203fb7

Also expand the test case to cover this.
 2016-09-06 10:42:59 +02:00
Jenkins for ownCloud
7c24ed769e [tx-robot] updated from transifex 2016-09-06 02:18:30 +02:00
Klaas Freitag
c97d8aa8fd Show the rename target in the client log file. (#5149) 2016-09-05 13:26:49 +02:00
Jenkins for ownCloud
65110f7a91 [tx-robot] updated from transifex 2016-09-05 02:18:30 +02:00
Jenkins for ownCloud
c33abd468d [tx-robot] updated from transifex 2016-09-04 02:18:30 +02:00
Jenkins for ownCloud
584b205bd5 [tx-robot] updated from transifex 2016-09-03 02:18:31 +02:00
Klaas Freitag
f0dc3b2deb FolderWatcher: Also ignore the new sync journal file name format. 2016-09-02 16:19:10 +02:00
Klaas Freitag
84ede3f01f Make sync journal name generating a method of SyncJournal. 
Before it was in Folder, however, the command line client does not
have the Folder class. To not duplicate code, the function to generate
the sync journal name went to SyncEngine class.
 2016-09-02 16:19:10 +02:00
Klaas Freitag
2daf895e43 Documentation: Mention the new format for the journal file. 2016-09-02 16:19:10 +02:00
Klaas Freitag
3b651b2da9 folderman: Clean some comments 2016-09-02 16:19:04 +02:00
Klaas Freitag
6fd930908c csync_tests: Adopted to new cmocka API. 2016-09-02 15:49:54 +02:00
Klaas Freitag
62125a442d csync_exclude: Also exclude the new syncjournal filename. 2016-09-02 15:49:21 +02:00
Klaas Freitag
2d54fb2ff9 csync_update: Do not check to exclude .csync_journal.db 
It is indeed already handled by csync_exclude.
 2016-09-02 15:48:45 +02:00
Klaas Freitag
e46fad52bb Make the sync journal file name a method of the Folder class. 
The sync journal name has a dependency on the remote url now.
 2016-09-02 12:29:21 +02:00
Jenkins for ownCloud
b75f50d62c [tx-robot] updated from transifex 2016-09-02 02:18:31 +02:00
Jenkins for ownCloud
14457e93e6 [tx-robot] updated from transifex 2016-09-01 02:18:31 +02:00
Olivier Goffart
c41f6ed76b Chunking-NG: use new dav URL for the move 2016-08-31 12:12:34 +02:00
Olivier Goffart
818b5854ce Chunking-NG: Qt4 compile 2016-08-31 10:28:44 +02:00
Olivier Goffart
79abb8b4e3 ChunkingNg: enable depending on an environment variable 2016-08-31 10:28:15 +02:00
Olivier Goffart
fad387b6b8 Chunking-Ng: Resume 2016-08-31 10:28:15 +02:00
Olivier Goffart
a1558100b8 WIP: new chunking algorithm 
Current limitations of this WiP
 - No resuming implemented yet
 - No parallel chunks
 - Hackish way to get the webdav paths
 2016-08-31 10:28:15 +02:00
Olivier Goffart
4f3f642da6 Upload: refactor the upload in two classes so the new chuning can be implemented 2016-08-31 10:28:15 +02:00
Olivier Goffart
86eab48981 Qt4 Compile 2016-08-31 10:27:20 +02:00
Olivier Goffart
d2bde5489f Propagator, remove the QNAM in the name as the alternative has been removed a long time ago 2016-08-31 10:25:06 +02:00
Jenkins for ownCloud
9c0ecad420 [tx-robot] updated from transifex 2016-08-31 02:18:30 +02:00
Jenkins for ownCloud
85b5fdb3d3 [tx-robot] updated from transifex 2016-08-30 02:18:35 +02:00
Jenkins for ownCloud
f2c6669224 [tx-robot] updated from transifex 2016-08-29 02:18:30 +02:00
Jenkins for ownCloud
d8f9bf3a0b [tx-robot] updated from transifex 2016-08-28 02:18:32 +02:00
Jenkins for ownCloud
d5fa8faa91 [tx-robot] updated from transifex 2016-08-27 02:18:32 +02:00
Christian Kamm
39e93768ea Account wizard: Enable back button consistently #5107 
Tested with http auth and shib auth.
 2016-08-26 13:12:25 +02:00
Christian Kamm
c1eb9244d1 Shibboleth: Fix detection in account wizard #5138 
Following redirections generally
(bb5c2cbfa5) meant that the special
shib-redirection detection code was no longer being used.
 2016-08-26 12:58:06 +02:00
Jenkins for ownCloud
d1a1b95926 [tx-robot] updated from transifex 2016-08-26 02:18:32 +02:00
Jenkins for ownCloud
ee2a67e332 [tx-robot] updated from transifex 2016-08-25 02:18:31 +02:00
Markus Goetz
6ecda6e7f4 Merge branch '2.2' 2016-08-24 11:39:12 +02:00