16343 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Markus Goetz	a6c9e8c5b4	Merge branch 'kill_legacy_propagator'	2015-10-28 11:06:50 +01:00
Markus Goetz	9337927722	legacy propagator: Remove more code	2015-10-28 10:59:02 +01:00
Christian Kamm	c81b02c7d9	csync tests: Remove unused function	2015-10-28 10:04:15 +01:00
Christian Kamm	5ea09d2668	Checksum: Disallow ADLER32, use Adler32 #3735	2015-10-28 09:59:33 +01:00
Christian Kamm	b9fc4c5994	Checksum: Fix recomputation when forced in cfg file #3735 ... Don't recompute the checksum on each upload when the server does not advertise supporting checksums.	2015-10-28 09:56:39 +01:00
Christian Kamm	f1b500d3e0	Checksum: Add env variables to disable #3735	2015-10-28 09:56:39 +01:00
Christian Kamm	dff37e11eb	Propagate: Store computed checksums in db during upload #3735	2015-10-28 09:56:39 +01:00
Christian Kamm	b1387f801b	Propagate: On download store checksum header in db #3735	2015-10-28 09:56:39 +01:00
Christian Kamm	60b2312ab6	SyncJournal: Add checksumHeader column to metadata table #3735	2015-10-28 09:56:39 +01:00
Christian Kamm	0354289795	Checksums: Improvement in async computation and validation #3735	2015-10-28 09:56:39 +01:00
Christian Kamm	c11c35c459	Revert "In case of empty checksum type, emit validated." ... This reverts commit b05ca526a4. The checksum type setting should not matter for downloads.	2015-10-28 09:56:39 +01:00
Christian Kamm	7c5e70ac3c	PropagateUpload: Fix double-emission of finished #3844	2015-10-28 09:53:54 +01:00
Christian Kamm	d2e5ba123d	Fix compile after pull request merge ... It conflicted with the optimization in f18b40f7e7	2015-10-28 09:53:06 +01:00
Klaas Freitag	0c9568f6dc	Merge pull request #4004 from owncloud/fix_hidden_detection ... Fix hidden detection	2015-10-28 09:28:35 +01:00
Olivier Goffart	f1d48a9356	Folder Model: The item needs to be selectable for the currenIndex to appear selected ... And we set the current index in AccountSettings::slotLinkActivated	2015-10-27 17:37:12 +01:00
Olivier Goffart	89f2a9e6dc	Account Settings: A link should make sure all the parents are expanded	2015-10-27 17:37:12 +01:00
Klaas Freitag	a203da3919	FolderStatusModel: Check for null argument at start.	2015-10-27 17:37:12 +01:00
Klaas Freitag	1c1ef52cf1	AccountSettings: Display a link for undecided dirs in the sub text. ... This only works in case the index is known. If not, no link is shown, but we wait for the next update of the model.	2015-10-27 17:37:12 +01:00
Klaas Freitag	40c82c5c36	AccountSettings: Add index to undecided folder to be able to select it.	2015-10-27 17:37:12 +01:00
Klaas Freitag	81f0c6535e	Enable external links in the label.	2015-10-27 17:37:12 +01:00
Klaas Freitag	46558d79a5	Add slot to handle clicks on folder names.	2015-10-27 17:37:12 +01:00
Olivier Goffart	e86b4203b9	IgnoreFiles: Fix the socket API would not load the new custom ignored files #3496 ... We did not flush or closed the file after having modified it from the UI. So when the socket api was reloading it, it wouldn't be able to load the newly added rules	2015-10-27 16:07:59 +01:00
Olivier Goffart	05dd9554f9	SocketApi: Fix returning ignore for the root item all the time	2015-10-27 16:06:38 +01:00
Olivier Goffart	30a0423f81	Dolphin integration: fix error icons	2015-10-27 15:19:10 +01:00
Olivier Goffart	26e1223f9a	FolderStatusModel: reset also if a folder was renamed #4011	2015-10-27 13:51:56 +01:00
Olivier Goffart	84a04de7be	Settings Dialog: don't put padding on the toolbar extension ... Otherwise the extension just disapear with some styles (see Issue #3795)	2015-10-27 13:42:25 +01:00
Olivier Goffart	3ff7fa0092	Merge pull request #3997 from owncloud/phil-davis-patch-1 ... ChangeLog 2.0.2 minor typos for 2.0 branch	2015-10-27 12:58:59 +01:00
Olivier Goffart	3f2a2cb14b	FolderDelegate: put the progressbar in place of the remote or local folder #3403 #3569 ... So the size of the delegate does not change	2015-10-27 12:52:33 +01:00
Olivier Goffart	fac00348d9	Use the term folder sync connection in more places #3757	2015-10-27 12:12:21 +01:00
Olivier Goffart	3c93fd4fb7	AccountSettings: don't disable pause when offline (#4010)	2015-10-27 10:32:33 +01:00
Klaas Freitag	6b71273380	Discovery: Fix detection of hidden files. ... In the discovery phase we want to detect that dot-files are hidden on Linux and Mac. This fixes strange behaviour seen in issue #3980	2015-10-26 14:24:05 +01:00
Olivier Goffart	dccf4e9c34	Download: Soft errors for error while resuming (#4000)	2015-10-26 12:31:07 +01:00
Olivier Goffart	39289a3164	SocketAPI: don't trim the command #3297	2015-10-26 10:15:50 +01:00
Jenkins for ownCloud	6611d878ea	[tx-robot] updated from transifex	2015-10-25 02:19:01 -04:00
Jenkins for ownCloud	c3fc711095	[tx-robot] updated from transifex	2015-10-24 02:18:59 -04:00
Olivier Goffart	84f1bdbc87	Folder::wipe: We need to shut the socket API down before removing the DB ... Because the DB stays open and locked. Should fix #3824	2015-10-23 17:43:01 +02:00
Phil Davis	2eb5715599	ChangeLog 2.0.2 minor typos for 2.0 branch ... These changes were committed to 2.0.2-rc1 branch https://github.com/owncloud/client/pull/3957/files 6da2139a1b but that branch was never merged up into 2.0 (or 2.0.2-rc2) so the changes never went anywhere. These changes could also be applied on 2.0.2-rc2 and 2.0.2 branch for completeness - then they would be in every branch in which they have appeared.	2015-10-23 21:21:31 +05:45
Olivier Goffart	c93defc82d	SyncEngine: remove unused functions	2015-10-23 17:11:19 +02:00
Olivier Goffart	bd39c64798	Delete all files: make the 'Keep' on by default ... On windows, we need to specify at least one AcceptRole. Otherwise the DestructiveRole might become the default Issue #3824	2015-10-23 17:06:14 +02:00
Olivier Goffart	42a6b242c7	SettingsDialog: use QWidgetAction for the toolbar so the extension works ... When the toolbar is full because there is no enough room, make the extension of the toolbar work, by using QWidgetAction::createWidget instead of QToolBar::insertWidget There should not be prolem when the window is too narrow. Relates #3832	2015-10-23 16:23:37 +02:00
Markus Goetz	e5570c24f2	Merge pull request #3995 from owncloud/return-code-of-version-and-help ... owncloudcmd: Make returncode 0 for --version and --help	2015-10-23 15:36:01 +02:00
Joas Schilling	6d87bd15cd	Make returncode 0 for --version and --help	2015-10-23 15:17:29 +02:00
Olivier Goffart	d657c00b11	FolderStatusModel: fix getting the size of the folder in the selective sync (#3986) ... Regressed since d610693af1. The problem is that the _size vector contains the pathToRemove and that it was removed before. Reorganize a bit the code so there is only one loop that has still all the information.	2015-10-23 15:13:15 +02:00
Jenkins for ownCloud	6fae06f1d0	[tx-robot] updated from transifex	2015-10-23 02:19:00 -04:00
Olivier Goffart	f18b40f7e7	csync_vio: reuse the information from readdir in stat ... On unix we don't safe much (otherwise csync would have been designed differently). On windows however, the readdir already fetch all the info, so we can as well use it. We still have to query for the file id but we might optimize that later	2015-10-22 18:46:41 +02:00
Olivier Goffart	6a0633083d	Network Settings: Adjust the bandwidth limit option with old Qt ... - Disable the whole group box - Add a tooltip explaining why it is disabled - Make sure it is disabled in the settings in case of upgrade - Do a runtime check in case the running Qt is greater	2015-10-22 17:57:34 +02:00
Daniel Molkentin	899f52be4f	Revert "Settings dialog: remove the close button #3713" ... This reverts commit ebee6f0bc2. Unix window managers do not have a reliable way of hinting buttons, so we need the close button.	2015-10-22 16:20:59 +02:00
Olivier Goffart	91525a7d33	csync_exclude: Don't ignore invalid char client side (#3736) ... If the server does not support it, then the server will reply with an error	2015-10-22 12:32:53 +02:00
Olivier Goffart	455c3ae57d	test/CMakeLists.txt: remove comments	2015-10-22 12:32:53 +02:00
Jenkins for ownCloud	b5390b5aa2	[tx-robot] updated from transifex	2015-10-22 02:19:02 -04:00