chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-05 02:53:40 +02:00
Code Activity
11,836 Commits 4 Branches 173 Tags
v2.5.0-alpha
Commit Graph
5475 Commits
Author SHA1 Message Date
Markus Goetz ac0e08cc91 Merge branch '1.8' into 1.9 2015-05-12 23:02:58 +02:00
Olivier Goffart 76166c6252 SyncEngine: Fix comment 
A comment should descibe the code, and not a patch.
 2015-05-12 17:53:02 +02:00
Olivier Goffart dd5a49bc78 Application: Disable to workaround of QLockFile bug for Qt versions that are fixed 2015-05-12 17:26:32 +02:00
Markus Goetz 2a45ebde33 Networkjobs: Fix Qt 4 compile (again) 2015-05-12 17:19:17 +02:00
Markus Goetz cdfafa2180 Propagator: Mention name of conflict file (for debugging) 2015-05-12 17:11:21 +02:00
Olivier Goffart 299fa2dee6 FolderMan: fix a #warning in the migration path 2015-05-12 16:49:37 +02:00
Olivier Goffart c2dacd03a5 BandwidthManager: fix warnings 
Unused variables
 2015-05-12 16:35:27 +02:00
Olivier Goffart de9770f52a FolderMan: fix some signal-slot broken connection 
In many cases the alias was changed to a Folder pointer
 2015-05-12 15:50:38 +02:00
Olivier Goffart 389c4f8ef9 AccountManager: remove unused variable 2015-05-12 15:38:16 +02:00
Olivier Goffart 3a7bd3f95c AccountManager: save the config after removing an account 2015-05-12 15:37:16 +02:00
Olivier Goffart 1136b969b2 Folder: fix compilation after merge 2015-05-12 15:27:20 +02:00
Olivier Goffart 716b0c68da Merge remote-tracking branch 'origin/master' into new-ui 2015-05-12 15:20:40 +02:00
Olivier Goffart 1edd46b995 Multi-Account: add possibility to delete an account 2015-05-12 15:16:32 +02:00
Markus Goetz 00a075b0d8 Merge branch '1.9' 2015-05-12 13:49:55 +02:00
Markus Goetz 3b34d5b54e Account: Fix Qt4 compile 2015-05-12 13:49:07 +02:00
Jocelyn Turcotte 0f51de20c4 Fix the neon build 2015-05-12 13:04:47 +02:00
Jocelyn Turcotte ea39e457f5 Fix the build 2015-05-12 10:35:57 +02:00
Daniel Molkentin b54f2b3b31 Merge remote-tracking branch 'origin/1.9' 
Conflicts:
	VERSION.cmake
	src/libsync/propagatedownload.cpp
	src/libsync/propagateupload.cpp
 2015-05-12 10:03:38 +02:00
Daniel Molkentin a36df4aa4b Merge remote-tracking branch 'origin/1.8' into 1.9 2015-05-12 09:57:22 +02:00
Markus Goetz 9e7779a476 Bandwidth Manager: Comment out qDebug 
We have not received any grave bug reports for it, not needed anymore.
 2015-05-11 16:07:34 +02:00
Markus Goetz 625e61516f Propagator: Limit length of temporary file name #2789 (fixup) 
Fix 22c35c4d15
 2015-05-11 15:42:35 +02:00
Klaas Freitag 41614ec851 Application: ifdef lock file issue as it only happens on Qt>5.1 
However, the fix breaks Qt4 compile, so it needs to be ifdefed.
Not viel hilft viel.
 2015-05-11 13:35:04 +02:00
Markus Goetz 22c35c4d15 Propagator: Limit length of temporary file name #2789 2015-05-08 16:42:03 +02:00
Christian Kamm 9507bb4be6 ShareDialog: Password ui fixes. #3189 
* Change the textedit-empty text to be just "Password"
* Hide the 'Copy link' button when the share isn't created yet
* Show the checked and disabled 'Password required' checkbox
  when a password is required.
 2015-05-08 14:53:38 +02:00
Markus Goetz f2004da867 SSL: Re-use encryption session for different TCP connections #3159 
This also improves the SSL configuration creation and fixes #3027
 2015-05-08 14:21:27 +02:00
Christian Kamm e1c370a9a2 Fix startup hang by removing QSettings lock file. #3175 
In some situations the .lock file would stay around and
cause subsequent starts of the client to get stuck before
showing the ui.
 2015-05-08 14:02:44 +02:00
Christian Kamm b9eafaaf24 Wizard: Allow SSL cert dialog to show twice. #3168 
Normally we never ask twice for the same url, but in the setup wizard
it makes sense to do so.
 2015-05-08 12:32:14 +02:00
Christian Kamm 909368025f ProtocolWidget: Fix rename message. #3210 
For remote renames that are replicated locally the _file member is
overwritten by the target file name when the new entry is added to
the metadata table. Using _originalFile here guarantees that
the affected local file is mentioned.
 2015-05-08 11:33:34 +02:00
Markus Goetz 0359c775e0 Discovery: Test better, treat invalid hrefs as error #3176 2015-05-07 17:19:48 +02:00
Jocelyn Turcotte 1053153ec4 Fix the Qt4 build 
Following a6500d8068
Qt4's moc doesn't expand macros and wouldn't evaluate QT_VERSION_CHECK.
 2015-05-07 14:49:01 +02:00
Christian Kamm 79ac61684c Propagator: Overwrite local data only if unchanged. #3156 2015-05-07 14:43:33 +02:00
Christian Kamm 441eca86c4 ShareDialog: Improve error reporting for share API fails. 
This would have made debugging #3204 and #3136 easier.
 2015-05-07 14:16:13 +02:00
Markus Goetz f07d3d069e Updater on OS X: Only allow if in /Applications #2931 2015-05-07 13:04:25 +02:00
Markus Goetz e300e3c744 Wizard: Fix lock icon #1447 2015-05-07 13:04:25 +02:00
Christian Kamm 73e2254a80 AccountState: Treat *any* 503 as a temporary error. #3113 2015-05-07 09:21:52 +02:00
Jocelyn Turcotte 7ea1baaf2d Merge pull request #2920 from remixtj/utility_SHGetKnownFolderPath 
Use dynamic library loading for detecting the correct path for links
 2015-05-06 17:22:46 +02:00
Daniel Molkentin 77a28a81eb Bump to 1.9 2015-05-06 17:01:05 +02:00
Jocelyn Turcotte a6500d8068 Work around the Qt PUT corruption bug with Qt < 5.4.2 #2425 
Since QNonContiguousByteDeviceThreadForwardImpl::reset will
call UploadDevice::reset with a BlockingQueuedConnection, this
allows us to reset the HTTP channel along with its buffers
before they get the chance to be reused with a subsequent request.
 2015-05-06 16:56:50 +02:00
Luca Lorenzetto 027365aaa6 Additional code cleanup 2015-05-06 15:09:41 +02:00
Jocelyn Turcotte 58867baf33 Merge pull request #3183 from christian-burger/fix-for-windows-explorer-extension-when-syncing-whole-drive 
Windows Explorer: fix issues when syncing whole drive.
 2015-05-06 14:54:19 +02:00
Daniel Molkentin bceb40ed80 Disable setSslConfiguration calls for older Qt version 
This is only required for client certs, which currently have
no GUI anyway and are experimental.
 2015-05-06 11:20:16 +02:00
Daniel Molkentin f315423811 Merge remote-tracking branch 'origin/1.8' 
Conflicts:
	VERSION.cmake
 2015-05-06 10:04:22 +02:00
Christian Kamm 9e3c3353bd IgnoreListEditor: Remove invalid connect. #3201 
This has been around ever since the ignore editor was
added and the slot never existed.
 2015-05-06 09:34:45 +02:00
Christian Burger 79f7ea0965 refactoring as requested in pull request 2015-05-05 16:34:01 +01:00
Markus Goetz 07ffff3d77 SyncEngine: Fix accidental re-discovery because of broken version table 
Bug had been triggered by d63abef718
Broken version table in there since some time it seems like.
 2015-05-05 17:07:13 +02:00
Luca Lorenzetto f3bdfef9cf Integrating feedbacks provided by jturcotte 2015-05-05 16:42:34 +02:00
Daniel Molkentin bfba6f752c Remove dead code 2015-05-05 10:23:59 +02:00
Klaas Freitag d63abef718 SyncEngine: Handle upgrade case from 1.8.0 
If 1.8.0 caused missing data in the local tree, this patch gets it
back. For that, the usage of the journal for remote repository is
disabled at the first start.
 2015-05-04 13:40:25 +02:00
Christian Burger 018cc54a94 Windows Explorer: fix issues when syncing whole drive. 
When the local sync target is just a drive letter (e.g. "X:\"), neither
the display of the sync status via file icon overlay, nor the creation of a
share link works. In the latter case no pop-up comes up and no server
request is done.

QDir::cleanPath() usually removes trailing slashes, but not if the path to
be cleaned is just "X:\". In that case the trailing slash is kept. This
commit accounts for that exception.
 2015-05-04 10:29:25 +01:00
Markus Goetz 4700c604b1 Proxy: Register meta type #3170 2015-04-29 14:54:08 +02:00