16714 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Jenkins for ownCloud	af5a7063c9	[tx-robot] updated from transifex	2015-05-12 02:18:49 -04: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
Jenkins for ownCloud	4d3a0ed250	[tx-robot] updated from transifex	2015-05-11 02:18:44 -04:00
Jenkins for ownCloud	cac15988f0	[tx-robot] updated from transifex	2015-05-10 02:18:49 -04:00
Jenkins for ownCloud	1e131f4732	[tx-robot] updated from transifex	2015-05-09 02:18:53 -04: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
Jenkins for ownCloud	15bfa46023	[tx-robot] updated from transifex	2015-05-08 02:18:56 -04: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
Klaas Freitag	b9df8290c9	Merge pull request #3208 from owncloud/dev/gcc5 ... Compile with GCC 5 - thanks for the pr	2015-05-07 09:52:36 +02:00
Christian Kamm	73e2254a80	AccountState: Treat *any* 503 as a temporary error. #3113	2015-05-07 09:21:52 +02:00
Jenkins for ownCloud	352c2957b2	[tx-robot] updated from transifex	2015-05-07 02:18:55 -04:00
Hefee	23b6426dfa	Compile with GCC 5 ... this fixes the error and makes complete oCC compile with GCC 5. error: ISO C does not support '__FUNCTION__' predefined identifier [-Wpedantic] According to the porting guide: The fix is either to use the standard predefined identifier __func__ (since C99), or to use the __extension__ keyword.	2015-05-07 01:15:55 +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
Daniel Molkentin	24f751d981	master is 2.0	2015-05-06 16:59:23 +02:00
Jocelyn Turcotte	9ef8658122	shell_integration on OSX: Avoid too many RETRIEVE_FILE_STATUS following UPDATE_VIEW #3122 ... Do not request the status of all entries in the cache. Instead force Finder to request the ones that it deems necessary by keeping the old statuses in a separate dictionary which are only used while the new status arrives.	2015-05-06 16:56:50 +02:00
Jocelyn Turcotte	0a67719f2f	shell_integration on OSX: Do not fill the cache with unsolicited statuses #3122	2015-05-06 16:56:50 +02:00
Jocelyn Turcotte	04d820f9cf	shell_integration on OSX: Remove dead code ... removeIcons isn't called and clearFileNameCacheForPath was always called with a "nil" path. Remove the return value of askForIcon which was always 0, and use that value explicitly at the only call site. Remove the "-1" code path in iconByPath since setIcons prevents -1 from getting into _fileNamesCache in all cases.	2015-05-06 16:56:50 +02:00
Jocelyn Turcotte	931dd59844	Don't hardcode the source directory in deploy.sh	2015-05-06 16:56:50 +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
Jocelyn Turcotte	0d5d2c578d	shell_integration on Windows: Avoid too many RETRIEVE_FILE_STATUS following UPDATE_VIEW #3122 ... Do not request the status of all entries in the cache. Instead force explorer to request the ones that it deems necessary by keeping the old statuses in a separate dictionary which are only used while the new status arrives.	2015-05-06 16:48:34 +02:00
Jocelyn Turcotte	77679790db	shell_integration on Windows: Don't fill the cache with unsolicited statuses #3122 ... Only keep the status updates if explorer is going to display it.	2015-05-06 16:48:33 +02:00
Christian Kamm	8d93af21a1	Doc: Fix the section config values should be in.	2015-05-06 15:55:25 +02:00
ckamm	7c0c7da9bf	Merge pull request #1928 from willyaranda/patch-1 ... Clarify the remotePollInterval variable	2015-05-06 15:53:11 +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
Klaas Freitag	ee71024496	Changelog: Clearify changelog entries.	2015-05-06 11:43:58 +02:00
Daniel Molkentin	b1f326054f	Update Changelog	2015-05-06 11:25:04 +02:00