6388 Commits

Author	SHA1	Message	Date
Klaas Freitag	75b38d1a2f	Abort the request and reset the QNAM if user does not ACK a new cert. ... This is supposed to fix bug #3283	2015-06-02 12:21:49 +02:00
Christian Kamm	2435ba7e7d	Windows: Fix unit test build.	2015-05-27 14:59:28 +02:00
Olivier Goffart	28a66cb393	SettingsDialogMac: adapt to multi-account	2015-05-26 17:37:15 +02:00
Olivier Goffart	507206367f	Merge branch 'master' into new-ui	2015-05-26 14:56:08 +02:00
Olivier Goffart	9e17ddffae	Confirm feature: document the white/black/unconfirmed lists	2015-05-26 14:41:29 +02:00
Olivier Goffart	a621223cc8	SyncEngine: add an api to set the maximum size of new shared folder that do not require confirmation	2015-05-26 14:41:01 +02:00
Olivier Goffart	7bb2834d8b	Confirm feature (The sync engine part)	2015-05-26 12:34:07 +02:00
Olivier Goffart	10d9e53159	Confirm feature: Use selective sync in the database	2015-05-26 12:34:07 +02:00
Olivier Goffart	2c67692958	JournalDb: add a table in the db for the selective sync	2015-05-26 12:33:54 +02:00
Olivier Goffart	5cb10bf6a1	PropfindJob: fix parsing of properties that have a sub element ... The default argument of readElementText is ErrorOnUnexpectedElement which abort the parsing of remaining elements	2015-05-26 12:33:54 +02:00
Olivier Goffart	54a42e401b	More compilation fixes after the merge	2015-05-26 12:33:19 +02:00
Olivier Goffart	6b27d2e703	Merge remote-tracking branch 'origin/1.8'	2015-05-26 12:28:31 +02:00
Klaas Freitag	6c46713701	include qtconcurrentrun header rather than QtConcurrent for Qt4	2015-05-22 14:46:29 +02:00
Olivier Goffart	3754e6c781	Disable the curruption workaround on mac and windows ... The binaries we ship have a patched Qt	2015-05-22 14:19:44 +02:00
Olivier Goffart	6b9e123816	Merge remote-tracking branch 'origin/checksum_1.8' into 1.8	2015-05-22 10:32:37 +02:00
Olivier Goffart	fb2295fcec	Merge branch 'recall' into 1.8	2015-05-22 10:32:26 +02:00
Christian Kamm	0af2f7e5ed	ConValidator: Always run with new credentials. #3266	2015-05-22 09:38:44 +02:00
Christian Kamm	1c84d01584	Windows: Fix build of tests.	2015-05-22 09:17:24 +02:00
Olivier Goffart	3fcce08a22	recall: move the recall code in a namespace	2015-05-21 16:23:54 +02:00
Olivier Goffart	289800c1ba	Recall: make it work even if it is not in the root directory	2015-05-21 16:06:53 +02:00
Olivier Goffart	9a02a0f3a8	Recall feature: Fix some style issues	2015-05-21 16:06:52 +02:00
Jakub Moscicki	4e79093f84	recall file prototype	2015-05-21 16:06:52 +02:00
Klaas Freitag	d2fff2c3e3	Theme: Allow to change the transmission checksum through theming.	2015-05-21 15:59:24 +02:00
Klaas Freitag	8f277e46d6	TransmissionChecksumming: Remove SyncFileItem dependency.	2015-05-21 15:51:48 +02:00
Klaas Freitag	c33d962712	TransmissonChecksumValidator: Add documentation.	2015-05-21 14:32:08 +02:00
Klaas Freitag	3870915118	TransmissionChecksumValidator: Reduce verbosity.	2015-05-21 14:31:39 +02:00
Klaas Freitag	b05ca526a4	In case of empty checksum type, emit validated.	2015-05-21 14:31:18 +02:00
Klaas Freitag	4e28a24af3	Let checksumType() read the config to destinguish checksum type.	2015-05-21 14:30:21 +02:00
Olivier Goffart	aebadfcda2	FolderWizard: Add missing Q_OBJECT which prevent translations from working	2015-05-21 12:53:55 +02:00
Klaas Freitag	dec3bd4a02	Some more minor cleanups based on the pull request review.	2015-05-20 22:44:12 +02:00
Klaas Freitag	64ce0cd7a2	Improved implementation efficiency of checksum calculation. ... Based on Oliviers suggestions the file read routine now reuses one buffer to read the entire file. Other cleanups.	2015-05-20 21:42:08 +02:00
Klaas Freitag	5b5a636cc1	Make TransmissionChecksumValidator child of the job for auto delete. ... That way no explicit memory management is needed as the allocation is freed when the job (parent) is deleted automatically.	2015-05-20 16:54:04 +02:00
Daniel Molkentin	5c6a6529a6	Merge pull request #3258 from binwiederhier/bugfix/issue3256-mkcol ... Add 'Content-Length: 0' header to MKCOL request; fixes #3256	2015-05-20 15:48:33 +02:00
Philipp Heckel	68fa190cf7	Add 'Content-Length: 0' header	2015-05-20 14:40:20 +01:00
Olivier Goffart	d148464efe	SyncJournalDb::updateErrorBlacklistEntry: lock the mutext at the beginning ... The mutex need to be locked before checkConnect, that's what all the other functions are doing	2015-05-20 15:30:19 +02:00
Klaas Freitag	17fe4c3b29	PropagateUpload: Fix typo in warn message.	2015-05-20 12:30:00 +02:00
Klaas Freitag	dd6c97abb6	Propagator: Added a log that tells if transmission checksumming is used.	2015-05-20 12:27:54 +02:00
Markus Goetz	330b352001	ProgressInfo: Fix Windows build	2015-05-20 11:59:33 +02:00
Klaas Freitag	ddfe3fa7ab	TransmissionChecksum: Fix identation.	2015-05-20 10:49:18 +02:00
Klaas Freitag	1f7274c2f2	TransmissionChecksum: Removed "pseudo" thread worker functions ... Removed the Worker postfix from the method names to reflect their non threaded character, they moved into a thread in the Validator class. Thanks ckamm for review.	2015-05-20 10:45:20 +02:00
Klaas Freitag	8b371c42b7	Propagate Download: Handle malformed checksum header as error. ... Plus some cleanup, bool ok was not needed actually.	2015-05-19 17:09:40 +02:00
Klaas Freitag	c7f759fedf	Propagator: Use the TransmissionChecksumValidator class.	2015-05-19 17:09:40 +02:00
Klaas Freitag	830daa40d1	Add a class TransmissionChecksumValidator, incl. unit test. ... This does all needed to manage checksums that go with http headers ensuring that the transmission was correct.	2015-05-19 17:09:40 +02:00
Klaas Freitag	f016d25b4c	Propagate downloads: Handle checksum transmission header. ... Read a checksum from the HTTP header, and if its there, compare the downloaded tmp file against it. In case of corruption, schedule a redownload.	2015-05-19 17:09:40 +02:00
Klaas Freitag	e18fd62f34	Propagator: checksum constants go to propatorjobs header. ... So they can be used from both up- and download propagator jobs.	2015-05-19 17:09:40 +02:00
Klaas Freitag	3701fbcbfe	PropagateUpload: Add checksum calculation if required by config. ... If the config file has an transmissionChecksum entry, a checksum is added to the PUT requests in a header.	2015-05-19 17:09:39 +02:00
Klaas Freitag	67d38bc87b	Filesystem Utilities: Add Checksum calculation methods.	2015-05-19 17:09:39 +02:00
Klaas Freitag	ec83295b99	Branding: Append the appName short to the user agent string.	2015-05-19 17:09:39 +02:00
Klaas Freitag	e36252a845	Theme: (minor) remove some more mirall's	2015-05-19 17:09:39 +02:00
Klaas Freitag	d0d8de9f2f	MirallConfigFile: Add an option of transmission checksumming.	2015-05-19 17:09:39 +02:00
Daniel Molkentin	9693048f78	Find & use QtConcurrent	2015-05-19 17:09:39 +02:00
Klaas Freitag	101d2268ff	SyncFileItem class: Add member _checksum	2015-05-19 17:09:39 +02:00
Klaas Freitag	2fcad760b9	StopWatch: return the duration from the stop() command.	2015-05-19 17:09:39 +02:00
Olivier Goffart	f595fc2f9c	Fix opening external links for some labels ... Issue #3135	2015-05-15 18:44:19 +02:00
Markus Goetz	06c889630c	AccountState: Run only a single validator, allow error message overriding #3236 #3153	2015-05-15 12:27:35 +02:00
Markus Goetz	8a39748654	SyncJournalDB: Don't use NULL value ... Olivier says we should try to not be the same as the possible value for not existing entries.	2015-05-13 14:57:14 +02:00
Markus Goetz	3556ed416c	SyncJournalDB: Simplify code	2015-05-13 13:15:53 +02:00
Olivier Goffart	d7fa03cf2e	Systray menu: consider multiple account to choose the status	2015-05-13 13:10:14 +02:00
Markus Goetz	e5e2ce2b22	SyncEngine: Force re-read of folder Etags for upgrades from 1.8.0 and 1.8.1 ... This is a better fix than the previous one for the local-files-missing bug because it does not depend on the sync run to run fully through.	2015-05-13 12:54:49 +02:00
Olivier Goffart	af94e8943d	Systray menu: show one entry per account to open in a browser	2015-05-13 12:54:31 +02:00
Markus Goetz	39d103adf7	OwnSql: Fix numRowsAffected()	2015-05-13 12:54:03 +02:00
Jakob Nixdorf	a0e3858a7c	Install architecture-independent files to DATADIR. ... Change the installation target for the translations and the .desktop file to the architecture-independent DATADIR.	2015-05-13 09:54:01 +02:00
Markus Goetz	08184d07cf	Merge branch '1.9'	2015-05-12 23:03:45 +02:00
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
Olivier Goffart	e02f1a222e	FolderMan: refactor some function to take a Folder* instead of an alias ... I want to remove this dependency of alias in the code because we might get rid of it entierly later	2015-04-28 17:49:05 +02:00
Olivier Goffart	e4694a6db8	Setup wizard: Do not remove all the folders of all theother acocunts when adding an account ... Also we need the alias to be unique	2015-04-28 17:46:45 +02:00
Olivier Goffart	e5ad1b27b4	Settings dialog: show the first account page at start	2015-04-28 11:39:27 +02:00
Olivier Goffart	92e259c276	Add folder: Do not add at other accounts folder to know if you can add a folder	2015-04-28 11:29:35 +02:00
Olivier Goffart	f81918173b	Account settings: show the folder of the right account	2015-04-27 19:09:48 +02:00
Olivier Goffart	4006bcdaed	Wizard: Setup the folder in the right account	2015-04-27 17:43:07 +02:00
Olivier Goffart	3e4886725a	Folder: remove the member references to the FolderDefinition members	2015-04-27 17:33:59 +02:00
Olivier Goffart	f688bda759	Wizard: Save the settings after adding an account ... So the account persist even if the client is not properly closed	2015-04-27 17:19:46 +02:00
Olivier Goffart	ac855858de	owncloud gui: move a comment where it belongs ... The code was moved long time ago in commit ea1c95100 but the comment stayed. I have no idea if the comment is still accurate	2015-04-27 17:14:25 +02:00
Olivier Goffart	ae17f58b80	HTTP Creds: Do not send the password at every request	2015-04-27 16:28:37 +02:00
Olivier Goffart	23dc464ea2	Folderman: Fix crash when adding an account ... Clang is picky if we forget to return a value	2015-04-27 14:34:39 +02:00
Olivier Goffart	04382c467b	Progress: Fix broken signal connection	2015-04-27 12:34:15 +02:00
Olivier Goffart	be1b39067d	Merge branch 'master' into new-ui	2015-04-27 12:32:12 +02:00
Olivier Goffart	ddfb7f3b7a	Merge remote-tracking branch 'origin/1.8'	2015-04-27 12:20:11 +02:00
Christian Kamm	78e82eb920	AccountWizard: Fix auth error handling. #3155 ... The problem was that on network error the networkError() and finishedWithError() signals both fired. To fix it, I collapse all error handing into a slot triggered by finishedWithError(). I tested the redirection case and the invalid credentials case.	2015-04-24 16:03:28 +02:00
Christian Kamm	27159104a9	Folders: Store inside account config.	2015-04-24 13:42:35 +02:00
Christian Kamm	a13a974e2d	Account: Generate shorter account ids.	2015-04-24 09:54:42 +02:00
Markus Goetz	3a52db46ad	Discovery: Fix another empty-local-directory bug	2015-04-23 16:15:13 +02:00
Christian Kamm	f184d66ea2	Save and restore multiple accounts.	2015-04-23 16:08:20 +02:00
Christian Kamm	11927d625d	Fix crash on exit by not making Account parent of AccountState.	2015-04-23 16:08:20 +02:00
Christian Kamm	abfdc574d4	Add a basic random Account::id()	2015-04-23 15:47:49 +02:00
Christian Kamm	d64373c610	Never use 'new Account' directly, prefer Account::create()	2015-04-23 15:47:49 +02:00
Christian Kamm	28306e5dfb	Move AccountState::displayName to Account.	2015-04-23 15:47:49 +02:00
Christian Kamm	89bb58ac30	Ensure 'user' is available early enough for ui in httpcreds	2015-04-23 15:47:49 +02:00
Christian Kamm	3cc2e1a968	Fix bad connect/disconnects.	2015-04-23 14:24:54 +02:00
Christian Kamm	8390b0b930	Determine right account in ownCloudGui::slotShowShareDialog	2015-04-23 14:14:28 +02:00
Christian Kamm	dbddabfcd7	Remove SelectiveSyncText ... It is unused and there were compiler warnings about it not appearing it various switch() statements.	2015-04-23 14:13:33 +02:00
Christian Kamm	0d30e01e98	Add explanations to fixmes	2015-04-23 14:13:13 +02:00
Markus Goetz	137bce6dd0	Folder: Clear _syncResult better ... I had a situation here where we were showing stale desktop notifications when a remote folder errored out and then sync finished with _syncResult data from previous sync.	2015-04-23 13:30:30 +02:00
Christian Kamm	7c1281dd06	Windows: Fix rename of finished file. #3073 ... The file was still open and therefore couldn't be renamed...	2015-04-22 14:46:04 +02:00
Christian Kamm	68bf22f469	Revert "AccountSettings: Update progress only twice per second. #3014" ... This reverts commit 0f33e266ce. The change was not meant to be merged, see discussion in #3014.	2015-04-22 11:46:00 +02:00
Christian Kamm	96ecdb866d	Time estimate: Refactor remaining time guess. #2328	2015-04-22 11:20:31 +02:00
Christian Kamm	7d68c628db	Time estimation: Use a consistent check for size dependence. #2328	2015-04-22 10:45:41 +02:00
Christian Kamm	509b83e73e	Time estimation: Avoid a progress reset before finish. #2328 ... The current algorithm doesn't care much, but resetting progress to 0 just before completing a job is confusing anyway.	2015-04-22 10:45:41 +02:00
Christian Kamm	0f33e266ce	AccountSettings: Update progress only twice per second. #3014	2015-04-22 10:45:41 +02:00
Markus Goetz	6c5ca055c4	ShareDialog: Unused/invalid forward declaration	2015-04-21 10:33:38 +02:00
Olivier Goffart	cf5100a20b	Merge remote-tracking branch 'origin/1.8'	2015-04-20 14:58:45 +02:00
Jocelyn Turcotte	ffbf2fb6ce	Fix the neon build	2015-04-20 11:31:02 +02:00
Olivier Goffart	b039c2ce86	More change to compile with 5.5 ... The problem is again that QStringList no longer include QDataStream	2015-04-20 09:47:25 +02:00
Olivier Goffart	ba65187ad3	Fix compilation with Qt 5.5 ... Because of commit 90e7cc172a7521396bb2d49720ee4ceb9a9390b3 in qtbase, we now need to explicitly include QDataStream Fixes #2809	2015-04-19 11:02:43 +02:00
Jocelyn Turcotte	12d7484b85	Pass SyncFileItems by pointer instead of by value ... Use a QSharedPointer to keep the same ownership and continue passing the SyncFileItems as a const& when ownership isn't taken. This allows sharing the same allocations between the jobs and the result vectors. This saves about 20MB of memory (off 120MB) once all jobs are created.	2015-04-18 14:26:40 +02:00
Olivier Goffart	a932eac832	Multi-account WIP	2015-04-17 17:56:17 +02:00
Jocelyn Turcotte	155c965866	Prevent another crash in ~SocketApi #3118 ... Since the QLocalServer parent of the QLocalSockets gets destroyed after the _listeners QList, onLostConnection might try to update an already destroyed list. Fix the issue by simply making sure that _localServer is destroyed first.	2015-04-17 12:42:40 +02:00
Olivier Goffart	6c73f25747	HTTP creds: Fix translation of the password input dialog ... tr() needs Q_OBJECT	2015-04-17 12:19:37 +02:00
Olivier Goffart	2da3bfb96f	Merge branch 'master' into new-ui	2015-04-16 12:50:21 +02:00
Olivier Goffart	5dffd11755	Merge branch '1.8'	2015-04-16 12:49:31 +02:00
Olivier Goffart	8bb4af067a	Propagate download: Fix restoring files for which the conflict file exists ... For issue #3106 1) Always use the actual timestamp from the file in the file system to create the conflict file. This is important because if one edit a file several time, they should have different name. Also it makes more sens to have the mtime of the modified file. 2) Give the correct size to the job so we know when the temporary file is complete in case of resuming.	2015-04-16 11:36:01 +02:00
Olivier Goffart	458f336405	PropagateDownload: Read the mtime from the file system after writing it ... Because file system like FAT only have two second accuracy and would result in a upload if the mtime in the database is not the same as the one that was downloaded Issue #3103	2015-04-15 15:50:20 +02:00
Markus Goetz	7c9cffa5ae	ConfigFile: Remove unused functions	2015-04-15 14:58:27 +02:00
Daniel Molkentin	ed80a712ab	Sort folder sizes SelectiveSyncTreeView numerically ... Fixes #3112	2015-04-14 20:00:42 +02:00
Markus Goetz	2866e56c51	LsColXMLParser: More testing 2	2015-04-14 14:56:25 +02:00
Klaas Freitag	4283ab3b44	LsColJob: Create a XML parser object for better unit testability.	2015-04-14 13:43:05 +02:00
Klaas Freitag	c579069071	LsColXMLParser: let parse return bool.	2015-04-14 13:41:51 +02:00
Markus Goetz	9ffacd4ecd	Discovery: Explicitly check for XML parser errors ... ..instead of relying that our state machine does not do anything in that case.	2015-04-13 16:04:24 +02:00
Markus Goetz	9d5f5ea3bc	Discovery: Initialize error with EIO in constructor ... This is safer, initializing it in remote_vio_opendir_hook was enough though.	2015-04-13 15:54:08 +02:00
Markus Goetz	2dbd27af76	Discovery: Initialize error with EIO	2015-04-13 15:36:07 +02:00
Markus Goetz	0634a4d0c6	Discovery: Add a sanity check when results are parsed	2015-04-13 15:10:04 +02:00
Klaas Freitag	7b99877c68	owncloudcmd: Filter out empty lines in selectivesync	2015-04-12 12:59:25 +02:00
Klaas Freitag	ec81cdefb0	Networkjobs: Only log a subset of the account url. ... This avoids disclosing of user and password in the logfile which can happen in some cases.	2015-04-12 12:37:14 +02:00
Christian Kamm	9d8fc4aa4d	ProtocolWidget: Fix adding of seconds. #2535	2015-04-10 12:11:35 +02:00
Christian Kamm	57ac1d9ea2	AuthRedirect: Use the configured DAV path. #3082	2015-04-10 09:24:25 +02:00
Christian Kamm	d9ea6936ab	Handle redirect of auth request. #3082	2015-04-10 09:18:15 +02:00
Olivier Goffart	afdd01488f	AccountManager: Move out of libsync ... The AccountManager does not belong in the libsync because it is not part of the synchronisation algorithm, but is just an helper class for the UI to maintain the account and read/save the config	2015-04-09 16:19:17 +02:00
Olivier Goffart	f3cb5f8a9d	Merge remote-tracking branch 'origin/1.8'	2015-04-09 14:24:26 +02:00
Olivier Goffart	85ff245aef	Account settings: add the progress back on the new ui	2015-04-09 12:06:47 +02:00
Christian Kamm	adcf40afc3	Discovery: Speed up initial run. #2796	2015-04-08 15:43:49 +02:00
Christian Kamm	d986011067	Sync: Fix sync of deletions during 503. #2894	2015-04-08 10:50:08 +02:00
Roeland Jago Douma	5a83636f81	Only show share dialog if we are connected.	2015-04-08 09:53:57 +02:00
Jocelyn Turcotte	4a890eae38	SyncEngine: Fix a crash caused by an invalid DiscoveryDirectoryResult::iterator #3051 ... The default constructor of the iterator points to NULL, which makes it != end() but invalid to dereference. Use an integer index instead to keep 0 as a valid default value that can always correctly be checked against size(). Also make sure that no data is shared between threads by making the csync_vio_file_stat_t copyable and passing it as const.	2015-04-08 09:35:43 +02:00
Christian Kamm	760e11bc5d	Sharedialog: Fix compiler warnings.	2015-04-08 08:59:36 +02:00
Klaas Freitag	4a6f4919d7	More GUI refinements.	2015-04-07 13:38:01 +02:00
Klaas Freitag	b98040c7d5	ShareDialog: handle resize properly with elided text	2015-04-07 13:38:01 +02:00
Klaas Freitag	1240a8163d	ShareDialog: Some GUI rework requested by Jan.	2015-04-07 13:38:01 +02:00
Olivier Goffart	e15b9b5358	Merge remote-tracking branch into 1.8	2015-04-07 10:42:27 +02:00
Olivier Goffart	1617c9d482	PropfindJob: fix xml parsing ... It would only find the first property	2015-04-07 10:35:27 +02:00
Olivier Goffart	50ba73860c	Merge remote-tracking branch into 1.8	2015-04-07 08:02:55 +02:00
Markus Goetz	750cdc1910	AbstractSslErrorHandler: Also give QSslConfiguration	2015-04-06 21:46:03 +02:00
Olivier Goffart	f4e2c84111	AccountState: Fix uninitialized memory access spotted by valgrind ... QuotaInfo's constructor uses the AccountState's _state which is initialized after	2015-04-06 16:21:05 +02:00
Olivier Goffart	71d9f23068	theme: fix compilation of libsync without QtGui	2015-04-03 11:27:06 +02:00
Markus Goetz	7f2213416a	Discovery: Add warning if returned etag is 0 ... There will be another bugfix which fixes https://gist.github.com/jturcotte/3d5a7874d26bc27b1be9 directory.	2015-04-02 16:57:53 +02:00
Markus Goetz	9b9f0bdd4d	SyncEngine: Show more timing measurements #3064	2015-04-02 15:18:46 +02:00
Jocelyn Turcotte	c2fd7d6ebd	Clean up remains of SOCKETAPI_TCP	2015-04-01 15:03:42 +02:00
Jocelyn Turcotte	4a893c5267	Fix a crash on shutdown in ~SocketApi #3057 ... Deleting the QLocalSocket while iterating the QList with qDeleteAll would trigger onLostConnection, which would modify the list mid-air and leave dangling pointers in it.	2015-04-01 15:03:42 +02:00
Jocelyn Turcotte	2473183f19	Windows: Add version information for owncloud.exe ... This should help us know what version or build number a crash report was generated with.	2015-04-01 15:03:41 +02:00
Daniel Molkentin	f2fa812b0b	Updater: Give context as to which app is about to be updated ... Fixes #3040	2015-03-30 14:44:34 +02:00
Markus Goetz	ef89582d7e	Propagator: Fix compile	2015-03-30 08:41:53 +02:00
Olivier Goffart	426d2338d9	Settings: New UI that intergate the selective sync within the account settings	2015-03-27 16:50:35 +01:00
Christian Kamm	ba0c3256fa	Remove unused HttpConfigFile.	2015-03-27 13:20:10 +01:00
Markus Goetz	b6fe5d2cff	Propagator: Debug output regarding OC-ETag ... We can remove this in some time, but currently it is interesting to see for what server setup is no ETag but an OC-ETag.	2015-03-27 13:16:11 +01:00
Markus Goetz	9123fac545	owncloudcmd: Always trail path with / ... Else the csync code vs the Qt code get confused.	2015-03-27 13:15:43 +01:00
Markus Goetz	c6bc388001	Proxy: More debug, always set returned system proxy	2015-03-27 11:53:58 +01:00
Christian Kamm	ea985a85af	ProtocolWidget: Always add seconds to the DateTime locale. #2535	2015-03-27 11:25:30 +01:00
Christian Kamm	dfd9d8725c	Merge remote-tracking branch 'origin/1.8' ... Conflicts: doc/installing.rst	2015-03-27 11:19:59 +01:00
Christian Kamm	2578832002	Fix clang warnings about deleting incomplete 'Account'.	2015-03-27 11:11:44 +01:00
Markus Goetz	cfada67aa6	Proxy: Fix compile harder	2015-03-27 11:02:19 +01:00
Christian Kamm	5483682281	CookieJar: Don't accidentally overwrite cookies. #2808 ... Calling save() in the CookieJar destructor was problematic. For instance we sometimes create a new QNAM with a new CookieJar and then call setCookieJar() on it to assign some other jar. That destroy the fresh jar and potentially overwrite cookies. Also explicitly saving the account's cookies when the account is saved is more explicit and thus more reliable than counting on the Account destructor to do it.	2015-03-27 10:49:24 +01:00
Christian Kamm	2a8c23aac3	Account: Destroy on exit. ... During shutdown we want the account object to be deleted and therefore we need to be able to remove the strong reference in AccountManager.	2015-03-27 10:43:14 +01:00
Christian Kamm	88bc96fc4c	ConValidator: Delete instance if no credentials.	2015-03-27 10:43:14 +01:00
Christian Kamm	588129d852	HttpCreds: Delete password from old location. #2186	2015-03-27 10:40:19 +01:00
Markus Goetz	5c87a35fe4	Proxy: Fix compile	2015-03-26 18:36:37 +01:00
Markus Goetz	418185af9a	Qt4: Fix compile	2015-03-26 15:17:16 +01:00
Roeland Jago Douma	4b56cc6e08	On creation of a share always retrieve the share ... This makes sure that if a default expiration date is set this is reflected in the dialog. #2889	2015-03-26 13:48:33 +01:00
Christian Kamm	3cef771868	HttpCreds: Fill pw dialog with previous password. #2848 #2879	2015-03-26 09:25:45 +01:00
Markus Goetz	e0ae34f01b	SslButton: Make menu creation lazy ... Saves ~200msec on my not-so-old MBP on OS X. For #3007 #2990	2015-03-25 15:41:23 +01:00
Christian Kamm	a9a24c96fc	Themes: Cache icons instead of rebuilding a lot.	2015-03-25 14:59:28 +01:00
Markus Goetz	a202203325	Proxy: Fix issues with previous patch ... This is for #2993 and #2802	2015-03-25 12:25:49 +01:00
Markus Goetz	83c3d76966	Proxy: Look up system proxy from different thread ... We should actually upstream this into QNAM. This is for #2993 and #2802	2015-03-25 08:52:23 +01:00
Markus Goetz	99734f8d72	Account: Unusued variable	2015-03-25 08:52:23 +01:00
Olivier Goffart	dafc2d2b73	Sync engine: Check the blacklist for the right tree ... When the operation is download, we have a INSTRUCTION_NONE for the local tree, but we should not check the blacklist just yet.	2015-03-24 12:23:04 +01:00
Olivier Goffart	9c05150c12	SSLButton: Fix a crash ... Made with danimo. Attempt to fix a crash seen on breakpad reports. (cc06b990-0c10-40eb-bcec-4d3902150320)	2015-03-23 18:30:53 +01:00
Daniel Molkentin	c7eb85ef78	Activity: Correctly restore column sizes ... Fixes: #3005	2015-03-23 18:22:25 +01:00
Olivier Goffart	4df455f2e0	Add-folder Wizard: Select the newly created folder	2015-03-23 16:50:37 +01:00
Olivier Goffart	653a00d63d	Add-folder wizard: Make sure there is a scrollbar if folder names are too long ... Fixes #2962	2015-03-23 16:32:41 +01:00
Jocelyn Turcotte	3c9acdf724	Fix a crash when accessing a dangling UploadDevice pointer #2984 ... This is largely a guess, but this is the only place where we use a QIODevice to push data through QNAM and that the QIODevice isn't a direct child of the QNetworkReply. Fix the issue by making sure that we don't go back to the event loop and possibly handle network events between the destruction of the upload QIODevice and the QNetworkReply, which might lead to QNAM dereferencing a dangling QIODevice pointer.	2015-03-23 16:14:54 +01:00
Olivier Goffart	e81d1ab9b8	application: --confdir option with invalid direcotry now exit ... Show an error and exit if an invalid directory (eg, a file) is passed to --confdir Fixes: #2453	2015-03-23 15:02:27 +01:00
Olivier Goffart	9d7cf6b852	Merge remote-tracking branch 'origin/1.8'	2015-03-23 14:37:16 +01:00
Christian Kamm	4ef0ce112c	CookieJar: Session cookies should *not* be stored in cookies.db.	2015-03-19 11:57:25 +01:00
Christian Kamm	57c14a0eba	Windows: Reset QNAM as a workaround. #2899 #2895 #2973 ... The QNetworkAccessManager is reset when we are disconnected, just before attempting to fetch the server's status.php. This may help fix the problem described in various issues where we get 'Connection closed' or timeout errors after the OS has woken from sleep.	2015-03-19 11:40:47 +01:00
Christian Kamm	89f831e7d4	Remote delete: Consider 404 a success. #2919	2015-03-19 10:04:02 +01:00
Markus Goetz	06a2f58c51	Propagator: Introduce custom property to make error soft ... This can be set by a custom credential QNAM.	2015-03-17 23:31:30 +01:00
Jocelyn Turcotte	5264a8c7f6	shell_integration: Fix disappearing context menus on Windows #2898 ... Since each new connection to the socket API would trigger a broadcast of REGISTER_PATH to all existing connections, opening the context menu would trigger a SHChangeNotify call of the root directory through the overlay icon extension, which is currently also connected to the socket API, waiting for changes. Fix the issue by sending the initial REGISTER_PATH automatic response only to the connecting socket.	2015-03-13 20:53:59 +01:00
Luca Lorenzetto	9351c5eefa	Cleaner creation of link path. Using QDir ensures that every needed / is present	2015-03-13 16:23:43 +01:00
Markus Goetz	c42c9f0002	Propagator: Add comment	2015-03-13 15:48:35 +01:00
Daniel Molkentin	457f9b587d	Merge remote-tracking branch 'origin/1.8' ... Conflicts: src/gui/sharedialog.cpp src/gui/sharedialog.h	2015-03-13 14:03:03 +01:00
Christian Kamm	95f299f865	Remote folder wizard: Add optional manual entry #2613	2015-03-13 09:52:21 +01:00
Jocelyn Turcotte	e93c1ccb73	Install the crash handler earlier during startup ... This moves the crash handler installation during the OCC::Application contruction. This still leaves a window where crashes wouldn't be caught, leaving the QtSingleApplication and theme initialization code unreported, but isn't requiring any refactoring for now. Issue #2952	2015-03-12 17:16:05 +01:00
Jocelyn Turcotte	0f84510e6f	Fix the build with GCC 4.7 ... Disable bitfields completely in SyncFileItem with that compiler.	2015-03-12 14:54:11 +01:00
Christian Kamm	1dd3488973	Uploads: Fix big seeks on Windows. #2954	2015-03-12 13:18:08 +01:00
Christian Kamm	9249d6c2f9	Logging: Print instruction when job completed.	2015-03-12 10:26:44 +01:00
Christian Kamm	d0f07ee3a9	FolderMan: fix folderSyncStateChange emission. #2896 ... It was not emitted when a removed folder finished its sync, and that left the UI in an old state sometimes. Removing the Folder explicitly is unnecessary as a QSignalMapper will automatically remove mappings for deleted QObjects.	2015-03-12 10:00:45 +01:00
Christian Kamm	3992fba168	Activity: Set a message for conflicts. #2792 ... Also show size when conflicting files are downloaded.	2015-03-12 10:00:45 +01:00
Markus Goetz	f13dfc19a0	OS X: Fix UI glitches related to sync folder ... For #2113 and #2947	2015-03-11 16:42:12 +01:00
Jocelyn Turcotte	0fccf5e50d	Completely disable the crash handler if the user disabled it ... The config currently only disable the reporter, but still leaves the crash handler installed on startup. This causes conflicts when running those builds in lldb. Work around the issue by requiring the crash reporter to be disabled in the settings before owncloud can be run in lldb. This has the negative side-effect of not covering the initial ConfigFile loading with the crash handler. Issue #2946	2015-03-11 15:49:49 +01:00
Klaas Freitag	a2aab28ba6	ShareDialog: Connect the proper DateEdit signal.	2015-03-11 15:46:05 +01:00
Klaas Freitag	8e7b7caf04	ShareDialog: If the password is empty, disable button	2015-03-11 14:57:55 +01:00
Klaas Freitag	8cc5ff0e70	ShareDialog: Consider if resharing is not allowed on a share. ... If a file or directory is shared without resharing permission, the share dialog displays an error. This is not the optimal solution, but best for now, as we do not have the permissions available for the file manager plugin. This fixes #2923	2015-03-11 14:12:08 +01:00
Klaas Freitag	9086f09fe2	SocketAPI: If filename has a trailing slash, remove it. ... The SyncJournal stores the the names of directories without trailing slash.	2015-03-11 14:11:18 +01:00
Christian Kamm	efe9f1b442	Lnk: Work around QFile::rename() #2792 ... QFile::rename() fails if the source file is a shortcut to a file or directory that does not exist.	2015-03-11 12:29:33 +01:00
Jocelyn Turcotte	db7919dc2f	Shrink sizeof(SyncFileItem) by 20% ... Move all small fields together in the struct and make them use bitfields. Also remove the unused log::_other_remotePerm field.	2015-03-11 11:49:11 +01:00
Olivier Goffart	4a01644625	Disable parallel uploads for server versions <= 8.0.2 ... Issue #2938	2015-03-11 11:31:51 +01:00
Klaas Freitag	071177cee2	Output a more sensible error message for auth errors	2015-03-10 12:14:14 +01:00
Klaas Freitag	c88742fad3	Revert "SetupW: Display proper error messages if password or user was wrong." ... This reverts commit 396f38598f. This adds redundant code and potentially breaks Shibboleth	2015-03-10 11:17:35 +01:00
Markus Goetz	3b12b9d81d	Revert "Propagator: Delete job on finish" ... Needs a bit more thinking. This reverts commit 8746914f3b.	2015-03-09 16:19:16 +01:00
Markus Goetz	31e4009737	Propagator: Use QBA for responseTimestamp instead of QString	2015-03-09 15:52:52 +01:00
Markus Goetz	8746914f3b	Propagator: Delete job on finish	2015-03-09 15:41:43 +01:00
Klaas Freitag	2fa6839ac7	Make win32 build work again.	2015-03-09 15:14:55 +01:00
Klaas Freitag	b09e08c06f	ShareDialog: Made it less "webbish" for better usability. ... - Check the share checkbox automatically on open of the dialog - Use the date picker with popping up calendar - Proper initial size - no resizing and appearing and disappearing. Fixes probably #2917, also #2764	2015-03-09 14:33:02 +01:00
Jocelyn Turcotte	99f51998f2	Fix a crash in the crash reporter on OSX ... The install_name of dependent libraries need to be updated like we do for cmd and gui.	2015-03-06 19:28:53 +01:00
Klaas Freitag	396f38598f	SetupW: Display proper error messages if password or user was wrong. ... If the password or user was wrong during setup, the client showed a ConnectionClosed error instead of a proper Username or password wrong message. This was because in HTTPCredentials::slotAuthentication, the reply is closed, and a property is set to indicate the auth problem. This patch now checks at all occurences of networkErrors if it might have been an authentication problem, and displays something useful. There is a good chance that this is a sufficient fix for owncloud/enterprise#556	2015-03-06 16:41:59 +01:00
Klaas Freitag	d2848b9c26	Theme: Return the correct version string from version()	2015-03-06 16:41:59 +01:00
Markus Goetz	b622981b23	SyncEngine: Show a debug msg only when relevant	2015-03-06 09:28:50 +01:00
Markus Goetz	668de9bf31	Propagate: Don't retry direct download on abort	2015-03-05 21:56:39 +01:00
Markus Goetz	3f712dce02	ETags: For Folder and RequestEtagJob, always use Concatenation	2015-03-05 17:49:12 +01:00
Markus Goetz	2eaeaf33fa	Discovery: Change abort code a bit ... Now pressing pause in the UI will not show an error to the user.	2015-03-05 16:50:33 +01:00
Luca Lorenzetto	4e56b0d266	Use dynamic library loading for detecting the correct path for links	2015-03-04 17:28:43 +01:00
Klaas Freitag	398bca9fe4	Add OWNCLOUDSYNC_EXPORT prefix to make windows build.	2015-03-04 13:50:55 +01:00
Olivier Goffart	46d5d22f72	PropagateUpload: also read the OC-ErrorString header from the poll job	2015-03-04 12:01:41 +01:00
Olivier Goffart	97c221d860	PropagateUpload: add a few comments	2015-03-04 12:00:55 +01:00
Jocelyn Turcotte	a5d29e6d56	Fix missing symbols on XP ... Import a fix from libcrashreporter-qt that should remove usage of symbols not available in XP's msvcrt.dll This should help solving #2907 with the crash reporter enabled.	2015-03-04 09:51:54 +01:00
Markus Goetz	131cf63d8d	Propagator: Don't use 0,0 progress signals. ... They seemed to have messed up the calculation sometimes for the last chunk.	2015-03-03 17:46:57 +01:00
Olivier Goffart	4d85f1daec	setup wizard: use a PROPFIND instead of a GET on the webdav url ... In order to initiate the conneciton, we should not send a GET on the webdav URL because that is not a valid webdav command on a collection. Issue #2911	2015-03-03 16:03:53 +01:00
Klaas Freitag	f913cd97ee	DiscoveryJob: Fix progress display. ... This fixes #2909	2015-03-03 16:01:17 +01:00
Olivier Goffart	ccbeb86140	Fix build of the legacy propagator	2015-03-03 10:05:38 +01:00
Olivier Goffart	b43e0f5ebd	Do not ask for the password when the check server job times up ... QNetworkReply::OperationCanceledError may be both because of anthentication error (because the HTTPCredentials abort the reply) or because of a timeout (the timer abort the reply). We should only ask for the password if the reply was canceled because the password was wrong.	2015-03-03 09:21:24 +01:00
Markus Goetz	fe574dbbf9	Discovery: Free some memory before propagate (#2902)	2015-03-02 15:08:21 +01:00
Markus Goetz	7595c7e697	Discovery: Free some memory on VIO dir close (#2902)	2015-03-02 14:09:01 +01:00
Olivier Goffart	bd6769a3fd	LsColJob: one must now specify the properties ... So the discovery phase don't ask for the quota, and the selective sync don't ask for all the other properties Issue #2906	2015-03-02 11:03:25 +01:00
Markus Goetz	80f3c7584b	libowncloudsync: Don't link to Qt SQL and Qt XML ... For issue #2901 ..	2015-02-27 16:20:25 +01:00
Klaas Freitag	05624e3fc8	FileSystem: Remove QFileInfo based implementations. ... QFileInfo has to be refreshed if the underlying file has been modified in between. That is dangerous so ckamm and me decided to eliminate the QFileInfo based implementations. This was triggered by a bug that the client uploaded files that it should not have.	2015-02-27 15:27:49 +01:00
Christian Kamm	e381143a8f	Ensure good sync state if in-progress folder is deleted. #2896 ... The slotFolderSyncFinished() didn't reliably trigger because the folder was being deleted before the syncFinished signal could fire.	2015-02-27 12:39:19 +01:00
Christian Kamm	b03209ccef	Inform user about ignored long files. #2882	2015-02-27 12:12:39 +01:00
Markus Goetz	ec03ebd69f	Token Auth: Allow empty token ... Just username/password. The received token will automatically be stored inside the QNetworkCookieJar.	2015-02-27 11:58:18 +01:00
Roeland Jago Douma	51c617801d	static member QFileInfo::exists is not available on 4.8	2015-02-27 08:43:33 +01:00
Klaas Freitag	8507aba9f8	SocketAPI: Append trailing slash for directories in UPDATE_VIEW. ... This fixes #2233	2015-02-26 16:41:55 +01:00
Olivier Goffart	d8b6e00fe7	Propagator: Let network propagator job understand a new header OC-ErrorString ... This allows the server to send a readable error string in many cases	2015-02-26 15:53:09 +01:00
Christian Kamm	c8167b77c9	Remove mention of allprop #2865	2015-02-26 12:36:11 +01:00
Christian Kamm	c37792f58f	Propagator: Upload files with future timestamps. #2880	2015-02-26 11:00:06 +01:00
Christian Kamm	842e5ba5e0	Sharing: Fix for folders containing &. #2892	2015-02-26 09:58:09 +01:00
Roeland Jago Douma	fba9020950	Added copyright header	2015-02-25 18:32:25 +01:00
Klaas Freitag	506cc3908a	Add proper copyright headers to some files, fixes #2869	2015-02-25 17:00:27 +01:00
Klaas Freitag	ca00b02b0a	ShareDialog: Improve some GUI, fix #2850 ... This improves some wording and fixes some show/hide issues with password setting.	2015-02-25 13:44:27 +01:00
Klaas Freitag	201075827f	Sharedialog: Add a Share button.	2015-02-25 13:44:27 +01:00
Christian Kamm	5c7fd24ea8	Handle 503 due to maintenance more gracefully. #2884	2015-02-25 12:02:10 +01:00
Christian Kamm	76ac628153	Discovery: Distinguish 503 Storage not available. #2884	2015-02-25 12:02:10 +01:00
Christian Kamm	6f71bd9353	SocketAPI: Don't mark .lnk files as ignored on windows. #2447	2015-02-25 11:55:48 +01:00
Christian Kamm	f88398e776	lnk files: Fix exists() calls. #2792	2015-02-25 11:50:32 +01:00
Christian Kamm	08c33cd1dc	Discovery: Fix handling of 503 on a folder. #2884	2015-02-25 08:09:07 +01:00
Klaas Freitag	1929040bb7	Discovery: Preserve the error message.	2015-02-24 22:02:31 +01:00
Klaas Freitag	3af936c8a1	Some minor cleanups.	2015-02-24 22:02:29 +01:00
Daniel Molkentin	f38aa698eb	Don't translate dummy strings	2015-02-20 10:12:31 +01:00
Daniel Molkentin	366f3f68b8	Activity view: Always add date ... Fixes #2223	2015-02-20 10:12:19 +01:00
Jocelyn Turcotte	03e23da6a3	Show the settings also when no arguments are passed ... sendMessage would only be called if there were options to be sent to the running application. Fix the issue by having explicitly named messages and always send the show settings message. Issue #2374	2015-02-19 16:57:16 +01:00
Jocelyn Turcotte	2ddaf5a06a	Add a NO_MSG_HANDLER cmake option ... This allows QDebug to output to stdout or OutputDebugString to ease development.	2015-02-19 16:57:16 +01:00
Olivier Goffart	5e1aa7d383	SyncEngine: Fix move would re-upload the file ... Because SyncJournalDb::postSyncCleanup was deleting the entries in the database	2015-02-19 15:00:37 +01:00
Olivier Goffart	e1871eb325	libsync: Fix qWarning in SyncEngine::slotJobCompleted saying we cannot find the sync item when moving ... We need to compare against the original file name, that's why it's there	2015-02-19 13:13:45 +01:00
Olivier Goffart	1998b602b9	SyncEngine: better merge of the renames node ... The same file is on the two sync trees under different names in case of a rename We must therefore use the rename target as the key in the _syncItemMap to ensure that the trees are correctly merged. Also use the same UTF-8 decoding for the target than for the actual file in order to catch invalid utf-8 in the rename target	2015-02-18 12:41:06 +01:00
Olivier Goffart	193fca4a8b	SyncFileItem::operator<: must return false when two items are equal ... Fixes #2852	2015-02-18 12:41:06 +01:00
Olivier Goffart	fb77cd5f7e	SyncEngine: Fix detection of the server reconfiguration ... Some files might be kept (like the default files) The files should be considered as NONE only if they are NONE on both trees issue #2847	2015-02-17 16:44:13 +01:00
Daniel Molkentin	99d674c346	Default shiboolethwebview to 900x700, remember last size ... Also add host to the title Addresses #2285	2015-02-17 15:28:14 +01:00
Daniel Molkentin	9690ca0198	Explain the "crash now" button to translators	2015-02-17 14:03:09 +01:00
Olivier Goffart	9351c7485f	Try another way to fix the build	2015-02-17 14:04:16 +01:00
Olivier Goffart	d43b82dc82	Fix compilation with clang ... The compilation error was account.h:140:113: error: expected ')' const QList< QPair<QString, QString> > &queryItems = QList< QPair<QString, QString> >()); ^ followed by more errors. The problem is because the compiler has hard time disambiguiating the comma int foo(const QPair<int, int> &p = QPair<int, int>()); ^ It is indeed quite hard for the compiler to know if this comma is a separation between complate arguments or the separation between arguments of the functions. Use the C++11 construct instead which does not need commas	2015-02-17 11:09:45 +01:00
Olivier Goffart	ce195bd599	SyncEngine: add an getter to the journal	2015-02-17 11:08:16 +01:00
Olivier Goffart	c0c8a22fa3	SyncEngine: pass a non-const reference to the SyncFileItemVector in aboutToPropagate ... That way, users of the library can change the contents of the sync item vector.	2015-02-17 11:08:16 +01:00
Jocelyn Turcotte	a955defae5	Raise the share window to make sure that the user sees it	2015-02-16 16:47:00 +01:00
Daniel Molkentin	2423aa592f	Add new icons by Jan	2015-02-16 14:47:32 +01:00
Olivier Goffart	151228b2a6	Fix build when compiling libsync without QtGui ... Utility must stay QtGui-free, move the hidpiFileName to the theme which is the only part in libsync which uses it, and already has #ifdefs	2015-02-16 10:24:42 +01:00
Volkan Gezer	bd4f68233f	some typos, grammar and sentence fixes	2015-02-14 23:47:07 +01:00
Olivier Goffart	d6bdbf9f34	Logger: use qFormatLogMessage with Qt 5.4 so it respects the Qt logging preferences	2015-02-14 14:23:01 +01:00
Christian Kamm	40dbc78407	concatUrl: Remove manual parsing, add test. #2817	2015-02-13 14:53:55 +01:00
Daniel Molkentin	957c9f060d	GeneralSettings: Add OpenSSL version number to about text	2015-02-12 23:23:47 +01:00
Daniel Molkentin	0bf0bab1eb	One more Qt4 compile fix	2015-02-12 22:13:58 +01:00
Olivier Goffart	a7c97388a9	Fix Qt4 build for another error	2015-02-12 20:16:02 +01:00
Olivier Goffart	86c480ee09	Fix Qt4 build	2015-02-12 20:10:31 +01:00
Olivier Goffart	0184a00151	PropagateDirectory: make the code a bit more readable ... Do not call slotSubJobFinished when there is are no sub jobs because no sub jobs were finished. Instead just call a finalize method	2015-02-12 20:00:04 +01:00
Olivier Goffart	b9161aa06c	libsync: Fix a case in which canceling the sync would result in some folder never being sync'ed ... The problem occurs because of the sorting of items when we have things like bigfolder bigfolder/bigsubfolder bigfolder-2 Then, because dashes come before slash in ascii, the bigfolder-2 would come before its content and the propagator would thinkg bigfolder is empty and save the etag before it is processed Should fix issue #2832	2015-02-12 20:00:04 +01:00
Daniel Molkentin	00e42d1177	More HIDPI support ... Except for the non-native activity tab icon in settings, this should fix #11	2015-02-12 19:44:40 +01:00
Klaas Freitag	d37dd040d0	Sharedialog: Use new share link from ownCloud Server 8 on. ... This is derived from pull request https://github.com/owncloud/client/pull/2813	2015-02-12 17:04:03 +01:00
Christian Kamm	a2aef04f21	ConValidator: Avoid a double auth check during startup. #2801	2015-02-12 15:25:44 +01:00
Christian Kamm	8f75434558	QuotaInfo: Ensure only one QuotaJob during startup. #2801	2015-02-12 15:25:44 +01:00
Daniel Molkentin	3dd6bcc323	Disable GUI support for TLS client certificates ... The feature needs mor work	2015-02-12 15:17:59 +01:00
Olivier Goffart	063271e978	propagateupload: Disable parallel chunk upload for owncloud < 8 ... Issue #2743	2015-02-12 14:50:42 +01:00
Olivier Goffart	438c4fe72e	Account: put the server version in the account	2015-02-12 14:50:42 +01:00
Klaas Freitag	f4144d6d38	Merge pull request #2827 from rullzer/fix_2812 ... Added push button to sharedialog to set password	2015-02-12 13:49:56 +01:00
Klaas Freitag	eada70ba44	Sharedialog: Removed Thumbnail retrieval. ... It uses an unstable API that the server does not really support. We need to postpone that. Removed for now.	2015-02-12 13:47:07 +01:00
Daniel Molkentin	3439ea395b	Remove one more mention of certDate	2015-02-12 12:43:41 +01:00
Daniel Molkentin	ba3bab8f49	Remove certificateDate property and other superfluous code	2015-02-12 12:37:42 +01:00
Christian Kamm	9ba88f6baf	Windows: Sync .lnk files correctly. #2792	2015-02-12 11:27:58 +01:00
Christian Kamm	e4fce1250b	Progress: Ensure overall progress is between 0 and 100. #2648 ... This should *already* be the case - but @dahan1999 reported that it fixed #2648.	2015-02-12 10:09:07 +01:00
Roeland Jago Douma	8523803d94	Added push button to sharedialog to set password ... Added button to explicitly set the password (makes is clear the user has to do somethign!). Patch for #2812	2015-02-11 22:14:51 +01:00
Olivier Goffart	4f202e5f4c	Fix TokenCredentials compilation	2015-02-11 18:10:01 +01:00
Christian Kamm	91ae912373	ShareDialog: Don't crash with bad response. #2811	2015-02-11 16:02:50 +01:00
Christian Kamm	5cdf448693	SyncJournal: Use DELETE journal mode on FAT filesystems. #2693	2015-02-11 14:03:55 +01:00
Christian Kamm	89c69250ef	Fix crash in discovery thread dtor. ... Occasionally on Windows ~DiscoveryMainThread() triggered a crash. Probably because the QMutableLinkedListIterator was destroyed after it's underlying data had been removed (from the map). Cleaning up the map and lists was redundant anyway, so the destructor is changed to only explicitly destroy the vio_file_stat objects.	2015-02-11 14:00:23 +01:00
Christian Kamm	e79e2b80c8	SocketApi: Fix crash on exit. #2798 ... The _listeners list is destroyed before the _localServer. And since _localServer is the parent of all generated QLocalSockets, they get destroyed in turn - which triggers onLostConnection() and thus accessed the destroyed _listeners list. To avoid that, delete all active QLocalSockets in SocketApi before its members are destructed. We also now delete sockets when we're done with them. I think disconnected sockets would otherwise linger until SocketApi destruction.	2015-02-11 09:50:10 +01:00
Christian Kamm	f8b24ac34d	Fix reconnection after long network outage #2321 ... The problem was that StatusNotFound can indicate either a transient network problem or a permanent server configuration problem.	2015-02-11 09:24:56 +01:00
Christian Kamm	51b9ec30a9	Remove connect to removed slot. ... This seems to have slipped back in, probably during a complex merge in ba8b1bbe06.	2015-02-11 08:12:09 +01:00
Klaas Freitag	d45d3892cb	Account: Fix path assembling with QUrl, add query items separately. ... Otherwise Qt does encode the delimiter between path and query items. This fixes bug #2804	2015-02-10 17:13:27 +01:00
Klaas Freitag	0bf6a220ae	Merge pull request #2807 from rullzer/sharedialog_force_password_multshare ... Reset _public_share_id after we delete the share, thanks	2015-02-10 12:18:10 +01:00
Roeland Jago Douma	c44abf4918	Reset _public_share_id after we delete the share	2015-02-10 07:53:35 +01:00
Roeland Jago Douma	d7f5e89a1d	Sharedialog: retrive thumbnail from server for shares ... Initial patch for #2726. Request a thumbnail from the server if files are to be shared.	2015-02-09 22:17:37 +01:00
Olivier Goffart	51337a10af	LSCOL job: Fix getting the list of folders when there are non-ascii ... Task #2795	2015-02-08 12:23:47 +01:00
Markus Goetz	d4132072d8	OS X: Send notification natively ... For #2728	2015-02-07 18:23:40 +01:00
Klaas Freitag	4849c31add	Sharing: Handle "Enforce password" for public shares properly. ... If a 403 is received from the attempt to create a public link, the dialog shows the password field, as this is server enforced. This fixes #2774	2015-02-06 16:27:11 +01:00
Daniel Molkentin	01bca39138	s/mirall/client in transifex & translations ... Last part of #2470	2015-02-06 15:16:55 +01:00
Olivier Goffart	6e8527e66d	Wizard: Show the remote folder name when the theme has one ... Relates to issue #2788	2015-02-06 14:50:52 +01:00
Jocelyn Turcotte	0d2b7967bc	Windows: Fix opening activity entries with a space in the name ... This fixes #2601	2015-02-06 13:44:06 +01:00
Olivier Goffart	70c8803a79	SelectiveSync: show a message in case of error or if there is no subfolder ... Usefull when the folder does not exist (for example in case the theme has a defaultServerFolder that does not yet exist, #2788) But also to avoid confusion (issue #2663)	2015-02-06 12:27:54 +01:00
Olivier Goffart	0d2fb0754c	Wizard: Fix the advanced setup page when the theme has a defaultServerFolder ... Especially the selective sync dialog Task #2788	2015-02-06 12:27:54 +01:00
Markus Goetz	1e57432aae	Propagator: Fix crash ... This crash was uncovered when testing parallel chunks when one chunk finished the upload. The propagate was then finished with the other UploadDevices still being in-flight in the QNAM.	2015-02-06 11:19:41 +01:00
Markus Goetz	7c0d3b8485	Sharing: tr()s added	2015-02-06 11:11:09 +01:00
Daniel Molkentin	46abd47bfe	Merge pull request #2787 from cmeh/patch-1 ... Orthography: "an folder" corrected to "a folder"	2015-02-06 10:31:57 +01:00
Olivier Goffart	5ec793e045	propagateupload: Save the mtime given by the server in the reply to GET ... There could be a race condition if the file was updated on the server between the discovery and the propagate phase. By taking the mtime from the server, we make sure that we do not have a race. This is tested by t6.pl with BIG3.file because the script was modifying the file between the two phases	2015-02-06 10:23:20 +01:00
cmeh	1554f41441	Orthography: "an folder" corrected to "a folder"	2015-02-06 10:22:49 +01:00
Daniel Molkentin	9e945eb471	Settings dialog: better color for separator line	2015-02-06 08:30:51 +01:00
Daniel Molkentin	c4dd1cfb69	Mac Settings Dialog: Native icons for account	2015-02-06 07:54:25 +01:00
Volkan Gezer	eaa9c4fdf8	json capital	2015-02-05 20:41:08 +01:00
Markus Goetz	94e61c3205	Notifications: Fix creation of notification (fixup2) ... For #2728	2015-02-05 17:20:52 +01:00
Markus Goetz	c4cf13bd97	Notifications: Fix creation of notification (fixup) ... For #2728	2015-02-05 16:55:32 +01:00
Markus Goetz	71e22ffe2c	Notifications: Fix creation of notification ... For #2728	2015-02-05 16:46:40 +01:00
Olivier Goffart	3169a6f170	SelectiveSync: change the wording of the dialog on the wizard ... Have different wording depending on the wizardSelectiveSyncDefaultNothing theme option Relates to #2580	2015-02-05 16:22:04 +01:00
Markus Goetz	446e2b27d7	OS X Sparkle: Fix warning	2015-02-05 15:49:46 +01:00
Olivier Goffart	856df4c5f6	libsync: Get the capabilities and store it in the account	2015-02-05 15:42:56 +01:00
Olivier Goffart	34237f604e	JsonApiJob: Refactor out of the shibbolethuserjob	2015-02-05 15:42:01 +01:00
Olivier Goffart	21345b81f1	wizard: fix the EntityExistJob URL ... We need to add the davPath in there. Otherwise there will be a redirect which will break shiboleth (We want to only enter the password once) Issue #2739 and #2780	2015-02-05 12:53:04 +01:00
Olivier Goffart	3dd8ce08b8	Parallel chunk upload: Fix a off-by-one while saving the done chunk in the DB ... We should assume that the chunk currently uploading is NOT done (hence the -1) il task 405	2015-02-04 18:52:26 +01:00
Markus Goetz	f233af04f6	Windows XP: Possible fix for #2648	2015-02-04 18:49:04 +01:00
Olivier Goffart	acb7e972ea	Merge pull request #2778 from jturcotte/master ... Allow building natively on Windows with MinGW	2015-02-04 17:11:56 +01:00
Jocelyn Turcotte	1ac523ec01	Output libocsync and libowncloudsync in the bin directory ... Windows finds DLLs using PATH or the directory of the process' executable. By outputing those dependend DLLs together with owncloud.exe, the developer only need to have OpenSSL's bin and the qtkeychain build directory in his PATH to let the dynamic linker find them. As the documentation of RUNTIME_OUTPUT_DIRECTORY points out, this only affects windows as other platforms don't consider libraries as runtime targets.	2015-02-04 15:00:22 +01:00
Olivier Goffart	ca56e5d9ca	SyncEngine: Fix crash ... We must check if 'it' is not == to begin() before doing it-1 Also i believe the logic was reversed if it was begin() Task #2765	2015-02-04 14:52:41 +01:00
Jocelyn Turcotte	43a51c1bef	Fix the MinGW build ... - qtkeychain isn't necessarily in a qt5keychain subdirectory. - Explicitly add OpenSSL to the include directories - Make sure that the USE_OUR_OWN_SQLITE3 code is initialized for csync by calling find_package.	2015-02-04 14:50:38 +01:00
Olivier Goffart	26132fd14e	owncloudconnectionmethoddialog: typo	2015-02-04 13:42:49 +01:00
Olivier Goffart	ca68ccd76a	Fix Qt4 build	2015-02-03 20:04:04 +01:00
Olivier Goffart	1f9d7c41e8	owncloudconnectionmethoddialog: Change order of buttons, fix wording, and add the URL	2015-02-03 17:55:01 +01:00
Roeland Jago Douma	48254579a2	Sharedialog: add copy button text and actually connect the button	2015-02-03 13:02:52 +01:00
Daniel Molkentin	a3106b1771	Client Dialog Support: Fix certificate dialog	2015-02-02 23:35:39 +01:00
Jeroen Hoek	227b7ccabd	Add dialog to connection wizard ... When connecting to a https:// URL fails, present the user with three choices: * Try again with a http:// URL * Configure client-side TLS certificates * Go back and enter a different URL This allows users connecting with an ownCloud server secured with client-side TLS certificates to start the certificate import wizard manually instead of relying on a custom server error message.	2015-02-02 22:29:21 +01:00
Christian Kamm	49021fd96d	SyncJournal: Reset all prepared statements. #2757 ... Makes closing of the database actually release file locks.	2015-01-30 15:35:42 +01:00
Olivier Goffart	db6214e090	SyncEngine: Do not assert when the neon session is 0 ... It can now be 0 if neon is not in used Issue #2755	2015-01-30 01:05:46 +01:00
Markus Goetz	df214cd6c1	Folder: Make debug message clearer ... The thread was actually already started in the discovery phase.	2015-01-29 20:47:45 +01:00
Klaas Freitag	d2f1e6e03e	ShareDialog: Disable sharing of external files. ... See https://github.com/owncloud/client/issues/2732 for discussion.	2015-01-29 18:11:04 +01:00
Daniel Molkentin	332601ed26	Remove noisy debug output	2015-01-29 15:37:21 +01:00
Christian Kamm	43d6dbb0f2	SQL: Add debugging options. #2693 ... OWNCLOUD_SQLITE_JOURNAL_MODE: To use something else than WAL OWNCLOUD_SQLITE_TEMP_STORE: To test with storing temporaries in memory.	2015-01-29 11:02:01 +01:00
Christian Kamm	cd0ad21132	SQL: Improve error reporting of failed exec(). #2693	2015-01-29 09:47:48 +01:00
Daniel Molkentin	6fa73e073f	Certificate Wizard: Remove dead code, cleanup style	2015-01-28 17:38:38 +01:00
Christian Kamm	5fc231cda4	Shib: Fix fetching of 'user'. #2751	2015-01-28 15:15:35 +01:00
Daniel Molkentin	1ca8ab81c7	Fix for non C++11 compilers	2015-01-28 14:19:37 +01:00
Olivier Goffart	d70e146c1f	Merge remote-tracking branch 'origin/ssl_client_cert' ... Conflicts: CMakeLists.txt csync/src/CMakeLists.txt csync/src/csync_owncloud.c	2015-01-28 14:13:40 +01:00
Daniel Molkentin	989005d616	Clientcert support: Explictly link libsync against openssl	2015-01-28 13:31:17 +01:00
Christian Kamm	2cee591b0e	Merge branch 'sharedialog_fixes' of git://github.com/rullzer/client ... Fix missing OcsShareJob constructor. Conflicts: src/gui/sharedialog.cpp	2015-01-28 12:19:40 +01:00
ckamm	8a71d7d254	Merge pull request #2730 from rullzer/filebrowser_integration ... Sharedialog: 404 is also an acceptable response when retriving shares	2015-01-28 12:09:33 +01:00
Christian Kamm	7950eb8ed6	sqlite: Update to version 3.8.8.1. #2750	2015-01-28 11:52:04 +01:00
Christian Kamm	f59515883d	FolderMan: Require 2s minimum delay. ... Otherwise we run into "can't upload because it's too recent" issues when the folder watcher triggers a sync. We used to do this, but my recent refactoring started counting the time since the last sync against this minimum delay, leading to 1ms delays in practice. This fixes the regression.	2015-01-28 11:24:47 +01:00
Daniel Molkentin	524f04f34e	Wizard: Give useful error message when server access is forbidden ... Final fix for #2607	2015-01-28 11:06:41 +01:00
Daniel Molkentin	9e7ee42eb7	Wizard Remove unused pointer	2015-01-28 11:06:41 +01:00
Daniel Molkentin	6f82e80698	Remove debug	2015-01-28 11:06:41 +01:00
Christian Kamm	37680a0909	ShareDialog: Prepare for multiaccount. #43 ... Also fix a possible bug with the share dialog when no account is configured.	2015-01-28 10:52:55 +01:00
Christian Kamm	350ad98c27	Folderwizard: Prepare for multiaccount. #43 ... Avoid accessing the global account instance and instead pass it in from the outside.	2015-01-28 10:40:32 +01:00
Olivier Goffart	b0dbb49ca8	Shib: fix broken signal/slot connections	2015-01-26 16:23:43 +01:00
Olivier Goffart	3169833cd7	gui: Still give a decent experience if there is no system tray ... Helps for tasks #1138, #2023, #2123	2015-01-26 13:00:45 +01:00
Joachim Schiele	9abc3e1333	fixes required by upstream	2015-01-23 19:22:56 +00:00
Olivier Goffart	dcba129a98	Make it compile without neon	2015-01-23 17:56:46 +01:00
Olivier Goffart	b856266e91	Remove neon link flag when not required	2015-01-23 17:35:17 +01:00
Olivier Goffart	fe51ada1e8	Don't require NEON with Qt 5.4	2015-01-23 17:11:34 +01:00
Olivier Goffart	807277c0ae	Socket API: Do not broadcast the shared menu entry on all socket when one connects to the socket API ... Now we reply to the command SHARE_MENU_TITLE	2015-01-23 16:09:38 +01:00
Markus Goetz	12ac9f9aa9	Discovery: Fix broken signal/slots	2015-01-23 15:37:36 +01:00
Markus Goetz	3885d5d706	Discovery: Report root etag from engine to folder ... For #2352	2015-01-23 15:30:44 +01:00
Markus Goetz	c54621eb19	OS X: Share menu for Finder	2015-01-23 12:00:31 +01:00
Klaas Freitag	2943b4a85a	CMake: Fixed the rpath settings to make the nighlies build again.	2015-01-23 11:50:42 +01:00
Klaas Freitag	ed0b4e48d5	Sharedialog: Fix some error display.	2015-01-23 11:50:42 +01:00
Roeland Jago Douma	f9938c90ff	Sharedialog: 404 is also an acceptable response when retriving shares ... When we try to get the shares for a file/dir that has no shares yet 404 is an acceptable response from the server.	2015-01-23 10:29:12 +01:00
Roeland Jago Douma	bcdc19f0e3	Sharedialog: Moved more logic to OcsShareJob ... To make the Sharedialog a bit cleaner and to only have the logic in one place. The postdata is now passed as a QList<QPair<QString, QString>> to the OcsShareJob.	2015-01-23 09:41:10 +01:00
Roeland Jago Douma	fb967427e8	Sharedialog: We always want json return format ... Cleanup the code a bit and set that we want json as return format for all replies.	2015-01-23 09:17:00 +01:00
Roeland Jago Douma	0b10761291	Sharedialog: emit proper error code, only show error label if there is one	2015-01-23 09:10:02 +01:00
Olivier Goffart	0f98a90858	Wizard: Add an option in the theme to default to nothing selected in the selective sync ... Issue #2580	2015-01-22 15:57:55 +01:00
Christian Kamm	094da51d82	FolderWatcher: Fix ignore list usage. ... All patterns with started with a ] were not working correctly.	2015-01-22 15:42:47 +01:00
Olivier Goffart	3c26bfa618	Propagate Remote mkdir: save the fileid to the database early ... It's important so that if we delete or rename a diectory that is being uploaded, this is properly detected	2015-01-22 15:11:04 +01:00
Olivier Goffart	168c89aba7	Wizard: fix spacing	2015-01-22 15:11:03 +01:00
Markus Goetz	0502f684e9	Discovery: Even less qDebug	2015-01-22 14:45:08 +01:00
Markus Goetz	45cb679ea7	Discovery: Less verbose debug	2015-01-22 14:37:35 +01:00
Markus Goetz	c9f9d55658	Merge branch 'qnam_csync_update' ... Conflicts: src/libsync/networkjobs.cpp	2015-01-22 14:34:36 +01:00
Markus Goetz	dde8e35785	Discovery: Put results into proper place in map ... The map is for memory management. It can later be used as a cache for the recursive PROPFIND (if we decide to activate it again)	2015-01-22 14:25:24 +01:00
Christian Kamm	fa4e6d8261	Exponential backoff for rapid follow up syncs. #2355	2015-01-22 08:55:52 +01:00
Christian Kamm	145df8ec67	Pause between sync runs (particularly long ones) #2355	2015-01-22 08:55:52 +01:00
Christian Kamm	af5cbdbed8	Folder: Add timer for sync duration.	2015-01-22 08:55:52 +01:00
Nourredine	ba8b1bbe06	adds 'SSL client certificate' support from n.octeau with qknight changes as: ... * removed broken QSsl::SslV3 default * rewrote slotHandleErrors(): no longer claim errors which are none. * hack reverted: lib64 was not the cause for NixOS issues related to libraries. * refactored csync/src/csync_owncloud.c and discovered+fixed why the dav_connect was never getting the certPath+certPassoword * cleanup of code but seems this crushed the ssl client certificate support * fixes the https://github.com/owncloud/client/issues/69#issuecomment-69358377 issue * lots of cleanup * From TODO list : translate all french comments into english * changed _pemCertificate type from QString to QByteArray	2015-01-21 23:55:11 +00:00
Olivier Goffart	f2a7e0b28f	Selective sync dialog: give a proper size by default	2015-01-21 15:37:00 +01:00
Olivier Goffart	0e86ceff73	Connection Validator: let the user cancel the password dialog ... And don't ask for the password again if this happens	2015-01-21 15:33:51 +01:00
Olivier Goffart	c91de092e5	Setup wizard: Fix the http fallback logic ... Also don't allow to go back from the advanced settings page because this break everything	2015-01-21 15:33:51 +01:00
Markus Goetz	7a173f6e62	OS X: Fix path rewrite for owncloudcmd ... It was broken after the folder restructuring (cmd/ and client/)	2015-01-21 15:17:40 +01:00
Klaas Freitag	95f7e83c5c	Sharedialog: Some more refinements after the merge of the branch. ... - Some dialog changes: Made it less vertical space comsuming - Some variable cleanups - Allow to share files that are not within the synced dir by copying them to the root of a sync dir first.	2015-01-21 15:05:23 +01:00
Olivier Goffart	d8b621d05f	LsColJob: fix getting the sizes when the path contains %-encoded chars	2015-01-21 12:04:54 +01:00
Markus Goetz	fb87ad1442	OS X: Fix path rewrite for owncloudcmd ... It was broken after the folder restructuring (cmd/ and client/)	2015-01-20 19:03:56 +01:00
Markus Goetz	c580275a01	Discovery: Delete file entries on destruction	2015-01-20 18:49:27 +01:00
Olivier Goffart	5c2298fa37	Discovery phase: fix a few warnings	2015-01-20 18:50:03 +01:00
Markus Goetz	906779c4b1	SyncEngine: Use QNAM for csync_update ... This is for #2507	2015-01-20 18:27:25 +01:00
Klaas Freitag	bd80c034ba	Merge pull request #2723 from rullzer/filebrowser_integration ... Sharedialog: link sharing from desktop	2015-01-20 17:45:34 +01:00
Daniel Molkentin	00ed37dd02	Merge pull request #2709 from rullzer/monochrome-state-info-icon ... Resepct theming when no syncs are configure	2015-01-20 08:21:42 +01:00
Daniel Molkentin	4de815ad67	Merge pull request #2710 from rullzer/sort_folder_order ... Manged folder list in the tray icon is now sorted	2015-01-19 18:56:55 +01:00
Daniel Molkentin	86eed7cb81	Fix SSL button icons	2015-01-18 15:34:48 +01:00
Roeland Jago Douma	63f18a7ebb	Sharedialog: Pass QDate around instead of QString ... Now pass a QDate object around so we only do the conversion in one place in case the API changes.	2015-01-17 09:57:17 +01:00
Roeland Jago Douma	233f0423fa	Sharedialog: Also reply on delete should be checked	2015-01-17 09:48:18 +01:00
Roeland Jago Douma	d5bddca01d	Sharedialog: More Q_FOREACH	2015-01-17 09:29:13 +01:00
Roeland Jago Douma	00cb6f71da	Sharedialog: Set correct minimum date ... The minimum date should always be the current date + 1 day.	2015-01-17 09:10:42 +01:00
Roeland Jago Douma	9ac35d5869	Sharedialog: Use arg instead of append	2015-01-17 09:01:24 +01:00
Roeland Jago Douma	bd1db30eea	Sharedialog: Minor fixes ... The server generates a new share when a password is set/deleted so we need to refetch the shares once that is done. It is not possible to set an expiration date in the past for a share. So do not allow the user to select a date in the past.	2015-01-17 08:50:28 +01:00
Roeland Jago Douma	6c3a5b1d69	Sharedialog: Do not hard code error reply messages ... The server provides error messages in the json return code. Use those error messages.	2015-01-17 08:29:20 +01:00
Roeland Jago Douma	c233baab5b	Sharedialog: grouped sharelink stuff in one widget ... A bit of grouping in the UI requiring less ->hide() and ->show() calls	2015-01-17 08:10:18 +01:00
Christian Kamm	aa6a5e4ac2	Credentials: Use the bound account everywhere. ... This is preparation for multiaccount.	2015-01-16 15:22:56 +01:00
Roeland Jago Douma	71560ace71	Sharedialog: Show general info about a share ... A start with some general share info in the share dialog.	2015-01-16 14:48:56 +01:00
Roeland Jago Douma	0fba4eee98	Sharedialog: Removed user/group sharing	2015-01-16 14:06:34 +01:00
Christian Kamm	91fce3ea73	Make public API explicit about blacklist kind. #2301 ... 'blacklist' can mean the selective sync blacklist or the error blacklist. Names in public API are now explicit about which blacklist is meant.	2015-01-16 10:17:19 +01:00
Christian Kamm	b50475bc17	SQL: Fix error reporting on prepare fail. #2697	2015-01-16 09:12:25 +01:00
Klaas Freitag	40c802b148	Download: Handle locking problems as soft errors, enterprise #455	2015-01-15 20:51:30 +01:00
Klaas Freitag	7d9f917810	Filesystem: Check more return values and more logging.	2015-01-15 20:51:30 +01:00
Klaas Freitag	a5ae1a9734	Folder: Only count error free downloads for the gui notification.	2015-01-15 20:51:30 +01:00
Klaas Freitag	506360716a	FolderMan: Removed too explicit logging that scares users.	2015-01-15 20:51:30 +01:00
Olivier Goffart	22ad34fa0e	Merge branch '1.7' ... Conflicts: admin/win/nsi/l10n/French.nsh src/mirall/propagator_qnam.cpp	2015-01-15 17:58:43 +01:00
Olivier Goffart	ce0e7e4a5d	Propagator download: Do not assume the server do not support ranges if we cannot parse the Content-Range header ... There are several reason why start==0 * The Content-Range header was not present * We can't parse it * Or it is actually 0 If we can't parse it, we cannot assume anything and must error out. So only in the first case we should discard the temporary file and continue. Issue #2708	2015-01-15 17:56:49 +01:00
Olivier Goffart	907b79d3b8	Utility: Use appropriate unit when converting from bytes to human readable units ... We must not use the SI units if we use power of 2 I believe that we should use SI units and power of 10 But since the server still use power of 2, we need to show the same numbers But at least we use the proper standard IEC unit that are explicit	2015-01-15 14:06:17 +01:00
Olivier Goffart	863731fd6a	Revert "Utility: Use SI units" ... This reverts commit 7445fa7ef7. and commit f654c53c35. The server still use wrong powers, so we still need to use the same	2015-01-15 13:56:51 +01:00
Olivier Goffart	c9f1b3229b	Add Folder Wizard: fix wording ... (Relates #2663)	2015-01-15 13:55:48 +01:00
Olivier Goffart	2b8b204cfc	SelectiveSyncDialog::estimatedSize: return qint64 because -1 in case of error	2015-01-15 13:07:16 +01:00
Olivier Goffart	264471af43	csync: cleanup some unused error code	2015-01-15 12:19:06 +01:00
Olivier Goffart	08d3ae9f02	csync_statedb: Have more granular error reporting when the loaddb fails ... In order to distiguish error from sqlite_open or from the integrity check Issue #2673	2015-01-15 11:36:24 +01:00
Roeland Jago Douma	cd0c9b2ddb	Sharedialog: More error checking	2015-01-14 19:47:25 +01:00
Roeland Jago Douma	b80bbe6587	Sharedialog: more const	2015-01-14 19:36:42 +01:00
Roeland Jago Douma	879d41bf2d	Sharedialog: Fix spinners and passwordfield ... The password field now show correct info when a password is entered etc. Maybe we should have an extra info part where we state that the user needs to press enter to submit the password	2015-01-14 19:08:04 +01:00
Roeland Jago Douma	7b1cfd69d7	Sharedialog: use QProgressIndicator ... This is a merge from the movie in the original commit (which was local) to the QProgressIndicator. However, on all connections I tested it, it did not add much since the API is in gernal pretty quick. So maybe we can just remove this.	2015-01-14 18:42:56 +01:00
Luca Lorenzetto	ef9f2a965d	Fix for issue #2703	2015-01-14 17:39:14 +01:00
Olivier Goffart	ac0e8b1fe1	Qt 4 fix	2015-01-14 16:30:10 +01:00
Olivier Goffart	da0f7317b4	Wizard: Show the size of the folders that will be downloaded ... Part of #2580	2015-01-14 16:11:07 +01:00
Roeland Jago Douma	3e81839af5	Sharedialog: Removed duplicted code ... Handling of updated shares is identical from users and groups	2015-01-14 15:27:15 +01:00
Christian Kamm	0af5574951	Propagate upload: code cleanup	2015-01-14 15:20:02 +01:00
Olivier Goffart	0ae9055ea6	Propagator upload: Fix UploadDevice::seek	2015-01-14 15:08:09 +01:00
Olivier Goffart	885aafcea3	SelectiveSync dialog: Show the sizes of the folder	2015-01-14 15:08:09 +01:00
Olivier Goffart	7445fa7ef7	Utility: Use SI units	2015-01-14 15:08:09 +01:00
Markus Goetz	a544133d73	Propagator: Guard access to BandwidthManager ... Shouls fix #2623	2015-01-14 14:28:47 +01:00
Christian Kamm	b3c02798a3	Propagator: Use FILE_SHARE_DELETE on Windows. #2070 #2597	2015-01-14 14:16:05 +01:00
Roeland Jago Douma	0bd6eb1792	Sharedialog: fix changes due to rebase	2015-01-14 13:51:02 +01:00
Olivier Goffart	3ec19ee355	Propatage upload: Preload the chunk in memory and close the file ... This should solve #2675 and #1981 By preloading the chunks in memory before sending them, we don't keep the file open and therefore we let other program open the file for writing. If the file is modified between two chunks, we detect that and abort anyway	2015-01-14 13:46:51 +01:00
Olivier Goffart	0215b250af	UploadDevice: mark overrided method as Q_DECL_OVERRIDE	2015-01-14 13:46:51 +01:00
Olivier Goffart	6a0c9fdd34	Propagate upload: Change the default chunk size to 5MiB and make chunk upload parallel ... The server is slow to process each chunk. As a result the time between the chunks is not neglectible. Therefore we gain a lot of time by uploading the chunks in parallel. So the bandwitdh is used when the server is waiting between chunks.	2015-01-14 13:46:51 +01:00
Olivier Goffart	7f1593c5d7	PropagateUpload: The PUTJob owns the chunk device, so make it a QScopedPointer instead of a QSharedPointer	2015-01-14 13:46:51 +01:00
Roeland Jago Douma	e420a689dc	Sharedialog: More reply checking and removing some duplicated code	2015-01-14 13:43:01 +01:00
Roeland Jago Douma	9addd56f9b	Sharedialog: follow correct behavior for files when editing permissions	2015-01-14 13:43:01 +01:00
Roeland Jago Douma	a7e69a5dc5	Sharedialog: Started parsing server replies	2015-01-14 13:43:01 +01:00
Roeland Jago Douma	f6a83d5de2	ShareDialog: UI is different for files/dirs ... Bunch of if statements to make sure that we do not display delete/create on files.	2015-01-14 13:43:01 +01:00
Roeland Jago Douma	d1d8a40acf	Sharedialog: fix unused var compiler warnings	2015-01-14 13:39:07 +01:00
Roeland Jago Douma	cb18dfaaef	Sharedialog: Of course users can also have create and delete privileges	2015-01-14 13:39:07 +01:00
Roeland Jago Douma	a22a03e501	ShareDialog: Group sharing is now also possible ... Basically the same functionality as for user sharing. Maybe it would be wise to merge the two functionalities. Should be rather straight forward if we also merge the UI parts.	2015-01-14 13:39:06 +01:00
Roeland Jago Douma	9a35b5670e	ShareDialog: Allow sharing with users ... This commit needs a lot of cleaning up. And a lot of error checking needs to be added. However it is now possible to change and add new shares with users. Sharing with groups should be just copy paste. Also the UI needs some love.	2015-01-14 13:39:06 +01:00
Roeland Jago Douma	017b54f9a8	Sharedialog: Allow modifications of permission for users	2015-01-14 13:39:06 +01:00
Christian Kamm	9b7e6cc5c1	Fix warnings. ... * remove Unused variable * zorder for spacers makes no sense	2015-01-14 11:28:53 +01:00
Klaas Freitag	209276efa8	ShareDialog: Moved open slot from Application object to Gui object. ... Also set auto delete flag for the dialog explicitely.	2015-01-13 13:50:41 +01:00
Daniel Molkentin	31e584e3e3	Fix win32 build	2015-01-12 13:53:40 +01:00
Klaas Freitag	ad09f6491b	ShareDialog: Fix const ref for arguments.	2015-01-12 11:35:11 +01:00
Klaas Freitag	efbe033bfb	Sharedialog: Fix merge problem (use AccountPtr) plus cleanup.	2015-01-12 11:30:02 +01:00
Klaas Freitag	2c6f0950f6	Merge pull request #2674 from rullzer/filebrowser_integration ... Add Sharing from the desktop, SocketAPI and Dialog.	2015-01-12 11:16:28 +01:00
Roeland Jago Douma	b680788f48	Sharedialog: Allow setting and retrieving of experiation data for public urls	2015-01-12 10:14:45 +01:00
Daniel Molkentin	5e0d4ab31d	Further Windows compile fix	2015-01-12 09:50:37 +01:00
Daniel Molkentin	488f993f45	Fix compilation on Windows	2015-01-12 09:40:11 +01:00
Roeland Jago Douma	811cbc27c0	Sharedialog: Construct correct public url for existing shares	2015-01-11 14:16:49 +01:00
Volkan Gezer	cefa31eb82	fix typo ... suggested by transifex translator	2015-01-11 14:07:04 +01:00
Roeland Jago Douma	25e90ff658	Sharedialog: use Q_FOREACH	2015-01-11 13:56:23 +01:00
Roeland Jago Douma	fa390299f9	Added Q_FUNC_INFO at several places	2015-01-11 13:41:15 +01:00
Roeland Jago Douma	accb036507	Removed some unused outcommented code	2015-01-11 13:36:45 +01:00
Roeland Jago Douma	44690ff596	ShareDialog: fixed "" -> QString	2015-01-11 13:27:32 +01:00
Roeland Jago Douma	e20f819c1d	Sharedialog: QString("") -> QString()	2015-01-11 13:24:40 +01:00
Roeland Jago Douma	1d011a2f9a	ShareDialog: make visible text translatable	2015-01-11 13:22:48 +01:00
Roeland Jago Douma	bc84a78b0f	ShareDialog: Made slot arguments const	2015-01-11 11:19:12 +01:00
Daniel Molkentin	6034bd0946	Wizard: Never attempt to hide server page ... The wizard code used to call hide() on hardcoded wizards. This means that for a brief moment, the first page with the URL (disabled line edit) may be seen. I think that's completely legitimate from a feedback perspective. The alternative would be to unhide on error, but this is rather unelegant...	2015-01-11 07:38:09 +01:00
Klaas Freitag	786a877986	SocketAPI: Some cleanups plus added some consts	2015-01-09 11:44:01 +01:00
Daniel Molkentin	c86d8e5acf	Clean up BSD support patch	2015-01-08 22:40:47 +01:00
Daniel Molkentin	4a819026df	Merge pull request #2634 from ryo-on/netbsd-support ... Support NetBSD like FreeBSD or Linux.	2015-01-08 22:35:44 +01:00
Olivier Goffart	7671ae8df7	Application: Initialize the folderman after we checked for existance ... So we don't start the SocketAPI if we are going to quit. We also do not log any message anymore before we install the hooks Should solve #2666	2015-01-08 16:52:23 +01:00
Daniel Molkentin	df555d5321	Merge remote-tracking branch 'origin/master' into accountstate ... Conflicts: src/cmd/cmd.cpp	2015-01-08 15:38:41 +01:00
Daniel Molkentin	c3468b7ed6	Merge remote-tracking branch 'origin/master' into accountstate ... Conflicts: src/gui/owncloudsetupwizard.cpp src/gui/owncloudsetupwizard.h src/libsync/propagatedownload.cpp src/libsync/propagatedownload.h	2015-01-08 15:33:39 +01:00
Olivier Goffart	bbf0e7c0a5	owncloudcmd: add --unsyncedfolders to test selective sync	2015-01-08 15:27:02 +01:00
Daniel Molkentin	3f5c1d2ade	Merge pull request #2678 from chrodan/master ... Hide Ignored files in context menu	2015-01-08 14:29:36 +01:00
Daniel Molkentin	dd063d0207	Add hack to make old themes work	2015-01-08 14:21:58 +01:00
Christoph Dann	309ff2997c	potential fix for #1865 ... Do not show ignored files in context menu	2015-01-08 11:42:14 +01:00
Daniel Molkentin	8e8ca97eec	Fix build	2015-01-08 09:42:26 +01:00
Daniel Molkentin	51d7559a2c	Simplify checkDowngradeAdvised logic ... Also, show() and back() belong into slotConnectionCheck only	2015-01-07 18:22:44 +01:00
Daniel Molkentin	5c4f706fe4	Setup Wizard: Make sure to reset auth type when URL changes	2015-01-07 18:01:18 +01:00
Daniel Molkentin	7ac32a19b5	Do not show the HTTP-reconnect popup when its not warranted ... Fixes usability issues in the workaround of #2607	2015-01-07 18:01:11 +01:00
Olivier Goffart	8e3dbcb7c0	SocketAPi: use absoluteFilePath unstead of canonicalFilePath ... Because canonicalFilePath is way too slow. Issue #2671	2015-01-07 14:37:05 +01:00
Olivier Goffart	ab0bc75e43	PropagateUploadFileQNAM::slotUploadProgress: Fix inverted condition ... ( Apply this commit 2d8053a9df )	2015-01-05 17:32:12 +01:00
Olivier Goffart	414ac5433d	Merge branch '1.7' ... Conflicts: binary doc/accountsetup.rst doc/architecture.rst doc/navigating.rst doc/owncloudcmd.rst doc/troubleshooting.rst	2015-01-05 14:40:53 +01:00
Olivier Goffart	b2c01ffe21	SyncEngine: Show an error when a file name is not encoded with valid UTF-8 ... ... instead of uploading the file with replacement character, and asserting on the next sync. Issue #2649 If the file or folder on the file system has a name with invalid UTF-8, We would convert the name to utf-8, and the conversion would result in replacement character placeholder. And we would upload that file on the server with that name, and save it with this name on the database. Fix this issue by showing an error to the user for invalid files.	2015-01-05 13:54:31 +01:00
Olivier Goffart	517dea6958	accountsettings: Use right palette when using reversed palette ... Issue #2654 The problem is that the WindowsVistaStyle does something wierd with the palette when drawing the text, and we should do the same then.	2015-01-05 12:17:05 +01:00
Roeland Jago Douma	ee2e6e5dce	Also allow sharing if we only sync a part	2014-12-28 20:13:11 +01:00
Roeland Jago Douma	facb6b2e81	Check box public link now works multiple times ... When deleting a share (public link) and recreating it we need to store the new id.	2014-12-28 20:13:11 +01:00
Roeland Jago Douma	ec3c83c0c9	Minor sharedialog.ui fixes	2014-12-28 20:13:10 +01:00
Roeland Jago Douma	0ad4fb7273	Create valid poststring	2014-12-28 20:13:10 +01:00
Roeland Jago Douma	763d5f67cd	Some error checking on SHARE sockeAPI command	2014-12-28 20:13:10 +01:00
Roeland Jago Douma	b7d4c997a3	Fix rebase of branch	2014-12-28 20:13:10 +01:00
Alfie "Azelphur" Day	bd7f45e398	Everything works now, albeit without error checking.	2014-12-28 20:13:10 +01:00
Alfie "Azelphur" Day	748440ced3	Initial push for filebrowser integration, not finished yet but it's a start :)	2014-12-28 20:13:10 +01:00
Ryo ONODERA	16c4864e67	Support NetBSD like FreeBSD or Linux.	2014-12-21 23:00:56 +09:00
Roeland Jago Douma	cd8affc255	Resepct theming when no syncs are configure	2014-12-19 15:08:49 +01:00
Roeland Jago Douma	8677fb18bb	Manged folder list in the tray icon is now sorted ... We are using a QHash to store all the folder objects. This does not allow for easy sorting and looks weird to the user. Now they are first inserted into a temp QMap to sort them properly.	2014-12-19 13:59:50 +01:00
Christian Kamm	4fa212c43b	CSync callbacks: Don't use global account.	2014-12-18 15:39:51 +01:00
Christian Kamm	a9da5ebff6	Wizard: Sometimes preserve folders when folder config is skipped. ... * When folder config is used, other folder definitions are always removed. * Fix a bug with the wizard becoming stuck when 'skip folder config' is used.	2014-12-18 15:39:51 +01:00
Christian Kamm	38ebfec1fb	Use global Account/AccountState less. ... * Use a shared pointer to Account everywhere to ensure the instance stays alive long enough for a sync to terminate * Folder is now tied to an AccountState * SyncEngine and OwncloudPropagator tie to an Account and use that for all jobs they run Issue: Since the setup wizard currently always replaces the account, it will always wipe all folder definitions, even when the actual changes to the account were minor.	2014-12-18 15:39:51 +01:00
Christian Kamm	6c7acd585e	Account: Split into libsync/Account and gui/AccountState. ... This allows all the account state information to live in gui while the sync-relevant data stays in libsync. I also moved quotainfo to gui since it depends on the account state.	2014-12-18 15:39:51 +01:00
Olivier Goffart	e8efaa5ed8	Direct download URL: Fix resuming ... The server might support resuming, so don't always erase the temporary file and pass the startSize, so the temporary file will be remove if the server does not support it after all (because it is not sending the "bytes" header Also pass the expected etag for consistency even if it's not used in this case.	2014-12-18 12:13:12 +01:00
Daniel Molkentin	986b23856f	Make setup page usable from shibboleth ... Second patch to address #2607	2014-12-17 18:13:59 +01:00
Olivier Goffart	96872e2b3b	Download: When direct URL don't work, retry through webdav	2014-12-17 14:28:13 +01:00
Daniel Molkentin	42ffed3f57	Wizard: Show server errors when coming from shibboleth ... The wizard needs to be restored and rewound to the first page First patch to address #2607	2014-12-17 14:24:07 +01:00
Christian Kamm	a006c6962c	Move account state related logic into Account. ... The account state is now managed mostly by the Account itself instead of through Application. The gui can still control whether an account is signed out or not.	2014-12-17 12:01:10 +01:00
Olivier Goffart	b1d392e415	Download job: allow redirect on direct download link ... Issue #2614	2014-12-16 11:51:25 +01:00
Olivier Goffart	cbf00e9378	Connection Validator: Fix connection warning ... The timeout signal does not exist. Timeout is handled as a normal network arror.	2014-12-16 11:48:15 +01:00
Olivier Goffart	414838cae8	Settings dialog: remove the code that was updating the account icon ... I just wanted to fix the warning: QObject::connect: No such slot OCC::SettingsDialog::slotUpdateAccountIcon(QIcon) in settingsdialog.cpp:108 It turns out we don't need anymore the signal or any of the code that was updating the account icon in the settings dialog since it we now have a fixed icon	2014-12-16 11:36:52 +01:00
Olivier Goffart	3ee14164db	network jobs: Refactor the redirect handling in AbdtractNetworkJob ... Move the redirect handling from CheckServerJob to AbstractNetworkJob, so we can later use it in any job (in preparation for task #2614)	2014-12-16 11:27:02 +01:00
Klaas Freitag	c6daa8e59b	Overlays: In case of folders, make sure to append slashes at end. ... This fixes #2373	2014-12-12 16:38:07 +01:00
Klaas Freitag	7cc6c1a10f	Theme: Add a missing dot.	2014-12-12 13:37:02 +01:00
Klaas Freitag	7f73cc1694	Theme: split the about string apart to have small translation units.	2014-12-12 13:33:38 +01:00
Daniel Molkentin	9a13ec736d	Fix OS X compilation	2014-12-11 15:08:13 +01:00
Christian Kamm	1a3041690f	ConValidator: Simplify and cleanup. ... * This way using it with multiple accounts will be easier. * Timeouts on the authed requests are handled.	2014-12-11 14:48:01 +01:00
Christian Kamm	84e5ad7346	FolderMan: Delete old journal file when adding folder. #2606	2014-12-11 12:28:01 +01:00
Christian Kamm	4559bb5553	Fix counting of affected files. #1132 ... * Also ensure the maximum is always >= the current value. * Take care to handle the ULLONG_MAX value that's sometimes used as _completedFileCount.	2014-12-11 11:33:42 +01:00
Christian Kamm	d8c59fcb73	Use connection validator to ping the server. #2485 ... * Stop the quota job from having an effect on account status as it can sometimes take a long time to reply. See #2485 and owncloud/core#12744. * Instead of indirectly using the quota job, use the connection validator to regularly ping the server with a basic PROPFIND for 'getlastmodified' on /. This request was usually fast for users even when the quota PROPFIND was slow.	2014-12-10 13:40:11 +01:00
Christian Kamm	53d5de685c	Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/gui/folder.cpp src/gui/folder.h src/libsync/networkjobs.cpp src/libsync/owncloudpropagator.h src/libsync/propagatedownload.cpp	2014-12-10 13:01:36 +01:00
Olivier Goffart	a3e7f513e6	SocketAPI: use the canonical path ... Issue #2591	2014-12-09 20:48:51 +01:00
Daniel Molkentin	d034f10af3	Fix compilation	2014-12-08 19:25:57 +01:00
Daniel Molkentin	a2b817f0c0	mirall.qrc -> client.qrc	2014-12-08 18:00:29 +01:00
Daniel Molkentin	d5f2c36abd	Mirall -> (Desktop) Client	2014-12-08 17:54:32 +01:00
Daniel Molkentin	d86b3f04b1	Merge branch 'master' into rename_client	2014-12-08 17:44:04 +01:00
Klaas Freitag	72a90199db	Wizard: Removed superflous text, as it is already in the header. ... This fixes mirall#2358	2014-12-08 11:12:15 +01:00
Klaas Freitag	49bb861045	Removed useless debug output	2014-12-06 12:37:53 +01:00
Klaas Freitag	1d6661e7e4	Fix the number of displayed items in progress display for removes. ... This fixes mirall#1132 A variable that counts the affected items of the propagator operation done on a item was added to SyncFileItem. Usually that is 1 because most operations affect only the item itself. But for removes, the number can be higher for directories (one remove removes a whole tree). Some rearrangements were needed.	2014-12-06 12:31:45 +01:00
Christian Kamm	40f44c2389	DB: Delete corrupt database. #2547 ... * Also use readonly DB access for SocketAPI.	2014-12-04 15:35:55 +01:00
Olivier Goffart	441b5bd1dc	Setup Wizard: remove all folder definition before starting a new sync ... Issue #1989	2014-12-04 15:18:27 +01:00
Christian Kamm	dc2f0d59cb	FolderWizard: Clean up naming of 'add folder' button. #2371	2014-12-04 10:47:26 +01:00
Christian Kamm	4dcfacf2d5	Fix compile. :/	2014-12-04 09:59:24 +01:00
Christian Kamm	b7485106ef	NetworkJobs: Set timeout to 5 minutes everywhere.	2014-12-04 09:54:17 +01:00
Christian Kamm	f82893496b	Fix typo.	2014-12-04 09:54:15 +01:00
Christian Kamm	c418e58f88	Etag job scheduling: Silence warnings, make prettier.	2014-12-04 09:52:13 +01:00
Klaas Freitag	9ea359de52	GUI: Check if there are sync folders configured and how proper msg. ... This fixes #2264	2014-12-03 17:11:42 +01:00
Christian Kamm	b7d7f424c5	FolderMan: only touch _currentSyncFolder when done #2407 ... Also simplity terminateSyncProcess() to always terminate the *current* sync run. Only one can be running at a time anyway.	2014-12-03 13:46:37 +01:00
Markus Goetz	46bd473664	Folders: Move ETag check scheduling to FolderMan ... Only 1 check per time is able to run now. For #2553 Might improve #2479 #2485 #2534	2014-12-02 22:32:54 +01:00
Daniel Molkentin	6030fec6cb	Fix typo	2014-12-02 15:08:15 +01:00
Daniel Molkentin	b7323dc403	Merge branch 'master' into rename_client	2014-12-02 14:33:28 +01:00
Daniel Molkentin	c6d74d6c12	Fix typo	2014-12-02 14:33:17 +01:00
Daniel Molkentin	a42709f814	Namespace fixes	2014-12-02 14:20:13 +01:00
Daniel Molkentin	3016844dd7	Merge branch 'master' into rename_client ... Conflicts: README.md src/gui/folderman.cpp src/gui/settingsdialog.cpp src/libsync/accessmanager.cpp src/libsync/propagateupload.h	2014-12-02 13:37:22 +01:00
Olivier Goffart	8fbb55a0c8	Wizard: Fix escaping of error message. ... An url can contains % signs, so if it does, the errors formating was wrong because of the use of QString::args Also, the error is in html format, and we need to let the message box know that, otherwise we will just see <br/>	2014-12-02 10:22:46 +01:00
Olivier Goffart	f046a7e7fe	Wizard: Attempts to really close the database when starting the backup ... Still for issue #1989	2014-12-02 10:22:46 +01:00
Markus Goetz	92ce707268	Bandwidth: Fix issue with removed download jobs ... The measuring broke when a job that is currently measuring was removed.	2014-12-02 09:37:48 +01:00
Daniel Molkentin	3f5887cc03	Merge pull request #2565 from owncloud/accountsettings_itemsontop ... Refactor generic settings dialog	2014-12-01 15:01:45 +01:00
Olivier Goffart	fb3f5d86cf	Fix compilation after merge	2014-12-01 14:41:39 +01:00
Olivier Goffart	512492bf30	Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/libsync/propagatedownload.cpp	2014-12-01 14:37:47 +01:00
Daniel Molkentin	afee1ee1c0	Make all ptr-based members either const or check for their existance	2014-12-01 13:08:49 +01:00
Olivier Goffart	3253cc38b2	Propagator upload: Mark error while opening the file as SoftError ... Because otherwise a lot of error are shown to the user when the user deletes a directory that is syncing Task #1981	2014-12-01 12:22:52 +01:00
Olivier Goffart	b154e1baa1	Nautilus shell integration: Use fallback when XDG_RUNTIME_DIR is not defined ... Same fallback as in Qt5 Task #2477	2014-12-01 12:06:09 +01:00
Daniel Molkentin	714599aeaa	Refactor generic settings dialog ... - move items on top like on Mac OS (right is free for accounts now) - The account icon no longer reflects the current status (in prep for multi-account)	2014-12-01 11:37:06 +01:00
Olivier Goffart	fc3a8b944e	Propagator: Don't forget to mark the direcotry as finished if its first job fails ... Otherwise we would go ahead and propagate the content of the directory	2014-11-27 15:36:13 +01:00
Olivier Goffart	2ed2ef3b28	Propagator QNAM: Fix resuming ... We forgot to account the fact that we could have been resuming when comparing the size of the Content-lenght to the size of the temporary file	2014-11-27 14:50:49 +01:00
Olivier Goffart	e7e91b6931	Revert "Folder: Don't blindly trigger sync on first EtagJob result" ... We need to do a sync even if the etag was empty because we do not know if this is because the etag really changed or because it was new. Also, some part of the code rely on this fact to schedule a sync. The fact that there is two sync with 30 sec at the beginning is not a big problem, because we also need to do the sync the put the directory etag in the db. This reverts commit 1c001ee138.	2014-11-27 12:50:36 +01:00
Olivier Goffart	1f9d02e7fa	Shibboleth: Fix our implemtnation of CookieJar::deleteCookie ... It was deleting too many cookies. That function is virtual in Qt5 and is used when adding cookie. But some Shibboleth have several cookies with the same name, and we need to keep them. Our implementaiton was meant to delete all the shiboleth cookies when we want to log out	2014-11-27 12:26:59 +01:00
Olivier Goffart	c9c1547813	Compile with Qt4 ... (QSharedPointer::reset is only in Qt5)	2014-11-25 16:24:47 +01:00
Olivier Goffart	9a8c868793	Propagator upload: Remove debug output	2014-11-25 15:34:06 +01:00
Olivier Goffart	13ec5da84e	neon jobs: Start them in their thread.	2014-11-25 15:08:32 +01:00
Klaas Freitag	3e34d000f2	Propagator: Add the chunk size to PUT requests.	2014-11-25 10:21:33 +01:00
Olivier Goffart	734db6f932	propagate Upload: Let the poll job count for a job ... In order to avoid that there are many concurrent poll jobs that takes all the QNAM channel and causes timeouts of queued jobs	2014-11-24 13:33:13 +01:00
Olivier Goffart	d76e3c0488	Parallel chunk upload: abort all chunks if one of them errors out	2014-11-24 12:05:25 +01:00
Olivier Goffart	c0de20dda0	UploadDevice: reduce debug verbosity	2014-11-24 12:05:25 +01:00
Markus Goetz	79c37f9fe4	Poll Jobs: Properly use DB index ... Why do we sometimes use 0-based, sometimes 1-based indices?	2014-11-24 11:35:39 +01:00
Olivier Goffart	c460b3f3be	Bandwith manager: It needs do be initialiazed after the limits of the propagator	2014-11-21 16:55:46 +01:00
Markus Goetz	1c001ee138	Folder: Don't blindly trigger sync on first EtagJob result ... For #2352	2014-11-21 16:47:15 +01:00
Olivier Goffart	78362af168	Compile with TOKEN_AUTH_ONLY ... (QtGui is not included in that case)	2014-11-21 12:15:41 +01:00
Olivier Goffart	1c58b75ac2	Merge branch '1.7'	2014-11-21 11:08:20 +01:00
Olivier Goffart	41568c885d	Propagator: only check the content-lenght if it is there ... If content-lenght is 0, don't chack it is the size we recieved. It can be zero when using HTTP chunk encoding. Also do not remove the temporary file so it can be re-used on the next sync and ask for a new sync immediatly to re-do the sync. Fixup the fix to task #2528	2014-11-21 11:03:14 +01:00
Klaas Freitag	65a307970b	Propagator: Compare the actual file size with the request content length ... The values must match. Otherwise the request did succeed, but the file was not downloaded completely. This fixes https://github.com/owncloud/mirall/issues/2528	2014-11-20 18:49:34 +01:00
Christian Kamm	3e3ca14b4c	Print ssl library version only on Qt >=5.0.0.	2014-11-20 13:46:44 +01:00
Christian Kamm	8b45d1c928	Sync: Change force-sync interval to 2h everywhere. #2297	2014-11-20 13:38:32 +01:00
Christian Kamm	0fe7a69b39	FolderWatcher: Detect own changes. #2297	2014-11-20 13:16:29 +01:00
Christian Kamm	6d09f1b6c0	Folder watcher now reports changing paths instead of dirs.	2014-11-20 12:51:16 +01:00
Christian Kamm	1ada20ac7b	Linux folderwatcher: Get full path of changed file. #2297	2014-11-20 12:42:59 +01:00
Christian Kamm	d04eedeb8d	OSX: Trust the file watcher. #2297 ... * Use a bigger default force sync interval (2h) * Allow the file watcher to schedule a sync while a sync for the same file is running.	2014-11-20 12:42:59 +01:00
Christian Kamm	f275002ebe	Merge branch '1.7'	2014-11-20 12:41:06 +01:00
Christian Kamm	d4e0941c27	Windows filewatcher: switch to ReadDirectoryChangesW. ... Based on danimo's #2454 fix for #2455 and related to #2297.	2014-11-20 12:36:17 +01:00
Christian Kamm	9dc57359b9	csync db files: Hide after some commit/transactions. #2461 ... The shm and wal files are only created later.	2014-11-20 12:30:04 +01:00
Christian Kamm	4d7b8bdb25	Merge remote-tracking branch 'origin/1.7' ... Conflicts: OWNCLOUD.cmake test/CMakeLists.txt test/testfolderwatcher.h	2014-11-19 14:45:25 +01:00
Christian Kamm	421a8cc6b7	Windows: Make unit tests compile.	2014-11-19 14:18:37 +01:00
Christian Kamm	3706c76622	useLegacyJobs: Fix logic.	2014-11-19 10:31:42 +01:00
Olivier Goffart	9a6710e330	Propagator: add a bit of documentation comments	2014-11-18 17:54:53 +01:00
Olivier Goffart	1113980b20	Propagator: Change the scheduler ... It still needs to be a bit optimized, but it allows to paralelized jobs between directories (this is required to paralelize the mkcol)	2014-11-18 17:35:31 +01:00
Olivier Goffart	0b275c4933	Revert "WiP: switch to ReadDirectoryChangesW"	2014-11-17 11:11:13 +01:00
Olivier Goffart	e529bbed90	Merge pull request #2454 from owncloud/fswatcher_readdirectorychanges_port ... switch to ReadDirectoryChangesW	2014-11-17 09:43:29 +01:00
Olivier Goffart	a3b21022af	new bandwith limiting: Do a test on the Qt version to activate it ... We need Qt 5.3.3. If the compiled qt version is Qt 5 but smaller than Qt 5.3.3, do a runtime check. OWNCLOUD_NEW_BANDWIDTH_LIMITING is still there for a special setup in which we patch Qt with the patches	2014-11-14 17:29:28 +01:00
Olivier Goffart	ad92e7b888	Move UploadDevice to the right header	2014-11-14 16:40:13 +01:00
Olivier Goffart	c73522de2e	Remove ChunkBlock ... It is not in used	2014-11-14 16:39:39 +01:00
Olivier Goffart	14f5e8e32e	Move all the neon code to the _legacy files	2014-11-14 16:13:50 +01:00
Olivier Goffart	f3797abecf	Fix the PropfindJob ... -the namespace mangling was wrong -And the way we read the reply did not work	2014-11-14 15:03:48 +01:00
Markus Goetz	5b7ec19778	SyncEngine: Also output the neon version	2014-11-14 15:02:09 +01:00
Olivier Goffart	1310bef528	Port the propagate mkdir to QNAM ... This way we can make it parallel	2014-11-13 18:57:07 +01:00
Markus Goetz	348b7bf4eb	SyncEngine: Output versions used	2014-11-12 09:21:37 +01:00
Markus Goetz	30479cc5a2	Wizard: Properly show error message	2014-11-12 09:21:37 +01:00
Daniel Molkentin	7246011b62	Merge pull request #2459 from owncloud/typo ... fix typo	2014-11-12 00:09:22 +01:00
Daniel Molkentin	281c0e1553	Merge branch 'master' into rename_client ... Conflicts: CMakeLists.txt src/gui/main.cpp src/libsync/accessmanager.cpp src/libsync/accessmanager.h src/libsync/owncloudpropagator_p.h	2014-11-12 00:07:59 +01:00
Daniel Molkentin	cdac8d56d5	Merge remote-tracking branch 'origin/master' into crashreporter ... Conflicts: src/libsync/utility.cpp src/libsync/utility.h	2014-11-11 23:53:38 +01:00
Olivier Goffart	7b4be209aa	MOVE: fix moving with special character. ... The Destination header need to be %-encoded	2014-11-11 16:27:06 +01:00
Olivier Goffart	c712b7c46c	Parallel MOVE by porting the job to qnam	2014-11-11 16:09:01 +01:00
Olivier Goffart	22c6892870	DELETE: Error out if the HTTP code is not 204	2014-11-11 14:32:25 +01:00
Olivier Goffart	134650eb44	Parallel DELETE	2014-11-11 13:19:29 +01:00
Olivier Goffart	506ba022f1	Split propagator_qnam.cpp into propagateupload.cpp and propagatedownload.cpp	2014-11-11 12:17:10 +01:00
Klaas Freitag	fc6d572a6c	Make compile against Qt4	2014-11-11 10:10:46 +01:00
Daniel Molkentin	b54c079766	Adjust issue urls	2014-11-09 23:38:07 +01:00
Daniel Molkentin	2db17a57d2	Fix header names	2014-11-09 23:25:57 +01:00
Daniel Molkentin	a992c5b8d3	Fix build	2014-11-09 23:10:18 +01:00
Daniel Molkentin	269b59c2ba	More CMake adjustments	2014-11-09 22:58:24 +01:00
Daniel Molkentin	d57d3cf1f6	Drop Mirall from strings	2014-11-09 22:35:29 +01:00
Daniel Molkentin	ae85aa33fd	Adjust namespaces	2014-11-09 22:34:07 +01:00
Daniel Molkentin	f2eadacf09	Remove "Mirall" from class names	2014-11-09 22:30:29 +01:00
Daniel Molkentin	9ebc41ed6f	Remove "Mirall" from cmake project files	2014-11-09 22:30:05 +01:00
Olivier Goffart	7ae6712d56	Add a few Q_DECL_OVERRIDE	2014-11-08 11:21:48 +01:00
Olivier Goffart	98a283b4ec	Fix clang warnings	2014-11-08 11:21:48 +01:00
Olivier Goffart	d524f6b395	Fix compilation errors after merge	2014-11-08 11:11:05 +01:00
Olivier Goffart	6b716683e2	Merge the long PUT Poll URL feature with the new sql backend	2014-11-08 11:09:50 +01:00
Olivier Goffart	ba2c33af0b	Fix the il branch merge: Move the bandwidthmanager to libsync	2014-11-08 10:52:14 +01:00
Olivier Goffart	de11f602d5	Merge remote-tracking branch 'origin/il' ... Conflicts: csync/src/csync_private.h src/CMakeLists.txt src/gui/folder.cpp src/libsync/owncloudpropagator.cpp src/libsync/owncloudpropagator.h src/libsync/propagator_qnam.cpp src/libsync/propagator_qnam.h src/libsync/syncengine.cpp src/libsync/syncengine.h src/mirall/syncjournaldb.cpp	2014-11-08 10:48:36 +01:00
Volkan Gezer	260c8e0227	fix typo	2014-11-07 17:51:15 +01:00
Daniel Molkentin	7c034b427e	Handle invalid handle & fix an issue found during code review	2014-11-07 14:52:31 +01:00
Daniel Molkentin	f25d175b5d	Merge remote-tracking branch 'origin/1.7'	2014-11-06 19:54:20 +01:00
Olivier Goffart	b70ecc3dd3	Never overwrite the mtime from the local file system in the db when updating the metadata ... Attempt to fix #2431	2014-11-06 15:13:10 +01:00
Daniel Molkentin	89670e5ce4	Folderwatcher_win: handle conversion error	2014-11-06 12:54:33 +01:00
Christian Kamm	174e1acbc7	Folder::wipe(): Remove partial downloads and -shm,-wal db files.	2014-11-06 12:49:02 +01:00
Christian Kamm	1f09a24a72	Resync button: Remove partial downloads too. #2445	2014-11-06 12:17:04 +01:00
Christian Kamm	eed91ddf46	Legacy propagator: Don't use mtime retrieved via _fstat64. ... May be the cause of #2431	2014-11-06 12:16:55 +01:00
Daniel Molkentin	96a7118d05	WiP: switch to ReadDirectoryChangesW	2014-11-06 12:04:33 +01:00
Klaas Freitag	6eec896282	FolderWatcher: Check for hidden outside of loop	2014-11-06 09:23:30 +01:00
Christian Kamm	a49a6bfd88	Logging: Report setModTime failures. ... Ths may be helpful for #2252 and maybe even #2431.	2014-11-05 13:20:19 +01:00
Christian Kamm	b87931c0a9	Logging: Print etags, not just result of comparison.	2014-11-05 13:08:53 +01:00
Christian Kamm	9b640d586b	Wizard: Fix local folder warning in advanced setup wizard. #2362 ... The _oldLocalFolder should always be the previously configured folder, not the one that was most recently chosen on the wizard page.	2014-11-05 12:10:41 +01:00
Christian Kamm	7440ffc0e6	Download: Fix data loss when rename fails. #2428	2014-11-05 11:00:46 +01:00
Markus Goetz	cf6219bb6f	NetworkJobs: Improve timeout handling and increase timeout by 5 sec	2014-10-30 11:54:58 +01:00
Christian Kamm	45eeb5065f	Download: Avoid overwriting file with case conflict. #1914	2014-10-30 09:06:53 +01:00
Klaas Freitag	ef16c409ef	Merge pull request #2393 from svkurowski/issue-2215 ... Switch monochrome systray icon color depending on systray brightness	2014-10-29 14:54:33 +01:00
Olivier Goffart	1eccfb798f	Add missing license headers ... Part of #2068	2014-10-29 13:30:46 +01:00
Klaas Freitag	b9b9f3c136	Propagator: Schedule a resync immediately if file is modified during upload	2014-10-29 13:10:56 +01:00
Olivier Goffart	7810da51a8	Propagator: report error when deleting directories ... Will help to understand why a directory cannot be removed Will help for #2348	2014-10-29 12:23:48 +01:00
Christian Kamm	4e20a02fe5	SyncJournalDB: Add filesize column to metadata. ... * Alter table to include column. * Make get/set in SyncJournalDB store and load it. * Make csync recover the stat_t's size member from it.	2014-10-29 09:53:36 +01:00
Markus Goetz	7bad731ad2	CheckServerJob: Guard again null reply ... Lucia had reported a crash in this function	2014-10-29 09:38:20 +01:00
Daniel Molkentin	dc1e73dcb7	Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/libsync/syncjournaldb.cpp test/CMakeLists.txt	2014-10-28 23:27:58 -04:00
Markus Goetz	782463589e	ownSql: Also mention filename	2014-10-28 21:50:09 +01:00
Markus Goetz	ff570c4a6b	ownSql: Don't set busy timeout on bad object	2014-10-28 21:46:30 +01:00
Klaas Freitag	105ff694f2	SyncEngine: Handle 503 condition as soft error to properly handle etags. ... Otherwise the ETags could be removed from the db and cause file deletes.	2014-10-28 17:13:21 +01:00
Olivier Goffart	5723abe6eb	Merge remote-tracking branch 'origin/fix_service_unavailable' into 1.7	2014-10-27 20:49:46 +01:00
Klaas Freitag	0692fea9d8	discovery: handle 503 reply code from server for directories ... 503 for directories means that the dir is a mounted directory from an external mount which currently is not available. The directory is ignored and not traversed into during discovery phase.	2014-10-27 19:21:12 +01:00
Markus Goetz	b0882a5cd2	Fix compile	2014-10-27 17:18:49 +01:00
Markus Goetz	4c1a0005e6	Make two more asserts usable in nondebug	2014-10-27 16:01:18 +01:00
Markus Goetz	05ceed926c	SyncEngine: Log for an assert, return -1 for nondebug compile	2014-10-27 15:52:17 +01:00
Olivier Goffart	ce300d88ee	Wizard: show the choice to start a clean sync if the directory exist even on new accounts ... Task #2406	2014-10-27 13:05:17 +01:00
Brandon Coleman	05c0249672	correct spelling on user is empty error.	2014-10-27 07:59:31 -04:00
Brandon Coleman	2498c13078	options are required at the beginning of owncloudcmd. ... Conflicts: src/owncloudcmd/owncloudcmd.cpp	2014-10-27 07:59:31 -04:00
Olivier Goffart	cddad94e45	Selective Sync: change the label text ... to specify that the files will be removed from the local folder Task #2404	2014-10-27 11:33:25 +01:00
Brandon Coleman	ece1100d65	options are required at the beginning of owncloudcmd.	2014-10-26 15:33:50 -05:00
Brandon Coleman	e5b03634ae	correct spelling on user is empty error.	2014-10-25 11:01:58 -05:00
Sascha Vincent Kurowski	59f18583d1	Switch monochrome systray icon color depending on systray brightness. ... https://github.com/owncloud/mirall/issues/2215 As of version 10.10 Yosemite, Mac OS X offers the user the option to use a dark version of the dock and menu bar. The systray icon was black even on the dark menu bar, thus rendering it nearly impossible to spot.	2014-10-24 21:52:41 +02:00
Christian Kamm	1c4072e231	Selective sync ui: Fix #2390	2014-10-24 16:11:29 +02:00
Klaas Freitag	86e13ea06f	FolderMan: Use folderForPath method to get the folder object for a path	2014-10-24 15:07:33 +02:00
Klaas Freitag	c12d3870cd	Merging work branch for a bug fix for bug #2379. ... It closes all db connections if the new local path is a already synced folder path.	2014-10-24 14:43:48 +02:00
Christian Kamm	fce76a13cb	Sync scheduling: Only do a follow-up sync 3 times. #2355 ... After trying again immediately for 3 times, no more fast follow-ups are run until a sync finishes without needing a fast follow-up.	2014-10-24 13:31:48 +02:00
Christian Kamm	82b14370fc	Sync scheduling: Only retry up to twice after fail. #2386 ... Previously when a sync failed, we'd retry very soon (30s) no matter how often a sync had failed before. After this change we'll retry twice and then back off to the regular 5min interval.	2014-10-24 13:31:48 +02:00
Klaas Freitag	a9d8e9dcd8	Setupwizard: Close the database in case of moving the folder.	2014-10-24 13:05:29 +02:00
Klaas Freitag	542e989046	Setup Dialog: Terminate sync if the new folder is a an actual folder.	2014-10-24 11:59:56 +02:00
Klaas Freitag	f5c199740d	Followup: To unregister a path in socket api use the alias of folder.	2014-10-24 11:36:01 +02:00
Klaas Freitag	f37b81c8b7	Unregister path in socketapi before removing it.	2014-10-24 11:12:06 +02:00
Christian Kamm	c0ea69ee24	SqlQuery: Reset after each successful exec(). ... In e5269a4151 I moved the reset calls to before the first bindValue() because we didn't consistently reset() after exec(). However, some queries may keep a lock on the database so it is necessary to reset() as soon as the data is read. This commit reintroduces these reset() calls.	2014-10-24 10:11:00 +02:00
Christian Kamm	5640cbf653	SqlDatabase: Make it non-copyable.	2014-10-24 09:56:30 +02:00
Daniel Molkentin	3c7ff97ed4	SocketAPI: Don't use a theme dependent name for now ... We will revert this once #2388 is implemented	2014-10-23 17:46:17 -04:00
Christian Kamm	e5269a4151	Add SyncJournalDB autotests. ... There also was a bug in syncjournaldb: in some error conditions the sql query wasn't reset properly. We now always reset a query before calling bindValue.	2014-10-23 15:15:47 +02:00
Markus Goetz	0d9ae241c9	OwnCloudFinder: Rename to SyncStateFinder ... Project file names stay the same, only the output file(s) changed	2014-10-23 12:19:19 +02:00
Klaas Freitag	e726e7aad8	util: Use canonicalFilePath to clean the path opened by explorer. ... This fixes bug #2299	2014-10-23 10:41:07 +02:00
Olivier Goffart	de56b753d1	protocolwidget: fix string that need to use plural translation	2014-10-22 18:26:40 +02:00
Olivier Goffart	e46ab72718	SocketAPI: Show error when we are not allowed ... Issue #1931	2014-10-22 17:25:38 +02:00
Olivier Goffart	9330d2e1e8	SocketAPI: always clean the path and use the normal slash	2014-10-22 15:33:35 +02:00
Olivier Goffart	020e19f770	SocketAPI: Fix all files are new ... (Introduced because of bad resolution of merge conflict in my last commit)	2014-10-22 15:32:09 +02:00
Olivier Goffart	22dd275b15	SocketAPI: Fix the shared symbol, including for owncloud6 Shared dir ... The shared symbol would not appear if the status came for estimateState Also added the shared symbol for the Shared/ directories (owncloud 6 compat)	2014-10-22 15:10:21 +02:00
Markus Goetz	6342e76e19	Wizard: Change misleading text	2014-10-22 15:06:33 +02:00
Markus Goetz	55dd149a03	SocketAPI: Less verbose	2014-10-22 14:43:23 +02:00
Markus Goetz	39a0f28753	Move qtmacgoodies module forward	2014-10-22 14:43:03 +02:00
Olivier Goffart	7740150576	Selective Sync widget: add a "Loading..." label ... Task #2088	2014-10-22 13:48:05 +02:00
Olivier Goffart	4f367faf4d	SocketAPI: Show an error for files inside the selective sync folders ... Task #2283	2014-10-22 13:31:20 +02:00
Olivier Goffart	3840186dd8	Utility: fix function signature	2014-10-22 13:31:20 +02:00
Daniel Molkentin	ed51a45187	Add title to selective sync dialog	2014-10-22 06:29:22 -04:00
Christian Kamm	c832226aa1	Merge remote-tracking branch 'origin/1.7' into master	2014-10-22 12:25:58 +02:00
Christian Kamm	a20375372d	Blacklist: Don't ignore error files forever. #2247 ... Instead try them again regularly, but don't show the user any error messages if the error persists.	2014-10-22 12:25:18 +02:00
Olivier Goffart	6073e3f345	SocketAPI: do not show a progress icon in case of errors	2014-10-22 12:19:57 +02:00
Olivier Goffart	d31ccacf57	SocketAPI: show an ignored icon for paused folders	2014-10-22 12:19:57 +02:00
Klaas Freitag	3243365210	JournalDb: Do not longer always have a write operation on version table. ... Rather read the value from the table and if it is what we expect do not write it.	2014-10-22 10:59:58 +02:00
Christian Kamm	7ae0338f5c	Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/CMakeLists.txt src/cmd/cmd.cpp src/gui/socketapi.h src/libsync/syncengine.h test/CMakeLists.txt	2014-10-22 10:41:55 +02:00
Markus Goetz	a993496ab4	SyncJournalDB/SyncEngine: Properly detect 1.5 upgrade ... Else we end up never reading file data from the DB.	2014-10-21 20:25:15 +02:00
Markus Goetz	d7ac878efd	SyncJournalDB: Fix deleteBatch	2014-10-21 16:37:51 +02:00
Markus Goetz	e5a0db8782	SyncJournalDB: Fix version table filling up	2014-10-21 16:37:39 +02:00
Markus Goetz	24d4840c93	SyncJournalDB: Set WAL files to hidden	2014-10-21 15:58:56 +02:00
Markus Goetz	fa70798fb5	SyncJournalDB: WAL checkpoint at end of sync	2014-10-21 15:41:11 +02:00
Markus Goetz	1af480ea3b	CMake: Fix RPATH	2014-10-21 15:39:31 +02:00
Olivier Goffart	a76fc0ee5a	SocketAPI: send the change of the parent folder in the broatcast ... Also do not compute the status if there is nno listeners	2014-10-21 15:26:51 +02:00
Olivier Goffart	80e86d6c1b	ownsql: fix warning with clang ... warning: equality comparison with extraneous parentheses [-Wparentheses-equality]	2014-10-21 14:59:42 +02:00
Olivier Goffart	dc13e39bb1	SocketAPI: do not have a special case for UPDATE_VIEW on windows ... This is a relique on the old times when there was no persistant connection in the windows plugin	2014-10-21 14:57:50 +02:00
Markus Goetz	5d048c18bc	Sqlite3: Switch to WAL ... This is faster.	2014-10-20 23:09:28 +02:00
Markus Goetz	0fb779d363	SyncEngine: De-initialize recursive PROPFIND value correctly	2014-10-20 22:24:28 +02:00
Daniel Molkentin	d0ed82a686	We need SqlDatabase and SqlQuery to be exported ... Required due to 53b3e5af1b	2014-10-20 19:58:10 +02:00
Klaas Freitag	26f068bcab	SocketApi: Properly manage the database connections. ... Removed the fishy closeDb() method of SqlQuery again.	2014-10-20 17:31:33 +02:00
Markus Goetz	f0dc3725e8	ownSql: Still also use sqlite3 busy handler	2014-10-20 17:26:25 +02:00
Markus Goetz	2de22b408b	SyncEngine: Avoid transaction warning	2014-10-20 17:20:58 +02:00
Klaas Freitag	04b62b139d	Fix compile error and add warning.	2014-10-20 17:10:34 +02:00
Klaas Freitag	2f20f3c65d	SocketApi: Instanziate Object to call QFileInfo::exists ... QFileInfo on Qt4 does not have static members.	2014-10-20 17:05:14 +02:00
Klaas Freitag	53b3e5af1b	SocketAPI: Use new class SqlQuery to cache the sql queries. ... This results in better handling of the BUSY condition through SqlQuery.	2014-10-20 16:55:37 +02:00
Markus Goetz	7dbb98c2e5	SyncEngine/SyncJournalDB: Don't keep transactions open	2014-10-20 16:50:55 +02:00
Markus Goetz	8b35cda4c6	SyncEngine: Refactor startSync() code	2014-10-20 15:51:50 +02:00
Markus Goetz	cb36a37779	SyncEngine/SyncJournalDB: Fix creation of .csync_journal	2014-10-20 14:27:00 +02:00
Markus Goetz	704c5f2de7	NetworkJobs: Higher timeout for pre-oC7 ... Pre-oc7 has PHP session locking for PROPFIND (by recursive PROPFIND in csync_update), the oc7 doesn't.	2014-10-20 13:34:09 +02:00
Klaas Freitag	3fcb0d2d6b	SocketAPI: Properly release precompiled statements. Use sqlite3_close ... rather than its v2 equivalent. That should make it compile on older linux platforms.	2014-10-20 10:51:03 +02:00
Klaas Freitag	2dfe0ed42e	Remove unused variable, fixes compile warning.	2014-10-20 10:51:03 +02:00
Daniel Molkentin	6048a7143a	Revert "Remove references to qsqlite3" ... QtWebkit needs it This reverts commit b1c10c8454.	2014-10-20 10:27:34 +02:00
Klaas Freitag	b5736fb5a7	Sql: Handle SQLITE_BUSY properly for sqlite3_step and sqlite3_prepare. ... Repeat the statements a couple of times and sleep in between.	2014-10-18 16:16:29 +02:00
Klaas Freitag	7822a6b000	csync_statedb: Finalize the precompiled statements after discovery. ... As described in http://www.sqlite.org/cvstrac/wiki?p=MultiThreading precompiled statements should not be used across thread borders. However, the reconcile phase would reuse the statements if defined (it calls statedb function from a different thread) so it is saver to finalize them at the end of the update run.	2014-10-18 14:18:11 +02:00
Olivier Goffart	a5bd437d48	Propagator: Fix renaming of files and case confflicts ... Better fix for #1385 and #2318	2014-10-17 16:15:03 +02:00
Olivier Goffart	08156186fa	Revert "propagator: Do not check for case clash when renaming" ... This caused test regressions in t8.pl (#2318) This reverts commit dad8c1c27c.	2014-10-17 16:15:03 +02:00
Markus Goetz	f1006ca8b0	owncloudcmd: Always need exclude list ... Try to load the system list or the user supplied list. For #2322	2014-10-17 15:58:01 +02:00
Markus Goetz	93c85711d1	ownSql: Always use finish()	2014-10-17 13:39:48 +02:00
Markus Goetz	e5ef5f2410	Revert "socketapi: if the filename is empty, it's actually /" ... Not needed, the socketapi checks for "". This reverts commit 561e3c780d.	2014-10-17 13:29:34 +02:00
Daniel Molkentin	52a5729298	Merge pull request #2319 from owncloud/sqlite_capi ... Introduce a common sqlite layer across csync and mirall. This avoids conflicts that both each load different and/or updated sqlite versions.	2014-10-17 12:11:27 +02:00
Daniel Molkentin	4525161e7c	Updater: allow overriding update URL through environment	2014-10-17 12:07:18 +02:00
Daniel Molkentin	dee6d18d69	Discovery phase: Improve UI by quoting folder names	2014-10-17 12:07:18 +02:00
Daniel Molkentin	d44179142f	Discovery phase: Properly decode percent encoding	2014-10-17 12:07:18 +02:00
Klaas Freitag	c66c01245b	Beautified some debug logging strings.	2014-10-17 11:35:06 +02:00
Markus Goetz	b1c10c8454	Remove references to qsqlite3	2014-10-16 17:51:17 +02:00
Markus Goetz	1d5b3aadea	sqlite3: Bundle 3.8.6 for Mac and Windows ... it is linked into ocsync.	2014-10-16 17:38:45 +02:00
Markus Goetz	2d420cd72c	ownSql: Always use SQLITE_TRANSIENT ... More safe.	2014-10-16 15:30:50 +02:00
Markus Goetz	707d6880a8	main: Show console message if already running	2014-10-16 15:25:33 +02:00
Markus Goetz	dbad1a8d45	ownSql: Don't allow copying of SqlQuery ... This fixes a crash on OS X where the destructor calls sqlite3 to invalidate the underlying handle.	2014-10-16 15:10:25 +02:00
Klaas Freitag	36eaff92e5	JournalDb: Some Sql statement fixes, make t7 work again. ... plus some minor fixes.	2014-10-16 11:22:57 +02:00
Klaas Freitag	e51c299937	ownSql: create an null value of an empty string in bindValue.	2014-10-16 11:20:50 +02:00
Klaas Freitag	8c7953a47c	ownSql: Proper initialization of result value plus assert on it.	2014-10-16 11:20:21 +02:00
Daniel Molkentin	4527784905	Second part of #1661 ... - QT_INSTALL_TRANSLATIONS was not defined in Qt5 - Some languages have been split up in multiple qm's. We only need qtbase for now	2014-10-16 11:08:29 +02:00
Klaas Freitag	ee8a93ae9a	ownSql: Proper initialization of errId	2014-10-16 10:39:10 +02:00
Klaas Freitag	89c51e7649	ownsql: Implement the transaction functions.	2014-10-15 19:47:25 +02:00
Olivier Goffart	2bba4134fb	owncloudgui: Fix a small leak ... The systray icon were not destroyed while qutting	2014-10-15 18:11:52 +02:00
Klaas Freitag	336c95ce5b	ownsql: Cleanups: In modern C++, we use 0 instead of NULL	2014-10-15 16:46:39 +02:00
Klaas Freitag	babe891242	SyncEngine: Show a warning if post update script can not be exec.	2014-10-15 16:43:58 +02:00
Klaas Freitag	eeb5ca42e0	ownsql: Added some paranthisis to make clear whats happening.	2014-10-15 13:29:25 +02:00
Daniel Molkentin	03ee742981	Correct lookup logic for Qt translations ... Fixes #1661	2014-10-15 09:33:38 +02:00
Klaas Freitag	0094c1ecf5	Make the sync work with new sql implementation.	2014-10-14 20:51:51 +02:00
Klaas Freitag	357c08c5b3	NewSQL: minor fixes to get stuff going	2014-10-14 12:18:33 +02:00
Klaas Freitag	e7d9ec50dc	Merge branch 'sqlite_capi' of github.com:owncloud/mirall into sqlite_capi ... Conflicts: src/mirall/socketapi.cpp	2014-10-14 11:43:10 +02:00
Klaas Freitag	09b0ba31ef	Sql: New implementation of ownSql class to go away from Qt's own Sql	2014-10-14 11:14:57 +02:00
Klaas Freitag	26ffa078ef	SocketAPI: Cache database conections and statements	2014-10-13 17:31:40 +02:00
Markus Goetz	eb60aca34f	SyncJournalDB: Clarify debug message	2014-10-13 17:29:26 +02:00
Markus Goetz	4d3020421a	SocketAPI: Remove old dbFileRecord function ... We will use the _capi functions	2014-10-13 17:29:26 +02:00
Markus Goetz	f1ce0a1cf3	SocketAPI: Use non-recursive (heuristic) computation of icons	2014-10-13 17:29:26 +02:00
Klaas Freitag	dd28a645a1	SocketAPI: Cleanup, removed helper namespace, added as private methods.	2014-10-13 15:38:57 +02:00
Klaas Freitag	561e3c780d	socketapi: if the filename is empty, it's actually /	2014-10-13 15:36:13 +02:00
Klaas Freitag	46fd79604d	JournalDb: Do not use static variable for path.	2014-10-13 14:49:53 +02:00
Klaas Freitag	d08c2de619	Use sqlite C api.	2014-10-13 14:14:43 +02:00
Jürgen Weigert	07bcaaebf9	unreachable --version code made reachable. ... error message improved.	2014-10-12 19:28:13 +02:00
Markus Goetz	b285e98988	SQlite: Print versions we use	2014-10-11 17:33:35 +02:00
Klaas Freitag	ab40ba2f75	owncloudcmd: Handle trust ssl switch correctly by overwriting trustssl ... method in a subclass of HTTPCredentials.	2014-10-11 17:17:43 +02:00
Klaas Freitag	bbcb8ba3e7	credentials: Allow to trust ssl certs in subclasses of HTTPCredentials. ... This allows to handle the --trust option in owncloudcmd. In the owncloudcmd subclass of the httpcredentials, we allow to manually trust the ssl certificate through a command line switch.	2014-10-11 17:17:43 +02:00
Markus Goetz	ef48de34f7	Logger: Log the thread pointer ... Maybe we can somehow reduce this to make it not so many characters wide?	2014-10-11 16:58:47 +02:00
Olivier Goffart	7e898cf60c	SelectiveSync: rename blacklist to selectiveSyncBlackList in some places ... Issue #2301	2014-10-11 16:24:45 +02:00
Klaas Freitag	2f5cea0e73	owncloudcmd: Add a custom ssl verification callback for neon. ... That fixes the SSL related problems we had with ci.owncloud.org	2014-10-11 15:55:37 +02:00
Olivier Goffart	282abdd804	Sync engine: Restart sync when we get a precondition failed error	2014-10-11 15:40:28 +02:00
Olivier Goffart	9b178c5bb2	Sync engine: Do not write to the database too early ... It is possible that we have should_update_etag set to true for files that we also need to propagate. In which case we must not write to the DB too early as this could cause data loss. (cf: issue #2296)	2014-10-11 15:40:28 +02:00
Klaas Freitag	d491663143	owncloudcmd: Fix some slash screwup, to make the split succeed bug #2211	2014-10-11 15:14:07 +02:00
Klaas Freitag	8eaeba6486	owncloudcmd: Fix url handling with csync, make owncloudcmd sync again. ... This fixes mirall issue #2211	2014-10-11 12:21:26 +02:00
Daniel Molkentin	77d2cba155	owncloudcmd: don't prompt for password if it was provided	2014-10-10 18:04:00 +02:00
Daniel Molkentin	2149092c7a	owncloudcmd: Fix crash	2014-10-10 18:04:00 +02:00
Olivier Goffart	100d1361b6	Add Folder wizard: Sort the folders when selecting the remote folder ... Issue #1872	2014-10-10 16:56:05 +02:00
Daniel Molkentin	76f5266fa1	Fix small inefficiency in socketapi	2014-10-10 16:20:57 +02:00
Daniel Molkentin	3ebe3b1196	Use local socket (named pipe) connection also on Windows	2014-10-10 15:57:05 +02:00
Daniel Molkentin	c4f96c2fba	owncloudcmd: Implement --version, fix strings ... Part of #2211	2014-10-10 15:55:58 +02:00
Olivier Goffart	d880f2ffbc	propagator: Do not show an error message saying it was done by user interaction if it was not ... There is many reasons why we could abort (for example timeouts) And in this case we should not show to the user it was aborted by user interaction	2014-10-10 14:58:56 +02:00
Klaas Freitag	9bb89dced5	Less offensive logging, only use error if there was one.	2014-10-10 10:16:59 +02:00
Markus Goetz	f0fef4f232	OS X: Fix .app creation for non-system Qt	2014-10-09 16:50:03 +02:00
Daniel Molkentin	7eb10a08b8	SSL error dialog: Remove debug noise	2014-10-09 16:49:31 +02:00
Olivier Goffart	4c83653d5d	Selective sync: do not upload or rename file that would ends up in a not selected folder ... Issue #2283	2014-10-09 16:50:03 +02:00
Christian Kamm	3149cd03be	Sync scheduling: Never enqueue a folder while it is synced. ... Issues: #2268, #2275	2014-10-09 15:55:10 +02:00
Christian Kamm	5314765410	fix compile	2014-10-09 15:55:10 +02:00
Olivier Goffart	621a37be15	Selective sync: Remove the etag of parent folders in the db when adding or removing items in the selective sync blacklist	2014-10-09 15:28:51 +02:00
Olivier Goffart	6de104a03a	Selective Sync: ensure that the blacklist contains the last '/' ... In the sync engine. Because that makes tha tthe lower_bounds in selective sync works properly. For example, if both "Test" and "Test Test" are in the list, then "Test/Foo" would match the "Test Test" because slash is after space Task #2289	2014-10-09 15:11:04 +02:00
Olivier Goffart	97560509ea	Selective sync: change the text of the label. ... Selective sync is a black list. Unchecked folder are blacklisted Partially checked folders are not in the blacklist and the files there are sync'ed	2014-10-09 14:36:26 +02:00
Christian Kamm	dfba8fbe5e	CheckServerJob: Require status code 200. #2290	2014-10-09 11:06:00 +02:00
Klaas Freitag	32fea6523f	Use climits for ULONG_MAX rather than modern C++ option	2014-10-09 11:03:07 +02:00
Klaas Freitag	d1c1a18226	SyncJournal: Use precompiled statement in blacklist query.	2014-10-09 10:05:20 +02:00
Klaas Freitag	04558beabe	SyncJournal: Use the NOCASE Collate for blacklist query.	2014-10-09 10:05:20 +02:00
Klaas Freitag	425d0d77c5	Two little typo fixes.	2014-10-09 10:05:20 +02:00
Christian Kamm	886f9d82f2	Sync scheduling: Improve logging. #2275	2014-10-09 09:01:35 +02:00
Daniel Molkentin	6c8eab734e	Remove C++11ism that doesn't work with older GCCs	2014-10-08 18:56:30 +02:00
Christian Kamm	705cd571a5	Download: Don't store message body if status != 2xx #2280	2014-10-08 14:18:29 +02:00
Christian Kamm	48d3c75745	GET: Retry if bad range header used. #2280 ... * If a 416 is returned and we used a Range header, try again from scratch. * The direct URL logic was also inconsistent for resumed downloads: it sent the Range header but didn't check the returned Content-Range header correctly. Now resuming is disabled for direct URL downloads.	2014-10-08 14:18:29 +02:00
Christian Kamm	285cb78962	Sync scheduling: Don't always force-sync. #2268 ... If lastEtag was null, a force sync was triggered. Force syncs don't update the etag. The etag retrieval job would only run if lastEtag was not null. So it could never become non-null.	2014-10-08 10:51:32 +02:00
Christian Kamm	708655d9b2	fix incomplete rename ... from 9bd7ffe952	2014-10-08 09:36:47 +02:00
Christian Kamm	9bd7ffe952	blacklist: Fix stale blacklist removal. #2247 ... Use the right check to determine whether a file has a blacklist entry, SyncFileItem::FileIgnored was incorrect because that denotes files from the ignore list or blacklisted files with no retries left. The blacklistedInDb flag does the right thing. Rename it to hasBlacklistEntry to be more explicit.	2014-10-08 09:17:40 +02:00
Markus Goetz	8febd90f2a	Propagator: Be less verbose	2014-10-08 09:07:29 +02:00
Daniel Molkentin	1579c23ff1	Fix order in which credentials are getting fetched	2014-10-07 18:21:22 +02:00
Markus Goetz	bf18ecae13	Propagator: Fix bw limiting bug, be less verbose in logging	2014-10-07 17:42:50 +02:00
Markus Goetz	89971925ca	Propagator: Be more verbose about propagator choice	2014-10-07 14:55:30 +02:00
Markus Goetz	d1cc3c34c9	Propagator: Relative download limit	2014-10-07 14:46:55 +02:00
Markus Goetz	de79f9338a	Propagator: Bandwidth limiting for new propagator	2014-10-07 14:46:55 +02:00
Olivier Goffart	5471bfd5a8	No need to update mtime and etag after a move ... The server keeps the mtime and etag anyway. And changing the mtime also changes the etag and so make other clients re-download the file instead of detecting the move	2014-10-07 09:13:13 +02:00
Daniel Molkentin	961df010cb	Propagator: Fix typo in Win32-only code	2014-10-06 15:39:49 +02:00
Klaas Freitag	12b09fab67	CaseClash: more defensive logging on Windows.	2014-10-03 11:54:32 +02:00
Klaas Freitag	41fa562dce	blacklisting: disable broken remove stale entries function for now.	2014-10-03 11:35:18 +02:00
Klaas Freitag	81d3ce8257	cmake: Commented setting of the INSTALL_PREFIX var on Mac	2014-10-01 20:55:39 +02:00
Daniel Molkentin	bcc06af904	fix last commit	2014-10-01 17:46:29 +02:00
Daniel Molkentin	a98242a2b8	fix install target for macdeployqt	2014-10-01 17:32:17 +02:00
Olivier Goffart	0d303f1d1f	SelectiveSync: sort the item instead of using the order from the server ... Task #2259	2014-10-01 13:47:24 +02:00
Daniel Molkentin	dafd9c308f	More removal of obsolete CMake code	2014-10-01 12:51:38 +02:00
Olivier Goffart	147fa60f81	Merge branch 'socketapi_localsocket' into 1.7	2014-10-01 12:34:22 +02:00
Olivier Goffart	a1b9405e2e	Windows has not been ported back to QLocalSocket	2014-10-01 12:33:54 +02:00
Olivier Goffart	db02d44c6a	No need to update mtime and etag after a move ... The server keeps the mtime and etag anyway. And changing the mtime also changes the etag and so make other clients re-download the file instead of detecting the move	2014-10-01 11:22:00 +02:00
Klaas Freitag	dff1f77dfa	SocketAPI: remove nonsense FIXME's.	2014-09-30 17:12:07 +02:00
Daniel Molkentin	1a2fff8ed8	OS X: Use a python script to fix for bundle fixup... ... ...rather than relying on cmake magic	2014-09-30 17:09:16 +02:00
Markus Goetz	52c12b33c3	OS X: CMD+H should hide the dialog	2014-09-30 15:21:55 +02:00
Klaas Freitag	479b340d75	Folderman: Check if socketApi member is non zero, no crashes.	2014-09-30 12:33:51 +02:00
Klaas Freitag	06c48f58cc	SyncEngine: Use proper start indicator, max unit64. ... This avoids a warning.	2014-09-30 12:29:24 +02:00
Klaas Freitag	0ee81a2865	SocketAPI: Set permission of the socket Directory. ... Set that to be accessible by the owner only.	2014-09-30 11:23:49 +02:00
Klaas Freitag	e78c251832	SocketAPI: Split up for specific linux and mac implementation.	2014-09-30 11:23:49 +02:00
Markus Goetz	f8b73eb9d9	SocketApi: Port OS X to use local sockets	2014-09-30 07:36:20 +02:00
Olivier Goffart	a587148c73	SocketApi: Save the socket in $XDG_RUNTIME/<appname>/socket	2014-09-29 13:54:13 +02:00
Olivier Goffart	9acd3a58ee	SocketApi: Use QLocalSocket after all for windows and linux ... Relates issue #2189	2014-09-29 12:19:33 +02:00
Olivier Goffart	10989d13e4	Folder: Remove slotTerminateAndPauseSync ... This make no sens to just set the pause config flag here. It make selective sync to mark the folder as posed on restart	2014-09-26 12:43:54 +02:00
Olivier Goffart	b4071cec01	DiscoveryPhase: fix the name of a function ... It was renamed from white list to black list long ago	2014-09-26 12:35:56 +02:00
Klaas Freitag	b1c842373d	Add OWNCLOUDSYNC_EXPORT to make building on windows.	2014-09-26 10:07:50 +02:00
Olivier Goffart	a3d70b3cf6	Attempt to fix a crash ... The reply might be null at the point we are timing out. Issue #2246	2014-09-26 10:04:36 +02:00
Klaas Freitag	98d9f7924d	SocketAPI: Before reporting something new check for parent permissions. ... In case it is not allowed to create files or dirs because of missing permissions in shares, the socket API has to report an error state rather than the NEW state. As discussed in mirall issue #1931	2014-09-25 21:52:20 +02:00
Klaas Freitag	172295289e	Permissions: If a top level shared dir is removed, do not restore files in it ... A top level shared dir can always be removed on the client, even if it is read only shared. In that case, the removal means "unsharing". Fixed the permission check accordingly. See bug #1918 for more information.	2014-09-25 15:39:14 +02:00
Klaas Freitag	8ba08d7e87	Activity View: honor error string even if no warning ... that allows to specify a more specific user message to be displayed.	2014-09-25 15:03:54 +02:00
Klaas Freitag	8915f94931	Mac Overlays: handle filenames with slashes properly. ... There are filenames with slashes on MacOSX, they can be created in Finder. Internally they are converted to colons.	2014-09-25 12:24:32 +02:00
Markus Goetz	1543899795	Upload Chunking: Fix progress DB values	2014-09-25 11:32:54 +02:00
Klaas Freitag	31bf844452	DownloadJob: Refresh the FileInfo after renaming the target file. ... Otherwise the activity view reports file size 0.	2014-09-25 10:59:08 +02:00
Olivier Goffart	dad8c1c27c	propagator: Do not check for case clash when renaming ... Issue #1385 When renaming, we would normaly already have an error if the file already exist. And we want to allow the renaming to chang ethe case (Eg. "hello" -> "HELLO"	2014-09-24 16:43:01 +02:00
Klaas Freitag	2c67a7ca71	progress: Set a clear start indication in the progress. ... Before, 0 was used to indicate the sync start which wipes the activity window. However, if there _are_ no synced items but only ignored items the overall counter stays zero which wipes the list all the time. This fixes bug #2171	2014-09-23 15:58:06 +02:00
Klaas Freitag	5b10a9f3a7	Minor: Remove unused definition	2014-09-22 13:47:45 +02:00
Klaas Freitag	d0fb1acebb	Win32: Define HANDLE variable, make win compile again.	2014-09-22 13:47:17 +02:00
Christian Kamm	fa881ba1c7	Notifications: Don't emit one per error. #1777	2014-09-19 15:59:03 +02:00
Olivier Goffart	9ae4d45243	Restart the sync when we detect we need to redo a sync ... Fixes #1968 Relates #2038 (cherry picked from commit a84b7dc27e) Conflicts: src/mirall/owncloudpropagator.h src/mirall/propagator_qnam.cpp src/mirall/syncengine.h	2014-09-19 11:51:17 +02:00
Christian Kamm	2eec85a97c	NetworkJobs: Propagator jobs keep others from expiring. #2155 ... In some owncloud server setups multiple concurrent connections for the same session are not supported: owncloud/core#11153 This causes issues with multiple uploads and downloads. A usual symptom is the quota job failing and the sync aborting. This workaround lets activity on the propagator's GET and PUT jobs reset the timeout of all network jobs. That way, queries like the quota job would not time out while a large up/download is in progress.	2014-09-19 11:22:57 +02:00
Olivier Goffart	1cd5681967	permissions: Remember the permissions for the root folder	2014-09-19 10:58:52 +02:00
Olivier Goffart	50e718b1e7	Merge branch '1.7' ... Conflicts: src/CMakeLists.txt src/cmd/cmd.cpp src/gui/folder.cpp src/gui/socketapi.cpp translations/mirall_ca.ts translations/mirall_cs.ts translations/mirall_de.ts translations/mirall_el.ts translations/mirall_en.ts translations/mirall_es.ts translations/mirall_es_AR.ts translations/mirall_et.ts translations/mirall_eu.ts translations/mirall_fa.ts translations/mirall_fi.ts translations/mirall_fr.ts translations/mirall_gl.ts translations/mirall_hu.ts translations/mirall_it.ts translations/mirall_ja.ts translations/mirall_nl.ts translations/mirall_pl.ts translations/mirall_pt.ts translations/mirall_pt_BR.ts translations/mirall_ru.ts translations/mirall_sk.ts translations/mirall_sl.ts translations/mirall_sv.ts translations/mirall_th.ts translations/mirall_tr.ts translations/mirall_uk.ts translations/mirall_zh_CN.ts translations/mirall_zh_TW.ts	2014-09-18 17:10:21 +02:00
Olivier Goffart	7c36e5c0e6	parallel chunk upload: allow "true" for the value of OWNCLOUD_PARALLEL_CHUNK	2014-09-18 14:29:38 +02:00
Olivier Goffart	1b62ed1e7e	Parallel chunk upload: Fix progress	2014-09-18 12:36:30 +02:00
Klaas Freitag	e9248066df	SyncJournal: Better error report for sql statements in updateDbStructure ... Also, even if the updateDatabaseStructure fails, precompile the sql statements. This will help to debug and maybe solve bug #2106	2014-09-18 12:02:28 +02:00
Christian Kamm	a88ac00115	SyncEngine: Better reporting when ignoring hardlinks. #2217 ... Also touch csync to actually let us know it's ignoring the file due to it having hard links.	2014-09-18 11:32:29 +02:00
Christian Kamm	30683b38a8	Updater: Add "didn't check for updates" message. #2175 ... Don't show "Checking server..." when we are not. (cherry picked from commit ece11dc3d8)	2014-09-18 09:43:13 +02:00
Christian Kamm	45aefeb146	SelectiveSyncDialog: Change 'partial' behavior. ... The real bug in #2219 actually was that the gui allowed users to choose to not sync the root folder. That's not supported and no longer possible in the UI. Instead you may now sync a folder's files without syncing its sub- folders.	2014-09-18 09:42:50 +02:00
Daniel Molkentin	db3318886e	Merge pull request #2214 from owncloud/2211 ... Implement (most of) #2211	2014-09-18 00:09:26 +02:00
Daniel Molkentin	54eb837950	Remove unused confdir option	2014-09-18 00:07:33 +02:00
Christian Kamm	e395282e0e	SelectiveSyncDialog: Fix sync-nothing case. #2219	2014-09-17 16:13:47 +02:00
Christian Kamm	1f129d0bcb	Propagator: Don't upload files that were changed recently. ... Instead skip them and try another sync later. See #2167, #2169, #2210.	2014-09-17 15:30:18 +02:00
Christian Kamm	c2ae5e5fd1	FolderMan: Ensure a 1s delay between sync request and start. ... That way the propagator can detect files that are still being changed right now and skip them.	2014-09-17 15:30:18 +02:00
Christian Kamm	ece11dc3d8	Updater: Add "didn't check for updates" message. #2175 ... Don't show "Checking server..." when we are not.	2014-09-17 11:41:04 +02:00
Christian Kamm	99aa2cdf2a	Log: Print client version on sync start. #2178	2014-09-17 09:39:04 +02:00
Christian Kamm	0eb9401c62	File change detection: Also look at file sizes. ... See #2167 and #2169. * csync_detect_update: Reupload a file if the sizes differ, similar to how we reupload if the mtimes differ. * PropagateUploadFileQNAM::slotPutFinished(): Abort an upload if the size changed, similar to how we abort an upload if the mtimes changed.	2014-09-17 09:05:13 +02:00
Daniel Molkentin	122fa596b3	Remove stray file that was not meant to be committed	2014-09-17 00:55:55 +02:00
Daniel Molkentin	5406407ed6	Implement --non-interactive as per Juergens' request	2014-09-17 00:12:16 +02:00
Daniel Molkentin	b72cee2783	Fix passing URLs not ending in /remote.php/webdav	2014-09-16 23:53:01 +02:00
Daniel Molkentin	fe023e2229	Allow passing user/pass explicitly or via netrc ... #2211	2014-09-16 23:52:28 +02:00
Olivier Goffart	66595a3597	Parallel chunk uploads ... This does not include progress indicator	2014-09-16 17:40:42 +02:00
Olivier Goffart	9b1779bb06	Fix compilation ... qFatal does not work with <<	2014-09-15 18:03:44 +02:00
Olivier Goffart	97cc05eeea	journaldb: Assert in case of SQL error ... relates issue #2106	2014-09-15 14:27:39 +02:00
Christian Kamm	20dd3b0a69	FolderMan: Fix startFromScratch logic. #1989 ... (cherry picked from commit 4566ca3127)	2014-09-15 13:53:38 +02:00
Christian Kamm	f348eabf19	Account: Fix cert save/restore from settings. #2160 ... (cherry picked from commit cc1121ef00)	2014-09-15 13:53:38 +02:00
Olivier Goffart	5870a57002	wizard: fix start a clean sync ... The problem was that the backup function failed as we tried to move /home/xxx/ownCloud/ to /home/xxx/ownCloud/.oC_bak The intention was to move it to /home/xxx/ownCloud.oC_bak Issue #1989	2014-09-15 13:49:13 +02:00
Olivier Goffart	278bc5a8cd	owncloudcmd: ask for the login and password and put it in the url (if it's not there already) ... Because we cannot rely on HTTPCredentials to open windows in a command line tool Fixes #1860	2014-09-15 13:24:31 +02:00
Olivier Goffart	af5e8ee18c	AbstractNetworkJob ... Abort the transfer in case of timeout. This avoid that a connection that never replies blocks mirall Issue #2148	2014-09-12 18:06:29 +02:00
Olivier Goffart	52e8343f76	ConnecitonValidator: Handle the timeout ... otherwise the account may be stuck in a disconnect case if there is a timeout Issue #2148	2014-09-12 18:06:17 +02:00
Olivier Goffart	a4dbf5942c	owncloudcmd: restart the sync if required ... Fixes #2038	2014-09-12 17:23:01 +02:00
Daniel Molkentin	ada1d42ebf	Sparkle requirement bumped to 1.8	2014-09-12 16:08:52 +02:00
Daniel Molkentin	f27182ae05	fFx Utility::freeDiskSpace for win32	2014-09-12 16:08:52 +02:00
Markus Goetz	2fddf05515	OS X: Overlay Icons: Load from bundle-specific path ... The client (in this case mirall) tells the Finder plugin where to get the icons. This enables installation in different locations and in branded clients.	2014-09-12 15:09:47 +02:00
Tim Vandecasteele	f3cc614427	Fix apple build. ... The apple build was broken because the elseif in the CMakeLists is never triggered. Some code was not properly adapted for the new qtmacgoodies. Some paths were not adapted to new split.	2014-09-12 14:24:26 +02:00
Olivier Goffart	79052ba7c6	Blacklist: ignore problems that don't have HTTP error code and are possibly problem on the local file system ... Issue #1985	2014-09-12 14:13:04 +02:00
Markus Goetz	4960890d70	Propagator: Commit the DB for Poll Jobs	2014-09-11 12:05:35 +02:00
Olivier Goffart	a84b7dc27e	Restart the sync when we detect we need to redo a sync ... Fixes #1968 Relates #2038	2014-09-10 17:27:33 +02:00
Daniel Molkentin	927af0adec	Fix build on win32: add missing export	2014-09-10 16:31:47 +02:00
Daniel Molkentin	f59a6862ca	raiseDialog: Actually send the XEvent ... Amendment to 25c274a0bd Conflicts: src/mirall/owncloudgui.cpp	2014-09-10 13:21:27 +02:00
Olivier Goffart	71408bab60	I forgot to rename one of the while list to the blacklist	2014-09-10 11:01:38 +02:00
Christian Kamm	88b7f2e0ee	SyncJournal: Don't use C++11 features.	2014-09-05 12:48:45 +02:00
Markus Goetz	f5f04bcc4b	SyncEngine: Always return _renameTarget in destination() if possible ... We want to do this since the instruction is actually ERORR, not RENAME.	2014-09-05 10:07:24 +02:00
Christian Kamm	2630a73a1c	Propagator: Use csync to get the modification time. ... See owncloud/core#9781	2014-09-04 14:16:23 +02:00
ckamm	4decd15ca9	Merge pull request #2161 from ckamm/stale-downloadinfo ... Clean up stale journal entries and temporaries. #2057	2014-09-04 14:14:39 +02:00
ckamm	3a59dd24f3	Merge pull request #2162 from ckamm/error-missing-exclude ... Don't do a broken sync when the system exclude file is missing	2014-09-04 14:14:07 +02:00
Olivier Goffart	c232411e96	uploading: make sure to cast to uint64 to avoid integer overflow	2014-09-04 13:46:01 +02:00
Christian Kamm	1cf1f6edcb	Fix style issues.	2014-09-04 13:27:11 +02:00
Christian Kamm	5d36a27893	Clean up stale journal entries and temporaries. #2057 ... * Downloadinfo entries for files that no longer need to be downloaded are useless and can be removed. In particular, the temporary files holding partially retrieved files are now deleted when no longer necessary. * The same is true for blacklist entries for paths that are no longer being discovered. * Same for uploadinfos for files that no longer need to be uploaded.	2014-09-04 13:14:15 +02:00
Christian Kamm	da94533647	Folders: Signout should not switch folders to paused state. #2112 ... On signout, syncs that are running in folders are aborted. That used to also switch the state of these folders to 'paused'. To fix that, aborts that are caused by user actions no longer change the folder paused state. Aborts due to errors should still pause folders! Otherwise we'd try resyncing them even though there was an error.	2014-09-04 11:21:28 +02:00
Markus Goetz	69066013c1	ownCloudTheme: Fix casing in appName() ... Without this fix, the section in the config file uses the wrong name, leading to re-configuration of the client needed.	2014-09-03 17:30:34 +02:00
Christian Kamm	aef569ee9d	SyncEngine: Use exclude file fallback next to binary on linux. ... This is mainly useful for developers where the system-wide exclude file may not exist.	2014-09-03 14:53:01 +02:00
Christian Kamm	cf881aa6dc	SyncEngine: Fix invalid slot name in sync error condition.	2014-09-03 14:52:55 +02:00
Christian Kamm	a48bf3142c	SyncEngine: Abort sync with error if system exclude file is missing. ... Syncing without the system exclude file would cause lots of trouble. For instance we would try uploading the temporary files we store partially completed downloads in.	2014-09-03 14:52:46 +02:00
Daniel Molkentin	c0131695c5	Return from Folder::slotPollTimerTimeout() if the account object is 0 ... Right now, we crash instead. This can happen if a folder is created when an account object is not (anymore/yet) created. Fixes #2142	2014-09-02 14:51:33 +02:00
Daniel Molkentin	fcbadda40f	Make Settings Window close on Ctrl+W ... Fixes #2141 (cherry picked from commit 2ab19b23d7)	2014-09-02 14:03:20 +02:00
Daniel Molkentin	2455faa6fe	Account Migrator: Switch to string comparison for URLs. ... QUrl does not normalize trailing slashes, so there is no benefit of using QUrl here. (cherry picked from commit d770f9cc1a)	2014-09-02 14:03:07 +02:00
Markus Goetz	0be4b59cff	Sparkle: Keep permissions from bundle	2014-08-31 18:57:39 +02:00
Olivier Goffart	291231c561	Merge missing commits from 1.6.2-themefix into 1.7 ... Conflicts: VERSION.cmake	2014-08-30 17:57:58 +02:00
Dominik Schmidt	7ad557f2f8	Add crash reporter to osx package and don't build it with BUILD_LIBRARIES_ONLY enabled	2014-08-30 14:45:39 +02:00
Dominik Schmidt	ef70052b0e	Package installer if it was built	2014-08-30 14:12:40 +02:00
Dominik Schmidt	202426f536	Make crash reporter application name branded	2014-08-30 11:05:52 +02:00
Dominik Schmidt	d240415671	Make crash reporter logo branded	2014-08-30 11:05:34 +02:00
Dominik Schmidt	1aca22b5f8	Make crash reporter executable branded	2014-08-30 10:46:09 +02:00
hefee	68792ee9db	Fixing spellingerror ... GNU Public License -> GNU General Public License	2014-08-30 02:18:55 +02:00
Klaas Freitag	bcff1ced5e	Merge branch '1.7' ... Conflicts: src/CMakeLists.txt src/cmd/cmd.cpp src/gui/folderman.cpp src/gui/wizard/owncloudadvancedsetuppage.cpp src/libsync/account.cpp	2014-08-29 20:40:33 +02:00
Klaas Freitag	7ce2a93c63	Merge remote-tracking branch 'origin/reuse_oc_config' into 1.7 ... Conflicts: src/CMakeLists.txt src/mirall/folderman.cpp src/mirall/folderman.h src/mirall/owncloudtheme.h	2014-08-29 20:23:07 +02:00
Olivier Goffart	5d19426930	Propagator: When the server don't support ranges, reset the counter so the progress is not messed up ... Issue #2081	2014-08-29 19:33:20 +02:00
Olivier Goffart	1b51a10b19	Socket API: be consistant in the VERSION command and add the VERSION at the beginning	2014-08-29 17:28:36 +02:00
Dominik Schmidt	38ff7d87c8	Hide crashreporter config option if not build with crashreporter enabled	2014-08-29 17:07:31 +02:00
Markus Goetz	12e2bac16b	Propagator: Also parse OC-ETag header ... Client side part of https://github.com/owncloud/core/issues/9005	2014-08-29 16:30:58 +02:00
Olivier Goffart	34a27c748a	Progress: in case of resuming chunks, advance directly at startup by the amount of chunk already done ... Fixes #2103	2014-08-29 16:06:56 +02:00
Markus Goetz	7ec0c52439	Poll URL: Use trimmed() on response	2014-08-29 13:58:33 +02:00
Olivier Goffart	a73fbccf8c	t4.pl: add a test to test that ignored file are not deleted	2014-08-28 19:33:52 +02:00
Klaas Freitag	7f1d707d23	ownCloud Theme: Do not have the oCSetupTop custom media, see #1445	2014-08-28 18:10:53 +02:00
Daniel Molkentin	25c274a0bd	X11: Bring Settings window to front when launched	2014-08-28 17:25:00 +02:00
Olivier Goffart	0fb0f2c204	Selective sync: start a sync when the selective sync settings changes	2014-08-28 16:27:46 +02:00
Dominik Schmidt	6abaad1ae8	Show crash reporter if trying to read the crash-reporter-enabled config crashes	2014-08-28 16:23:14 +02:00
Dominik Schmidt	89aec52503	Add checkbox to general settings to disable the crash reporter	2014-08-28 16:19:17 +02:00
Markus Goetz	b6f42a91f4	OS X: Fix Finder bundle NVTY->OWNC	2014-08-28 15:45:07 +02:00
Markus Goetz	2aef6a2174	Poll URL: Don't delete from DB in case of 503	2014-08-28 13:44:21 +02:00
Olivier Goffart	79f00c2a2a	Wizard: adjust alignements	2014-08-28 13:32:14 +02:00
Olivier Goffart	e5068e7543	Selective sync: if one click twice on the button in the wizard, it should keep the blacklist	2014-08-28 12:25:44 +02:00
Olivier Goffart	858218ac34	Wizard: new layout	2014-08-28 12:18:19 +02:00
Dominik Schmidt	b8e8d975aa	Add CRASHREPORTER_SUBMIT_URL to OWNCLOUD.cmake	2014-08-28 12:08:07 +02:00
Markus Goetz	6e0330ff65	SyncEngine: Error out if we don't have a sync dir	2014-08-28 11:47:40 +02:00
Markus Goetz	3aa7178382	PollJob: Increase timeout	2014-08-28 11:27:08 +02:00
Dominik Schmidt	439bf7641e	Use include path for libcrashreporter-qt instead of lengthy relative include	2014-08-28 11:11:42 +02:00
Dominik Schmidt	34042028b3	Add CRASHREPORTER_SUBMIT_URL define and default it to some placeholder owncloud url	2014-08-28 11:05:46 +02:00
Markus Goetz	2f34b046d0	Overlay Icons: Improve OS X version, improve general feedback ... Now the update phase of the syncing algorithm pushes stuff the notification socket too.	2014-08-27 19:15:43 +02:00
Olivier Goffart	a73316306d	Selective sync: new design in the wizard	2014-08-27 19:03:11 +02:00
Daniel Molkentin	cf12a56b4c	Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/gui/socketapi.cpp	2014-08-27 18:22:07 +02:00
Olivier Goffart	928652e4cf	Selective sync: rename the button 'choose what to sync'	2014-08-27 17:31:57 +02:00
Olivier Goffart	7950b49cb1	Selective sync dialog: fix fetching sub directory when the folder is not the root folder	2014-08-27 17:19:36 +02:00
Klaas Freitag	cc6aa66ab0	JournalDB: Do prepare the queries even if the db update failed. ... Also, add more logging in case SQL errors happen while db structure update.	2014-08-27 14:01:33 +02:00
Olivier Goffart	ea381392a7	SocketAPI: fix the BROADCAST message	2014-08-27 13:55:06 +02:00
Olivier Goffart	bb7f63dcfd	AccountSettings: be less verbose in the status string	2014-08-27 13:51:14 +02:00
Olivier Goffart	253d65727b	Socket api: Add a VERSION command	2014-08-27 13:51:14 +02:00
Klaas Freitag	d2e1489fe7	Propagator: Set the chunk size to 20MB as requested by Matt.	2014-08-27 10:35:58 +02:00
Dominik Schmidt	2b4849a2fa	Add crash reporter using libcrashreporter-qt	2014-08-26 18:15:13 +02:00
Olivier Goffart	2356601bb3	folder: Make sure not to pol the server if the account is disconnected ... Fixes #2108	2014-08-26 16:23:19 +02:00
Olivier Goffart	9b88c7d3c1	SSLButton: fix memleak	2014-08-26 15:59:19 +02:00
Olivier Goffart	302499b483	uploading: make sure to cast to uint64 to avoid integer overflow	2014-08-26 15:58:55 +02:00
Dominik Schmidt	17e16f5e79	Add "Crash" entry to systray if started with --debug	2014-08-26 15:46:24 +02:00
Dominik Schmidt	b176ff6626	Don't use CMAKE_INSTALL_PREFIX for RPATH	2014-08-26 15:19:46 +02:00
Daniel Molkentin	e5471d8318	Build after merge	2014-08-26 14:33:21 +02:00
Daniel Molkentin	902bb7a198	Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir ... Conflicts: src/CMakeLists.txt src/gui/accountsettings.cpp src/gui/folderwizard.cpp src/gui/settingsdialog.cpp src/libsync/syncengine.h	2014-08-26 11:29:42 +02:00
Markus Goetz	b037e6356e	TokenCredentials, DirectDownload: Rework cookie handling ... That way we don't override QNAM's cookie jar behaviour	2014-08-22 13:46:22 +02:00
Markus Goetz	824628061b	Propagator: Don't have cookies overriden by QNetworkCookieJar ... The direct download feature has its own cookies, don't let QNAM override them.	2014-08-22 12:12:46 +02:00
Klaas Freitag	c473428be6	Merge pull request #2084 from owncloud/contextless_exclude ... Contextless exclude, @ogoffart reviewed, I'll merge.	2014-08-21 13:15:18 +02:00
Klaas Freitag	dc8f437b31	Excludes: Add an context free implementation of exclude file loading. ... So that we are more thread safe.	2014-08-21 12:43:04 +02:00
Olivier Goffart	aabcf80774	Sync engine: Take also in account the fact that the instruction can be IGNORE on both tree	2014-08-21 11:33:38 +02:00
Olivier Goffart	1cf956ec21	Discovery phase: clear the callbacks after use	2014-08-21 11:27:25 +02:00
Klaas Freitag	54e2b9345b	GUI: on Mac do not call slotUpdateAccountIcon	2014-08-21 11:00:57 +02:00
Klaas Freitag	75101a0319	Application: Unload all folders when shutting down. ... That sends a proper UNREGISTER message via socket API.	2014-08-20 17:33:48 +02:00
Klaas Freitag	d1a660ce20	SocketAPI: Add parameter to enable wait for the socket write. ... This is needed to wait until the UNREGISTER message is sent to the shell code when mirall shuts down.	2014-08-20 17:33:48 +02:00
Klaas Freitag	4356005c5a	FolderMan: Do not remove the folder icon too early from the map. ... Otherwise, method unloadFolder can not do important frees. This is one part of the fix for #2073 because now the socketapi will send the UNREGISTER_PATH message over the socket.	2014-08-20 17:33:48 +02:00
Daniel Molkentin	8fdee79505	Fix crash in accountsettings	2014-08-20 16:06:38 +02:00
Klaas Freitag	988fe70771	Merge pull request #2075 from owncloud/use_folder_paused ... Rework of the status icons in FolderMan and Folder objects.	2014-08-20 10:50:28 +02:00
Klaas Freitag	d02175210b	Status Icon: Set a proper icon if no sync is configured. ... This fixes bug #1956	2014-08-19 17:47:28 +02:00
Klaas Freitag	617887a0c6	Propagator: If the sync was interrupted by pausing, do not show error. ... Handle problems which happen because of pausing the sync as soft errors rather than normal errors which are blacklisted and displayed in the gui. This fixes bug #1959	2014-08-19 14:21:59 +02:00
Klaas Freitag	e4fe4cb4d3	Status icons: Display the correct icons after startup connect.	2014-08-19 14:21:59 +02:00
Klaas Freitag	dc0a054d94	Status icons: Set the offline icon at the very beginning. ... Otherwise, if the account is signed out and opens the credential popup, there is a wrong icon displayed. If the account is coming from keychain this icon is quickly overwritten.	2014-08-19 14:21:51 +02:00
Klaas Freitag	924d9b985f	Some minor cleanups.	2014-08-19 14:21:51 +02:00
Klaas Freitag	bb3bd6930a	StatusModel: Have another property accountConnected. ... With that , make the status model aware of the account connection state. With that, we can grey out the correct state icon if the account is not connected and display the normal icon if the account is connected.	2014-08-19 14:21:51 +02:00
Klaas Freitag	1245ed6f06	Status Icons: Let FolderMan only write the folder config files. ... Remove the setSyncEnabled() call to individual folders which mistakenly set the folders to pause. Let the folders keep their pause state on their own. If FolderMan is set to be enabled emit a general refresh signal rather than one for each folder.	2014-08-19 14:21:51 +02:00
Klaas Freitag	01b0ee49de	Status Icons: Rename the syncEnable method to isPaused. ... Previously, in folder and folderman there have been the syncEnabled properties, but they confused the semantics: While in FolderMan the syncEnabled flag represents the network connection and stuff, in Folder it represented if the user paused or resumed the folder. This resulted in mixed use of both, which lead to wrong icon states. This patch renames the folder methods and properties to isPaused to make more clear about what it is.	2014-08-19 14:21:42 +02:00
Olivier Goffart	9c98883bea	propagator mkcol: If the server replies with a file-id in the header, use it ... Newer server will have a file id directly in the file header. https://github.com/owncloud/core/issues/9000	2014-08-18 20:42:43 +02:00
Olivier Goffart	2fb19e25b5	Fix clang 3.0 compilation	2014-08-18 19:44:18 +02:00
Olivier Goffart	c291eb3db4	Fix compilation error	2014-08-18 15:45:58 +02:00
Olivier Goffart	7f38ce8908	Selective sync: the button should only be enabled while connected	2014-08-18 15:45:38 +02:00
Olivier Goffart	1781400340	fix compilation	2014-08-18 15:28:24 +02:00
Olivier Goffart	3760f14da8	Restore the log window	2014-08-18 15:16:33 +02:00
Olivier Goffart	dc18366111	DiscoveryPhase: put in namespace Mirall	2014-08-18 14:45:48 +02:00
Olivier Goffart	936252765a	Merge branch 'master' into selective_sync ... Conflicts: src/mirall/syncengine.cpp src/mirall/syncengine.h	2014-08-18 14:44:43 +02:00
Markus Goetz	b62b87eed3	OS X: Rename LiferayNativity code for shell icons	2014-08-18 12:57:29 +02:00
Klaas Freitag	4b716f3ea6	About page: Fix the translation of developer names.	2014-08-18 12:17:13 +02:00
Klaas Freitag	27f9d4523b	Settings: Display the commit SHA both in branded and unbranded. ... Also, do not put the developer names into the translation string.	2014-08-18 11:27:56 +02:00
Volkan Gezer	463a9a5485	space	2014-08-17 17:38:33 +02:00
Klaas Freitag	dccb9def3a	Merge pull request #2067 from owncloud/grammar ... subject verb agreement - very good, thanks.	2014-08-16 12:13:01 +02:00
Sandro Knauß	7b114e2cae	Use QStandardPaths for linux if building with qt>=5	2014-08-16 03:12:20 +02:00
Volkan Gezer	25d519fed3	subject verb agreement	2014-08-15 20:49:47 +02:00
Klaas Freitag	b494181764	Nautilus Overlays: Use port 34001 by default.	2014-08-15 17:16:47 +02:00
Olivier Goffart	9575271fcd	Selective sync: hide the header	2014-08-15 16:49:22 +02:00
Olivier Goffart	b6eda9076e	Selective sync: add a page in the folder wizard	2014-08-15 16:40:11 +02:00
Markus Goetz	88072a985a	SyncEngine & UI: Move QElapsedTimer to object ... Using a function static is too dangerous when multiple threads are involved.	2014-08-15 16:20:43 +02:00
Markus Goetz	c27f151451	SyncEngine & UI: Make the function part of UpdateJob ... That way we can easily emit UploadJob's signals	2014-08-15 16:11:51 +02:00
Markus Goetz	ce2741cebc	SyncEngine & UI: Progress notifications for update phase ... For each directory (local and remote, we have UI update throtting code) a signal is emitted. It is used by the settings dialog and the tray menu.	2014-08-15 15:28:35 +02:00
Daniel Molkentin	3d6b622879	Merge pull request #2064 from owncloud/fix-1959 ... Show folder icon a offline when account is offline	2014-08-15 15:11:06 +02:00
Daniel Molkentin	4c67a8812a	Show folder icon a offline when account is offline ... Fixes #1959	2014-08-15 15:01:01 +02:00
Olivier Goffart	4c4d02c0d0	Selective Sync: refactor the widget in its own class	2014-08-15 14:58:16 +02:00
Olivier Goffart	c1831f4946	Selective sync: use a black list instead of a white list	2014-08-15 12:29:10 +02:00
Olivier Goffart	4b2c1bacd1	Merge remote-tracking branch 'origin/master' into selective_sync	2014-08-15 10:28:50 +02:00
Klaas Freitag	78e50747e4	Updated the about text for the generic ownCloud Theme.	2014-08-14 17:12:23 +02:00
Klaas Freitag	b09498d852	csync journal: Improve get_below_path query. ... Add another index on the pathlen column. Use that column to deselect all rows that are shorter than the path to search files below. That shrinks the amount of rows to examine using LIKE tremendously by a cheaply to query for criteria.	2014-08-14 13:52:44 +02:00
Klaas Freitag	7fcf723039	SyncJournal: Add an index on inode to the journal database.	2014-08-14 13:22:43 +02:00
Klaas Freitag	d27ab8c6ca	Revert "FolderMan: Proper singleton implementation." ... This reverts commit 0350508b65.	2014-08-14 12:46:01 +02:00
Klaas Freitag	0350508b65	FolderMan: Proper singleton implementation. ... The connect in SocketAPI had to be moved because it also uses FolderMan::instance(). And since SocketAPI is instanciated in FolderMans constructor, this was a deadlock. Now the connect is tried on every new socket connection in SocketAPI but I assume that multiple attempts to connect are not an issue.	2014-08-14 11:32:03 +02:00
Klaas Freitag	32739cc305	SyncEngine: End the journal transaction after update.	2014-08-14 11:32:02 +02:00
Klaas Freitag	f515fe77c4	SyncJournal: Fix logging text.	2014-08-14 11:32:02 +02:00
Daniel Molkentin	4fc044d368	Merge branch 'master' into move_lib_to_sep_dir ... Conflicts: cmake/modules/NSIS.template.in src/CMakeLists.txt src/creds/shibboleth/authenticationdialog.cpp src/creds/shibboleth/authenticationdialog.h src/gui/owncloudgui.cpp src/libsync/creds/shibboleth/authenticationdialog.cpp src/libsync/creds/shibboleth/authenticationdialog.h src/libsync/mirallaccessmanager.cpp src/mirall/authenticationdialog.cpp src/mirall/authenticationdialog.h	2014-08-12 21:08:44 +02:00
Daniel Molkentin	1544606bf0	Always handle 401 requests, except for network jobs ... It is not enough to only implement it for the QNAM returned by the ShibbolethCredentials, because we sometimes need it when we have no valid credentials set (and are using dummy credentials in the course). The main use case is the Webview opened by Shibboleth for FBA. But as a side-effect, we can use it to handle auth requests from the updater and other places.	2014-08-12 19:25:59 +02:00
Olivier Goffart	255330d342	Add a "Skip Folder Configuration" button in the wizard ... This allow to start owncloud the first time but not automatically sync everything, but let the user configure sub folders instead	2014-08-12 17:34:54 +02:00
Olivier Goffart	ad139e19ab	Fix error reported by address sanitizer ... Qt allow to call deleteLater on a null object, but it is an undefined behaviour	2014-08-12 17:34:54 +02:00
Markus Goetz	8e6e51f9a6	OS X: Move include to MAC define	2014-08-12 14:58:34 +02:00
Markus Goetz	faa502163e	OS X: Finally(?) fix stay-on-top behaviour of settings dialog ... Fixes #1795	2014-08-12 14:48:42 +02:00
Olivier Goffart	4ff0e7e0a2	Silent some warnings	2014-08-12 14:03:04 +02:00
Olivier Goffart	12459bf07e	selective sync: fix whitelist matching	2014-08-12 11:43:42 +02:00
Olivier Goffart	b25ef28e82	Selective sync: remember the old list when accepting the dialog even if the tree was not expanded	2014-08-12 11:12:58 +02:00
Olivier Goffart	7e009667a2	Selective sync: ignore the files that are not in the selective sync white list	2014-08-11 18:42:24 +02:00
Olivier Goffart	1f1eb933d1	Move the update job in a new file named discoveryphase ... "Discovery" is a better name than "update"	2014-08-11 18:42:24 +02:00
Olivier Goffart	aa85e875bd	Selective sync: Add UI to select paths	2014-08-11 18:42:24 +02:00
Daniel Molkentin	1b4c613fa6	ProtocolWidget: Disable copy button if widget is empty.	2014-08-11 16:38:51 +02:00
Markus Goetz	8cd1d43798	TokenCredentials: Don't overwrite Cookie header ... If the request already had a cookie header, there was a reason for it. Don't blindly overwrite it.	2014-08-11 15:40:12 +02:00
Markus Goetz	acd3df33b6	Merge branch 'long_running_put' into il	2014-08-08 12:00:26 +02:00
Markus Goetz	1bc8fd9b49	CMake: Don't need translations with token auth compile	2014-08-08 11:59:14 +02:00
Klaas Freitag	6cb8134690	SocketAPI: Use Win32 function SHChangeNotify to notify Explorer.	2014-08-07 14:59:06 +02:00
Olivier Goffart	95a77e5ccc	Merge branch 'il'	2014-08-07 14:29:27 +02:00
Olivier Goffart	21783ecef7	SyncEngine: fix permission detection of moves ... Two problems: - "M" was used instead of "V" - The extraction of the parent folder of the destination was wrong	2014-08-07 14:27:27 +02:00
Klaas Freitag	d8a8b53fc9	SocketAPI: Also update view when paused.	2014-08-07 14:07:08 +02:00
Olivier Goffart	6827f9977c	Merge branch 'il' ... Conflicts: doc/ocdoc	2014-08-07 12:15:50 +02:00
Olivier Goffart	6d24bd0361	journaldb: Fix that fileid might be missing in the db ... When recovering from a inalid move operation, we call avoidReadFromDbOnNextSync. This will remove the fileid from the db so we don't detect a move on the next sync. But we want the next sync to fetch the file id again, and this can only happen if we don't read them from the db and do the actual PROPFIND, this is done by avoidReadFromDbOnNextSync However, if there is propagation in that source directory later, it will overide the invalid etag with the real one and we will not uissue the PROPFIND to fetch the fileid. We must therefore also protect the future write to the DB when calling avoidReadFromDbOnNextSync	2014-08-07 12:14:45 +02:00
Markus Goetz	22c1629dd3	SyncEngine: Keep csync_journal with proper values for fileId and remotePerm ... Before this patch, we had a lot of empty rows because we created the SyncFileItems with the wrong(=local) data.	2014-08-07 10:14:14 +02:00
Olivier Goffart	55567f8dd2	remove unused variable	2014-08-06 10:20:58 +02:00
Daniel Molkentin	996b7166d2	Merge pull request #2027 from owncloud/l10n-fix ... Use am. eng. since brit. eng. is handled on transifex	2014-08-05 14:11:20 +02:00
Daniel Molkentin	839b2fa8fd	SocketAPI: Convert to unix path before comparing with black list	2014-08-05 13:11:52 +02:00
Markus Goetz	c313cc02f2	Config: Fix loading of configuration ... There is a strange bug with Qt, we need to always set the application name, then we can generate the proper config path.	2014-08-05 00:41:43 +02:00
Klaas Freitag	f983264b5d	SocketAPI: Do not allow a trailing slash for directories. ... The entries in our sync journal have no trailing slashes for directories.	2014-08-04 12:47:22 +02:00
Klaas Freitag	40cebeedfc	SocketAPI: Call csync_exclude with the relative path. ... This avoids messing with the windows pathes and csync_exclude is designed that way.	2014-08-04 12:47:22 +02:00
Klaas Freitag	1f9280c68e	GUI: Remove useless comment.	2014-08-04 12:47:22 +02:00
Klaas Freitag	4fb671e7f4	SocketAPI: Send Broadcasts only for Linux, not used on Mac and Win.	2014-08-04 11:09:17 +02:00
Volkan Gezer	a42e384935	Use am. eng. since brit. eng. is handled on transifex ... See https://github.com/owncloud/core/pull/10025#issuecomment-50855986 for info.	2014-08-02 04:05:10 +02:00
Klaas Freitag	327f70240c	GUI: Load the finder overlay icon script on MacOSX.	2014-08-01 14:28:34 +02:00
Klaas Freitag	fe9a2e7ba4	SocketAPI: Normalize file names when read from the filesystem. ... Otherwise there will be bad encoded file names because of a Qt upstream error that skips the normalization.	2014-08-01 12:18:52 +02:00
Klaas Freitag	3c09ef6cbf	SocketAPI: rename slot to send UPDATE_VIEW.	2014-08-01 10:59:49 +02:00
Klaas Freitag	68bfcf5d24	SocketAPI: Create the socket API instance in folderman.	2014-08-01 10:59:49 +02:00
Klaas Freitag	b2a10de71a	Copyright plus minor beautification.	2014-08-01 10:59:49 +02:00
Olivier Goffart	cfdfd6a860	wizard: don't call initializePage ... It is called automatically by QWizard and do not need to be called explicitly But setVisibla(false) don't really have an effect there since show() is going to be called on the page	2014-07-30 12:36:30 +02:00
Olivier Goffart	8df14ee845	Long running put: fix some bugs	2014-07-29 22:56:36 +02:00
Olivier Goffart	550d6d66d1	Long Running Put: Better error reporting	2014-07-29 15:51:22 +02:00
Olivier Goffart	7480d34742	Long Running Put: store into the database so they can be resumed at startup	2014-07-28 15:37:37 +02:00
Olivier Goffart	5254c9785c	shibboleth: Fix connection when the URL do not have a path ... When the url do not have a path (for example: "http://example.com" as opposed to "http://example.com/"), its path is not a prefix of the root path of the cookie (usually '/') By adding the dav path, we make sure the URL has a path. This made a bug when the owncloud url was just a domain name and did not have a path	2014-07-28 13:50:24 +02:00
Olivier Goffart	04cc513bbd	Poll for long running PUT: WIP ... Some PUT, may take a long time on the server to process (for example, the last chunk). It may take more time that the timeout. So in that case the server may reply with an url that we can poll for the etag This patch is still work in progress	2014-07-25 13:30:48 +02:00
Markus Goetz	f004d5085d	Merge remote-tracking branch 'origin/1.6' into il ... Conflicts: VERSION.cmake	2014-07-25 12:37:27 +02:00
Klaas Freitag	98e21ae0ad	SocketAPI: Connect REGISTER_FOLDER to Foldermans events.	2014-07-25 12:20:38 +02:00
Klaas Freitag	8b93678e3d	SocketAPI: Added REGISTER_PATH and UNREGISTER_PATH ... to inform the plugins about the top sync directories. Also cleaned the code a bit.	2014-07-25 12:11:21 +02:00
Olivier Goffart	3d0c009719	propagator_qnam: Limit the HTTP buffer size when downloading ... Otherwise the buffer might fill up too quickly and get too large and consume too much memory which could lead to crash in extreme cases Should fix issue #1974	2014-07-24 15:43:28 +02:00
Olivier Goffart	208011f6ab	propagator_qnam: add debug output in cae the file changed localy ... In order to debug https://github.com/owncloud/core/issues/9781	2014-07-24 11:17:59 +02:00
Klaas Freitag	1fb52f0d8b	HTTPCreds: Do delete the WritePasswordJob to not leak memory.	2014-07-23 17:59:02 +02:00
Klaas Freitag	d4de024f15	Propagator: Fix local file name clash detection. ... Need to normalize the output of QFileInfo::canonicalFilePath() before comparing to a server side path. See https://bugreports.qt-project.org/browse/QTBUG-39622 This fixes #1998 and #1999	2014-07-23 17:56:46 +02:00
Olivier Goffart	1d9d88ca85	Always use the dummy crendential while trying to determine the credentials ... Otherwise the SHibbolethCredential may be set and it has hook to intercept 401 This should fix issue #1908	2014-07-23 14:38:50 +02:00
Eran	2ca8805cda	Removed uneed code	2014-07-23 15:09:28 +03:00
Eran	8e5c41e6f3	Merge https://github.com/owncloud/mirall into fix_folder_status_ui_ignore_new_line_inoverall_text	2014-07-23 13:53:05 +03:00
Eran	0f7efbc22e	fixed bug where the overall text caused in the folder view the to defrom	2014-07-23 13:52:02 +03:00
Klaas Freitag	0f4cf74ae0	SyncEngine: allow to do a post upgrade script in debug mode.	2014-07-22 18:07:02 +02:00
Olivier Goffart	8a88ca6f34	Merge branch 'il' ... Conflicts: src/mirall/propagator_legacy.h	2014-07-18 17:00:38 +02:00
Olivier Goffart	81d786733d	Merge remote-tracking branch 'origin/1.6' into il ... Conflicts: VERSION.cmake src/mirall/propagator_qnam.cpp src/mirall/propagator_qnam.h	2014-07-18 16:59:29 +02:00
Olivier Goffart	beb9300b4e	network limit: Never wait more than 10 seconds ... When using the "Limit automatically" limit, we wait for 25% of the time it took to upload something. However, if we go to sleep while uploading, the time it took to upload may take days. And waiting for 25% of a day is too long. So never wait for more than 10 seconds This may be related to issue #1880	2014-07-18 12:27:02 +02:00
Olivier Goffart	c35880d4f1	Fix corruption while trying to resume and the server don't suport it ... Issue #1982	2014-07-18 12:03:45 +02:00
Klaas Freitag	f8bea55b10	SocketAPI: Handle top sync folder correctly.	2014-07-17 19:34:50 +02:00
Daniel Molkentin	72cd84e878	SocketAPI: Exclude drive part from path blacklist check ... Otherwise, it always matches the ':' part	2014-07-17 19:26:58 +02:00
Daniel Molkentin	35b6d09615	SocketAPI: Fix separators on Windows	2014-07-17 17:41:20 +02:00
Daniel Molkentin	1ae727e70f	SocketAPI: Emit error of binding the server fails	2014-07-17 15:01:01 +02:00
Daniel Molkentin	0e5d0c1170	SocketAPI: Some cleaning up	2014-07-17 15:00:21 +02:00
Daniel Molkentin	bb32831a60	Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir ... Conflicts: src/gui/folderman.cpp	2014-07-17 11:31:45 +02:00
Klaas Freitag	743c1c2eda	SocketAPI: Send an UPDATE_VIEW to the shell plugin on connect. ... For each configured sync folder send an UPDATE_VIEW directly after the socket connect to make the shell integration updating the view.	2014-07-17 11:26:03 +02:00
Klaas Freitag	0e9a08cbbf	SocketAPI: rename slot to send UPDATE_VIEW.	2014-07-17 11:25:08 +02:00
Klaas Freitag	d2445ec72d	PropagatorQNAM: Never send if-match header for new files.	2014-07-17 11:23:11 +02:00
Klaas Freitag	fef713aaed	SocketAPI: Create the socket API instance in folderman.	2014-07-17 11:22:18 +02:00
Klaas Freitag	c4d73688a6	Folderman: Fix path detection in folderForPath().	2014-07-17 11:21:02 +02:00
Daniel Molkentin	56b721b2eb	propagator_qnam: fix warning	2014-07-17 11:05:16 +02:00
Klaas Freitag	e6c501de8e	FolderMan: More useful logging.	2014-07-16 16:59:20 +02:00
Klaas Freitag	71338000a4	SetupWizard: Keep initial local folder to compare later for changes. ... If the local folder changes, the sync has to be reinitialized as well. Until now we did not detect that, which led to the case that the sync folder was not reinitialized in case only the local folder changed in the setup dialog.	2014-07-16 11:37:46 +02:00
Olivier Goffart	2fdb3cfdfb	Merge branch 'il' ... Conflicts: src/mirall/folder.cpp src/mirall/propagator_qnam.cpp	2014-07-16 10:49:16 +02:00
Olivier Goffart	8961e61f60	Merge branch '1.6' into il ... Conflicts: VERSION.cmake src/mirall/syncengine.cpp src/mirall/syncengine.h	2014-07-16 09:57:40 +02:00
Olivier Goffart	d697969f36	Use another way to detect that the server was reconfigured ... Before, we would only detect it if all the files were removed, and no file where added or changed. This may not be enough because there might be a welcome.txt file. Now, we check that none of the file stays the same, and some files are removed. Relates issue #1948	2014-07-15 18:09:08 +02:00
Olivier Goffart	51e9c5fd96	propagator_qnam Fix signal slot connection ... Fix the signature so it can be connected This was hapenning if the derver does not support X-OC-MTime issue #1963	2014-07-15 18:08:26 +02:00
Klaas Freitag	997504c03c	FolderMan: Unload folder method added. ... unloadFolder now correctly removes a folder from all maps and signal mappers.	2014-07-15 16:07:23 +02:00
Markus Goetz	0202351a27	Propagator: Fix crash when logging out during upload ... Fixes #1957	2014-07-14 19:53:42 +02:00
Daniel Molkentin	28879712e9	Make krazy target work again	2014-07-14 12:19:32 +02:00
Daniel Molkentin	3c2e43d883	Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir	2014-07-14 10:50:53 +02:00
Daniel Molkentin	5041880854	Try to handle BUILD_LIBRARIES_ONLY correctly ... Also, try to fix OS X build	2014-07-11 12:36:01 +02:00
Klaas Freitag	a281b36d6f	SocketAPI: send the path with UPDATE_VIEW	2014-07-11 12:34:04 +02:00
Klaas Freitag	7772501cdf	Remove unused socketPath variable.	2014-07-11 12:33:43 +02:00
Daniel Molkentin	2c904afd04	OS X explicitly requires the neon include path to be set	2014-07-11 12:11:04 +02:00
Daniel Molkentin	2cc13fb74a	Fix includes in mac specific headers	2014-07-11 11:38:01 +02:00
Daniel Molkentin	df3c3bca02	Split into three separate projects: library, gui and cmd	2014-07-11 11:07:31 +02:00
Daniel Molkentin	d1b991e198	Fix windows compilation	2014-07-10 22:58:58 +02:00
Klaas Freitag	00f793a841	CMake: Remove accidentially added typo to fix build.	2014-07-10 17:20:40 +02:00
Klaas Freitag	bdb9598227	SocketAPI: Use QTcpSocket all over, rather than QLocalSocket.	2014-07-10 16:35:18 +02:00
Klaas Freitag	c6deb392fd	SocketAPI: Enhance SyncFileStatus to have share information. ... Added a new class SyncFileStatus to reflect that properly.	2014-07-10 16:28:40 +02:00
Olivier Goffart	3477ea0eeb	Fix build with TOKEN_ONLY_AUTH ... It was broken by commit 6ff38d8005	2014-07-10 15:26:55 +02:00
Olivier Goffart	73e35c66af	owncloudcmd: fix the --trust option ... We can't call csync_set_userdata in owncloudcmd because it is going to be overwritten later in the SyncEngine. So we had an object of type SyncEngine* that we cast to CmdOptions* and the trust flag was in the padding, so was some random data. Therefore we must use global variables in that case in order to know if we should ignore the certificate.	2014-07-10 11:19:23 +02:00
Olivier Goffart	846773efd3	Define Q_DECL_OVERRIDE for Qt4 ... That macro is new in Qt5, define it as well when compiling with Qt4 so we can use it in mirall Note: QNetworkCookieJar::deleteCookie was not existing in Qt4.	2014-07-09 23:31:56 +02:00
Olivier Goffart	bcfa34357b	Add Q_DECL_OVERRIDE for all function that are overriding something ... This was made automatically with clang-modernize -override-macros -add-override	2014-07-09 23:31:56 +02:00
Olivier Goffart	e0c2e8ed86	folder: remove TOKEN_AUTH_ONLY ... Folder is no longer in the libowncloudsync	2014-07-09 22:44:08 +02:00
Olivier Goffart	b80a3876ab	cleanup the CMakeLists.txt ... Headers need not to be added if they are not going to be installed The list was incomplete anyway, and most of the _HEADERS variables were even not used	2014-07-09 22:44:08 +02:00
Olivier Goffart	26e17f58ef	Engine: Do not reset the csync log callback in the engine ... It is already set in Folder and we don't want to use the Logger in command line clients	2014-07-09 22:44:08 +02:00
Olivier Goffart	45d1567057	Move Folder, FolderMan, and FolderWatcher outside of owncloudsync ... Those class are maintaining the folder for the mirall configuration They are not usefull in command line clients Also the FolderWatcher is only used by the folder and not used by the command line clients	2014-07-09 22:44:08 +02:00
Olivier Goffart	8aacb3f7ec	Remove undeeded include	2014-07-09 22:44:08 +02:00
Olivier Goffart	99ee81a489	Utility: Move showInFileManager in its own file ... And get rid of GUI in the Utility namespace	2014-07-09 22:44:08 +02:00
Olivier Goffart	517ffbd783	Utility: remove Utility::dataLocation ... It is used only from one location, so put the code there	2014-07-09 22:44:08 +02:00
Olivier Goffart	7dd926d4f1	Utility: move raiseDisalog to owncloudGui ... Reduce the GUI dependency in the Utility namespace used by libowncloudsync	2014-07-09 22:44:08 +02:00
Olivier Goffart	cbc7942a00	Added t8.pl that test case sensitivity issues ... Made some change in the .cpp code in order to be able to test the code when the file system is case sensitive	2014-07-09 22:44:08 +02:00
Olivier Goffart	63cd5ef563	ProtocolWidget: limit the number of items ... That should save memory instead of letting the number of items grow to infinity	2014-07-09 15:48:03 +02:00
Olivier Goffart	82c254fecf	propagator_qnam: Avoid using too much memory ... The idea here was that the buffer would be maximum 8KiB, not minimum.	2014-07-08 15:30:53 +02:00
Olivier Goffart	86bea9a9af	shibboleth: Fix the waiting curser that would not disapear ... Fix #1915	2014-07-07 14:08:13 +02:00
Klaas Freitag	88f26fb548	HTTP Creds: In case of Keychain error, open the interact password dialog ... But in case the user clicks cancel in the interactive dialog, invalidate the credentials. Emit fechted() also in error case.	2014-07-04 13:27:35 +02:00
Klaas Freitag	a9f1de84f0	HTTP Credentials: Read the password from the old location if not found. ... Earlier clients used QtKeychain without a QSettings object, which made QtKeychain to write the password encrypted into a settings default location, ie. the registry under windows. If we can not find a password at the new location it is tried to read the password from the old default location once. That makes people happy in migration scenarios.	2014-07-04 13:27:22 +02:00
Olivier Goffart	081b7d4aa9	Merge pull request #1913 from owncloud/typo-fix ... Typo fix	2014-07-01 20:39:30 +02:00
Olivier Goffart	9c3c4bac66	Merge remote-tracking branch 'origin/il'	2014-07-01 20:37:42 +02:00
Daniel Molkentin	ad2eabeb3b	SocketAPI: Try to make the folder selection work on windows	2014-07-01 16:24:14 +02:00
Daniel Molkentin	26c377d05b	Utility: export new functions	2014-06-30 14:13:45 +02:00
Volkan Gezer	3ad9356ca4	Typo fix	2014-06-29 14:14:44 +02:00
Volkan Gezer	dd5296f03c	Typo fix ... Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/)	2014-06-29 14:06:45 +02:00
Volkan Gezer	e673d76f22	Typo fix ... Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/)	2014-06-29 14:04:30 +02:00
Volkan Gezer	393eb7bb4d	Typo fix ... Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/)	2014-06-29 14:02:50 +02:00
Daniel Molkentin	f8b097669a	Merge remote-tracking branch 'origin/1.6' ... Conflicts: VERSION.cmake doc/building.rst	2014-06-27 15:34:20 +02:00
Olivier Goffart	2f284209d8	Permissions: When moving is not allowed, fallback to delete and upload ... We decided that we never want to rename a directory behind the back of the user as the user may be using files in the directory during the sync. If moving is not allowed, we just erase the inode form the database so the next sync will try to do an upload and delete and recover from there using normal resolution. This also add some code to update the inode back to the db when it is detected as changed.	2014-06-27 15:30:08 +02:00
Olivier Goffart	09881040a3	Permissions: fix restoring subdirectories ... The sync item vector must be sorted before we call checkForPermission	2014-06-27 13:34:15 +02:00
Klaas Freitag	e76386be4f	Revert "ownCloudcmd: Use Account object and ConnectionValidator." ... We decided that owncloudcmd should not share the config with mirall. This reverts commit 5f96de32bb.	2014-06-26 10:16:56 +02:00
Olivier Goffart	48864a6921	httpcredentials: Remove useless mutex ... The mutex is not shared with any thread, so it is totaly useless. Yes: there are possible races here. (with the account, but also with the user and password)	2014-06-25 12:15:30 +02:00
Olivier Goffart	92f07cb60f	Enable C++11 ... In order to avoid the warning warning: anonymous variadic macros were introduced in C99 Due to the use of variadic macro in the qDebug macro in Qt 5.3 C++11 requires a space between string literal and macro to avoid the ambiguity with user defined litteral	2014-06-25 12:01:27 +02:00
Klaas Freitag	e17243bc1f	AccountMigrator: Read path from QDir::fromNativeSeperators(), add debug.	2014-06-25 11:38:08 +02:00
Klaas Freitag	0e45dd7a3d	AccountMigrator: Do not inherit from QObject as it is not needed yet. ... As requested by Danimos review.	2014-06-25 11:38:08 +02:00
Klaas Freitag	65f313f1b4	Account: Added missing include statement.	2014-06-25 11:38:08 +02:00
Klaas Freitag	da4958c716	Account: Read settings from ownCloud config if no branded exists. ... If there is not yet a config for a branded client, but one for the "normal" client targetting the same URL, it will be migrated.	2014-06-25 11:38:08 +02:00
Klaas Freitag	653b8494f5	FolderMan: Migrate folderlist if no folder definitions can be found ... and the account indicates that it was migrated. In that case, read the folder definitions from the ownCloud config directory.	2014-06-25 11:38:08 +02:00
Klaas Freitag	6ed6f84f6e	Account: Add a wasMigrated flag. ... If an account in a branded client was migrated from a former ownCloud configuration, the method wasMigrated() will return true.	2014-06-25 11:38:08 +02:00
Klaas Freitag	ff0ba56bc3	ownCloud Theme: Implement appName() and appNameGUI().	2014-06-25 11:38:08 +02:00
Klaas Freitag	e795d04f30	cfg migration: Add a account migrator class.	2014-06-25 11:38:08 +02:00
Klaas Freitag	8d3806b080	folderman: make escapeAlias public as its now used in accountmigrator.	2014-06-25 11:38:08 +02:00
Klaas Freitag	5597ebe455	Account: Add a scoped pointer to the ownCloud theme.	2014-06-25 11:38:07 +02:00
Klaas Freitag	5f96de32bb	ownCloudcmd: Use Account object and ConnectionValidator. ... That reads the credentials from the mirall config file if it was not defined on the command line. Moreover, the connection is validated before, which sets up the credentials properly.	2014-06-24 15:33:42 +02:00
Klaas Freitag	d2436ce23d	Networkjobs: Check if reply body is empty before parsing. ... This avoids a false warning that the result is not valid JSON.	2014-06-24 15:17:33 +02:00
Olivier Goffart	fbadadc377	propagator: Fix folder duplication if the folder is renamed on the server while uploading ... While uploading a new folder, if the folder is renamed on the server when still uploading, the result will be that the files that are already uploaded will end up in the new filder name, but the file that were not still are in the old folder. After renaming, all the new uploads wil fail with an error on this sync because the parent directory don't exist. But they were uploaded with the old name in the next sync because the renaming was not detected because the file id was not in the DB Fix the problem by fetching the file id always when creating a new directory, on the next sync, and saving it in the database ummediatly https://github.com/owncloud/enterprise/issues/191	2014-06-24 12:00:13 +02:00
Olivier Goffart	9adc30ab9f	Shibboleth: keep the cookie from the wizard to the ShibolethCredentials ... Otherwise the user is asked twice for autentication on first sync. Fixes https://github.com/owncloud/enterprise/issues/193	2014-06-24 11:44:52 +02:00
Olivier Goffart	94ddf7e5d8	Merge remote-tracking branch 'origin/il'	2014-06-24 08:40:27 +02:00
Olivier Goffart	b735dc07d6	Permissions: Consider and empty remotePerms from csync as NULL ... Since remotePerm from csync is never NULL (as it is a buffer), we consider that if it is empty, there was no permission set (and therefore everything is allowed) csync will put a space in the permission if any permission was set	2014-06-23 15:05:48 +02:00
Olivier Goffart	68c902e60b	propagator: Fix restoring directory ... If the result of a restored directory is SoftError, this prevent to sync the rest of the directory Therefore, we introduced a new status Restored, which means that the job was a success, but is a restoration and therefore should be seen as a warning	2014-06-23 13:56:17 +02:00
Olivier Goffart	e19214c3c4	permissions: record them even if the instruction is NONE ... when the instruction is NONE, we may return from this function before having registered the permission in the SyncEngine::_remotePerms hash. Move the code a bit up.	2014-06-23 13:35:34 +02:00
Olivier Goffart	4759429702	Fix compilation after merge ... Some initializer were added in 1.6 for variable that are gone in master	2014-06-23 12:53:51 +02:00
Olivier Goffart	b626589c07	Merge branch 'il' ... Conflicts: src/mirall/folderstatusmodel.h	2014-06-23 12:52:03 +02:00
Olivier Goffart	02704cdf74	Merge remote-tracking branch 'origin/1.6' into il ... Conflicts: VERSION.cmake csync/src/csync_statedb.c src/mirall/syncengine.cpp src/mirall/syncfileitem.h	2014-06-23 12:48:34 +02:00
Daniel Molkentin	7a8a3855b8	Mac: Make <ESC> close the settings dialog again	2014-06-20 16:37:07 +02:00
Daniel Molkentin	603a238eb9	Disable minimize button for Preferences on Mac	2014-06-20 16:31:17 +02:00
Olivier Goffart	b7b6cf4b3f	Shibboleth: Always ask for the password if we are going to open the log window ... If we don't have the cookie in the keychain (e.g. the keychain is unavailable) but there is still session cookie in the cookie jar, showing the browser won't ask for authentication.	2014-06-20 16:25:35 +02:00
Daniel Molkentin	485a6926c5	FancyLineEdit: initialize all members ... This fixes Coverity CID 12912	2014-06-20 13:46:57 +02:00
Daniel Molkentin	f3de6f46db	Folder: Removed unused member _pathWatcher ... This fixes Coverity CID 12914	2014-06-20 13:42:26 +02:00
Daniel Molkentin	1309dc27d9	Remove previously unused member ... This fixes Coverity CID 12915	2014-06-20 13:40:55 +02:00
Daniel Molkentin	31469d6a3e	Folderwizard: Properly initialize all members ... This fixes coverity CID 12916	2014-06-20 13:38:36 +02:00
Daniel Molkentin	88776770f7	Legacy Propagator: Properly initialize members ... This fixes coverity CID 12919	2014-06-20 13:36:15 +02:00
Daniel Molkentin	bbf8b9f8dd	syncengine: properly initialize all members in ctor ... This fixes Coverity CID 12922	2014-06-20 13:28:52 +02:00
Daniel Molkentin	6ff38d8005	Cleanup member initialization in Theme ... This fixes coverity issue 12925	2014-06-20 13:28:52 +02:00
Daniel Molkentin	6d13b5cc43	wizard setuppage: Clean up and properly initialize members ... This fixes Coverity CID 12926	2014-06-20 13:28:52 +02:00
Daniel Molkentin	73ab2804c4	owncloudwizard: properly initialize _account memember ... This fixes Coverity CID 12927	2014-06-20 13:28:52 +02:00
Klaas Freitag	d995d1190f	SyncFileItem: Some more proper member initializations. ... This fixes a Coverity CID	2014-06-20 12:54:46 +02:00
Klaas Freitag	3217e42a0f	SyncJournalDB: Initialize size member properly with 0 ... This fixes Coverity CID 12924	2014-06-20 12:37:49 +02:00
Klaas Freitag	1dd58a537e	owncloudcmd: Fix structurally dead code. ... This fixes Coverity CID 12928	2014-06-20 12:34:15 +02:00
Olivier Goffart	3e916cfbb9	remove unused member ... CID 12915 CID 12926	2014-06-20 12:08:58 +02:00
Olivier Goffart	4a9ad14e11	Folder: remove unused variable ... CID 12914	2014-06-20 12:01:20 +02:00
Olivier Goffart	f80816d88f	SyncEngine: silence coverity issue 12885 ... It was complaining that we use the context later in the function but the csync context should never be null anyway	2014-06-20 11:53:22 +02:00
Olivier Goffart	61ad376bf4	accountsettings: silent coverity warning 12884 ... We use f anyway, so if we are going to test if it's null we can as well return	2014-06-20 11:51:07 +02:00
Olivier Goffart	1e788d3d60	folderwizard: fix possible use of null pointer ... Coverity issue 12907	2014-06-20 11:29:28 +02:00
Olivier Goffart	83171bf025	accountsettings: remove unused function ... It was moved into owncloudgui before And it was broken (bad use of QUrl and use of null pointer	2014-06-20 11:27:37 +02:00
Olivier Goffart	2e51721851	owncloudgui: Fix compilation	2014-06-20 11:26:41 +02:00
Olivier Goffart	4d4a0148e4	owncloudgui: use QUrl::fromLocalFile	2014-06-20 11:21:36 +02:00
Daniel Molkentin	6b041b0846	Fix use-after-free in QNAM propagator ... This fixes Coverity CID 12929	2014-06-20 10:58:03 +02:00
Olivier Goffart	458645101b	SocketApi: query the database for the Shared flag	2014-06-19 15:37:29 +02:00
Olivier Goffart	1e306012ec	SocketApi: Fix recursiveFolderStatus ... If only one file is EVAL or NEW, this mean the folder need to be sync	2014-06-19 15:25:30 +02:00
Olivier Goffart	db2c198feb	SocketAPI: Merge command_RETRIEVE_FOLDER_STATUS and command_RETRIEVE_FILE_STATUS ... They do the same thing because fileStatus calls recursiveFolderStatus for directories anyway	2014-06-19 15:02:27 +02:00
Markus Goetz	71a901a24e	TokenCredentials: Fix cookie behaviour ... parseCookies did not work as expected. Now we just hard-set the token credentials into the Cookie header for QNAM jobs. This is the same behaviour as for neon jobs. (cherry picked from commit 855a8c0a335f76b82b8e647a8c5a4ae692065d3b)	2014-06-19 14:41:47 +02:00
Olivier Goffart	f4ea34e63b	SyncJournalDb: use QByteArray for etag and fileid	2014-06-19 14:27:04 +02:00
Olivier Goffart	0d54b88ab2	Socket API: Make it work with Qt5's QUrl ... QUrl default constructor has a different behaviour in Qt5 One must not forget to call QUrl::fromLocalFile in Qt5	2014-06-19 14:22:03 +02:00
Olivier Goffart	da0bd14bf3	Socket API: move the code that gets the status out of the folder ... Move the code in socketapi.cpp where it belongs	2014-06-19 14:08:30 +02:00
Olivier Goffart	02355696ff	engine: When restoring the file, use the mtime and fileid from the server ... Important to switch the things around as we are going to write them in the DB	2014-06-18 16:15:14 +02:00
Olivier Goffart	646eafb05d	Legacy propagator jobs: Do not limit bandwidth when aborting ... When aborting, we want the last job to be as fast as possible as it blocks the UI. So don't limit the bandwidth in that case	2014-06-18 15:09:19 +02:00
Olivier Goffart	0880444e37	Syncengine: Wait for the neon thead to be finished before destroying the Propagator and calling csync_commit ... The legacy job might still need the neon session and the propagator. We need to make sure the thread exits before. This fixes crash when pausing a sync made with the legacy jobs (for example when there is network limitation) This should fix https://github.com/owncloud/enterprise/issues/200	2014-06-18 15:08:23 +02:00
Klaas Freitag	b71881d300	SyncEngine: Use QSet for the seenFiles rather than QHash. ... We can save some memory here as the seenFiles list can be long.	2014-06-17 16:30:11 +02:00
Daniel Molkentin	b91967f4d9	Fix regression over 1.5: Fix non-fba auth for Shib IdPs	2014-06-17 14:53:23 +02:00
Olivier Goffart	c759e8bb8f	permission: read them from the tree	2014-06-17 14:50:24 +02:00
Olivier Goffart	b83f6c0b3a	sync engine: try to respect permission ... This is still Work in progress	2014-06-17 14:44:58 +02:00
dark-eye	afea881d90	Merge pull request #1717 from dark-eye/master ... Issue-142 : added time estimation and bandwidth indicator to the systray	2014-06-17 08:16:52 +03:00
Olivier Goffart	21e22a50c5	Merge remote-tracking branch 'origin/il' into master	2014-06-16 16:43:48 +02:00
Olivier Goffart	2f361278d2	Merge remote-tracking branch 'origin/1.6' into 'il'	2014-06-16 16:41:48 +02:00
Klaas Freitag	2d234cd96f	Propagator: Handle file open error properly and log error message.	2014-06-16 13:35:50 +02:00
Klaas Freitag	1230e87330	Propagator: Give a more specific error message on file remove. ... If the file is removed during it is synced up, there is now a correct error message saying that, rather than "the file has changed during upload."	2014-06-16 13:34:59 +02:00
Daniel Molkentin	b2966fecc7	Shib: remove slotLoadFinished() from webview dtor ... This is a relict from when the webview was reused. It is now pointless, since it's now destruct-on-close.	2014-06-14 03:00:18 +02:00
Daniel Molkentin	4abe00ff6c	Shib: Ensure browser view gets closed before QNAM ... Otherwise, QWebPage tries to delete its QNetworkReplies, which have already been deleted by the QNAM destruction, who is their parent. Fixes #1840	2014-06-14 03:00:18 +02:00
Daniel Molkentin	8da97a7c6f	Merge remote-tracking branch 'origin/1.6'	2014-06-13 13:31:50 +02:00
Olivier Goffart	2caa69e0cb	blacklist: use the _ERROR instruction instead of _IGNORE ... When something is in the blacklist, still use the _ERROR instruction that way the applications can still report errors for blacklisted items	2014-06-13 11:19:31 +02:00
Klaas Freitag	c72c72a106	FolderWizard: Get folder map from FolderMan rather than store locally. ... If the Folder::Map object is kept locally in the wizard, changes to the map are not reflected there, as they happen when signing out. This fixes bug #1875	2014-06-12 23:17:13 +02:00
Daniel Molkentin	4a5ef8f173	Fix a possible crash caused by a dangling pointer	2014-06-12 10:29:17 +02:00
Klaas Freitag	ed26bcb3e7	Theme: Show the stringified app version rather than the major version. ... This was a regression, we changed that by accident in 1.6.0. (cherry picked from commit 760ecd71fc)	2014-06-10 17:05:15 +02:00
Klaas Freitag	760ecd71fc	Theme: Show the stringified app version rather than the major version. ... This was a regression, we changed that by accident in 1.6.0.	2014-06-10 13:48:27 +02:00
Olivier Goffart	18e9357aaf	network limits: Fix warning ... About the order of initialization	2014-06-07 12:20:54 +02:00
Olivier Goffart	46b8260693	network limits: Do not read them from the config file in the engine ... Do that from the folder, because the engine can be used in app where the MirallConfigFile is not accessible	2014-06-07 12:09:22 +02:00
Eran	3406fcdce4	Merge branch 'master' of https://github.com/owncloud/mirall into dark-eye-master ... Conflicts: src/mirall/progressdispatcher.h	2014-06-06 18:56:58 +03:00
Markus Goetz	8dbfcd782b	CSync: Fetch permissions from server for whole tree on server update	2014-06-06 17:10:07 +02:00
Olivier Goffart	abf0f90a13	SocketAPI: broadcast change when an item is done	2014-06-06 15:52:55 +02:00
Klaas Freitag	4d5c74c019	SocketAPI: Add another API call for stat of file and folder separately.	2014-06-06 15:38:20 +02:00
Markus Goetz	70ff928381	CSync & statedb: Parse 'perm' from server ... ownCloud 6 sends this.	2014-06-06 15:24:17 +02:00
Markus Goetz	b48ab79a92	CSync & statedb: Remove uid/gid ... Columns are still in the DB as we don't want to break any compatibility.	2014-06-06 13:41:16 +02:00
Markus Goetz	fd4642d827	Folder: Don't add ignored files on startup ... Before each sync is enough. (We could do it at startup only, but so far it is good to have it at each sync so we can easier see stuff in the log)	2014-06-05 17:50:18 +02:00
Daniel Molkentin	3934fa019e	SocketAPI: proper name for pipe on windows	2014-06-05 12:02:57 +02:00
Daniel Molkentin	7fcf6f9f79	Merge branch '1.6'	2014-06-05 12:01:50 +02:00
Olivier Goffart	7a7b0e8939	propagator: Ignore new directory inside removed directory. ... This fixes te bug if one create a tree of folders and subfolders and delete them while they are uploading. Some folder would reappears	2014-06-04 16:37:46 +02:00
Olivier Goffart	a4f6370774	propagator: do not update perent directory etag before sub directories are removed ... Direcotries are removed at the end, and we don't want to update parent directory etag before the delete is performed, or the next sync may read from db and think the files are not removed. Issue #1845	2014-06-04 12:31:30 +02:00
Markus Goetz	233450d850	CSync: Remove config dir setting	2014-06-04 10:56:56 +02:00
Olivier Goffart	582a8fe7fd	Merge branch '1.6'	2014-06-03 17:27:12 +02:00
Olivier Goffart	abafbef985	Optimize move ... Do not send the mtime for each file without a directory, because the server now keeps it	2014-06-03 17:27:06 +02:00
Olivier Goffart	6e10b8c5c4	Propagator: Recover from 'precondition failed' error ... When we detect a precondition failed, it is possible that it is because the etag in the database is wrong. We must therefore not read from the database on the next sync. In order to avoid that, we reset the etag of parent directories to invalid values Fixes #1767	2014-06-03 17:22:40 +02:00
Olivier Goffart	24616bead4	Fix syncing a folder with '#' in the name ... Or an url with '#' Fixes #1838 The problem is a bug fixed in Qt5 now breaks. In Qt4, QUrl::setPath() did not properly handle path with '#' in them and QUrl::toString would restitute the '#'. But csync will blindly do "uri + path" before passing the path to VIO. because csync_update has no idea that the VIO plugin need special encoding, the encoding cannot be done there. But csync_owncloud then encodes the full path. So if the uri contains '#', it must not be already encoded or there will be two encoding.	2014-06-03 15:45:10 +02:00
Markus Goetz	4d4eab8b1c	CSync & Propagator: Support a direct download URL ... This is for server file backends that support sending a direct URL.	2014-06-03 14:55:34 +02:00
Markus Goetz	b8e20b412c	CSync: We can access the context directly	2014-06-03 11:51:12 +02:00
Markus Goetz	5ee00a8df7	CSync: Simplify csync_owncloud stat/resource handling	2014-06-03 11:51:12 +02:00
Klaas Freitag	1af3d3f18b	More descriptive error message when querying the database without hit.	2014-06-03 09:50:09 +02:00
Klaas Freitag	f54248c0a7	Minor cleanups and changes	2014-06-03 09:50:09 +02:00
Klaas Freitag	2911c0e1c4	Add a recursiveFolderStatus method	2014-06-03 09:50:09 +02:00
Daniel Molkentin	746c15b4aa	Remove debug layout	2014-06-02 19:38:04 +02:00
Daniel Molkentin	7e65c9741e	[Shib] Ensure only one fetch job can open the browser	2014-06-02 17:41:49 +02:00
Markus Goetz	022a3fcd92	OS X: Fix localFileNameClash ... We need to compare the other way round and compare only the file name because our sync directory might be symlinked and then resolve to another canonical path (but we were only interested in the filename part anyway)	2014-05-30 15:47:53 +02:00
Olivier Goffart	0151682a53	Make sure that OwncloudPropgator::finished is only emit once ... When we abort, each job currently running may result in a call to finished(). It used to cause a crash because we would unlock the _syncMutex twice Fixes #1793	2014-05-29 12:15:13 +02:00
Olivier Goffart	864f2cdc7d	remove the _syncMutex and replace it by a simple bool	2014-05-29 11:35:13 +02:00
Eran	cd82a8585a	change the text to be a little more descriptive and use shorthand in the context menu	2014-05-29 00:09:02 +03:00
Daniel Molkentin	0c1ab533e6	Do not trim serial numbers ... This broke in a refactoring. The 'true' was interpreted as length of 1. Fixes part of #1436	2014-05-28 21:16:00 +02:00
Olivier Goffart	1dd7f736d0	Fix another crash at exit ... Fixes #1794	2014-05-28 19:59:35 +02:00
Olivier Goffart	571c199db8	remove broken connection ... Fixes #1822	2014-05-28 18:11:39 +02:00
Daniel Molkentin	3d2a2df86f	Allow to set a smaller timeout value in the config file ... Added to debug #1724	2014-05-28 16:28:22 +02:00
Daniel Molkentin	86a48b52e9	Shib: Show a notification whenever the shib session times out ... This is designed as a passive popup notification so that it will not surprise or annoy the users. Fixes Enterprise issue #179	2014-05-28 15:25:43 +02:00
Olivier Goffart	ebe1f986f1	Only remove session cookies ... This should disconnect without loosing long lived cookie	2014-05-28 15:24:14 +02:00
Eran	6927fc80c3	change the mapping to use short hand and also made the mapping logic a little losser	2014-05-28 13:09:30 +03:00
Olivier Goffart	dd1152dd4f	Clear all cookies when loging out	2014-05-28 11:41:06 +02:00
Olivier Goffart	ce9bfd319a	Fix the sib window re-appearing. ... When the windows is accepted, do not emit fetched which means the process is finished one must first check the username is valid	2014-05-28 10:18:57 +02:00
Daniel Molkentin	f591ac6549	CookieJar: Reduce debug noise	2014-05-28 10:05:32 +02:00
Daniel Molkentin	4fd368c992	ShibCredentials: Ensure that _stillValid is not reset while the browser window is open ... This will cause the browser window to open again after it has been told to close if a network job has run in the background while the browser window was visible. Fixes #1814	2014-05-28 10:05:32 +02:00
Eran	89a95d6445	fixed comment spelling	2014-05-28 08:28:03 +03:00
Klaas Freitag	e275ad3866	Emit the sync finished signal a bit delayed. ... This allows folder watcher events comnig in before the sync is marked finished. This avoids "endless syncing" as described in bug #1808	2014-05-27 11:35:07 +02:00
Olivier Goffart	5813f63df8	Do not runs the check connection timer when there is no configured account ... in order to avoid popup of the wizzard every 32 seconds Fixes #1812	2014-05-27 11:05:09 +02:00
Klaas Freitag	449c00f019	No need to check for case preserving filesystem here. ... That is done in the utility function instead.	2014-05-26 18:28:52 +02:00
Klaas Freitag	6017eb7ca6	Case clash check for local remove plus native separators.	2014-05-26 18:28:25 +02:00
Klaas Freitag	f1b2417967	Add check for case clash for legacy propagator download.	2014-05-26 18:28:25 +02:00
Klaas Freitag	181383e5f1	Check for case preserving file system in localCaseClash	2014-05-26 18:28:25 +02:00
Markus Goetz	c1b9d5c653	Propagator: Implement localFileNameClash for OS X	2014-05-26 17:36:52 +02:00
Klaas Freitag	964c3ac7bf	Check for local file name clash before local renaming. ... Return a proper error message in case.	2014-05-26 17:00:40 +02:00
Daniel Molkentin	6d8afabf41	Find export macro	2014-05-26 16:33:04 +02:00
Daniel Molkentin	0a7dbeb778	Export CookieJar	2014-05-26 16:29:26 +02:00
Daniel Molkentin	0582abe8dd	Shib: Wizard: Return to IdP selection when returning to creds page	2014-05-26 15:57:01 +02:00
Eran	f9192e27fa	added "/s" to the bandwidth	2014-05-26 16:25:33 +03:00
Olivier Goffart	81f410970f	ammend previous change	2014-05-26 15:01:26 +02:00
Olivier Goffart	e75c5236f2	Properly report errors when renaming a file ... That is especially usefull when renaming to an existing file with a different case	2014-05-26 14:51:53 +02:00
Olivier Goffart	8a671c40d1	Make FolderMan a member of the application ... The goal here is that it is going to be destroyed with the application It need to be destoyed so the folder are destroyed, which is required for properly finishing the sync while exiting. It must not be destroyed after the application because the QSQLite plugin may be already destroyed in that case. Since the constructor of FolderMan is called earlier, we can't call the config file too early fixes 1793	2014-05-26 14:37:15 +02:00
Olivier Goffart	50ce0f9681	Fix crash at exit when there is a log after the Logger has been destroyed ... Use a proper static Logger instead of allocating one, and cleanup the QTMessageLogger when it is destroyed	2014-05-26 14:37:14 +02:00
Daniel Molkentin	a60902b33d	Make sure the settings window is brought up when minimized ... Fixes #1804	2014-05-26 14:32:08 +02:00
Olivier Goffart	5220786cf2	do not blacklist fatal error	2014-05-26 12:27:16 +02:00
Olivier Goffart	99cead68f5	Fix crash when aborting ... When aborting, the slotFinished will destroy all the Jobs, but they need one more even loop to finish cleanups Fixes #1793	2014-05-26 12:23:25 +02:00
Olivier Goffart	7a209ba376	leak fix	2014-05-26 12:07:00 +02:00
Olivier Goffart	f9263da3de	Fix crash when the account config is gone and there are still folder ... In rare case (due to a bug in QSettings) the account config may disapear We should not crash in that case	2014-05-26 11:08:32 +02:00
Daniel Molkentin	3f724e1c6a	Fix Pref window for good ... This was forgotten in 18677dbc3f	2014-05-26 09:37:43 +02:00
Eran	ba5e955ccb	chaned the design a little	2014-05-25 22:43:41 +03:00
Volkan Gezer	9abffdb1a6	fix typo	2014-05-24 15:04:42 +02:00
Volkan Gezer	5b0307446a	fix spacing	2014-05-24 15:03:45 +02:00
Klaas Freitag	1b2875c20a	Use the moved implementation of the name clash detection method.	2014-05-23 18:58:21 +02:00
Klaas Freitag	bbdf7bf955	Check for case clash on downloads.	2014-05-23 18:58:21 +02:00
Klaas Freitag	57359968ed	Added method localFileNameClash ... Also reordered the implementations a bit.	2014-05-23 18:58:08 +02:00
Klaas Freitag	ea9f302b7a	Read the blacklist entries case insensitive in case the file ... system is only case preserving.	2014-05-23 16:13:35 +02:00
Klaas Freitag	ef0a3c212e	Add a utility function fsCasePreserving. ... Returns true if the underlying file system is case preserving instead of case sensitive. That is true for Mac and Windows currently. Only Linux has a case sensitive file system usually.	2014-05-23 16:13:35 +02:00
Daniel Molkentin	18677dbc3f	Fix on-top/below-others window problem ... - Don't give the settings window an always-on-top hint, or else sub dialogs will pop-under. Also, people seem to (ab-)use it as a status monitor... well - raiseWidget() can only really do one thing: remove the dialog status from dialogs without a parent due to a bug in Qt. The previous implementation never really worked. Tested on Mac and Gnome 3 so far. Fixes #1795 Fixes parts of #1775	2014-05-23 16:00:50 +02:00
Klaas Freitag	7e8b403116	More progress on the CI problem detection.	2014-05-22 17:12:59 +02:00
Klaas Freitag	1303379c9e	Remove useless global varialbe for auth callback.	2014-05-22 12:54:14 +02:00
Daniel Molkentin	b995cd318c	Fix/cleanup PropagateLocalMkDir::start()	2014-05-22 10:16:33 +02:00
Daniel Molkentin	ed19107161	Remove useless check. QFile::exists() is CI on CI filesystems ... Tested on OS X and Windows	2014-05-22 10:06:10 +02:00
Daniel Molkentin	5b298abba1	Revert "Set an "active" role for the menubar icon on Mac" ... Apart from a small mistake in this commit, there seems to be something else wrong. This reverts commit 97362cff32.	2014-05-21 13:00:20 +02:00
Daniel Molkentin	4edbeece49	Fix connection following the update of the QtSingleApplication classes	2014-05-21 12:31:44 +02:00
Daniel Molkentin	97362cff32	Set an "active" role for the menubar icon on Mac ... Fixes #1730	2014-05-21 11:19:38 +02:00
Daniel Molkentin	3db3c7b876	Update QtSingleApplication and QtLockedFile ... Fixes stale temp file issues, and is needed for blocking support.	2014-05-21 11:19:38 +02:00
Klaas Freitag	d0b9b002e4	Show the sync icon in case the status is not yet defined. ... This fixes the problem that on the first sync, no proper status icon is shown on a potential long update phase.	2014-05-21 11:09:01 +02:00
Eran	fae3e46a59	made the code a little cleaner	2014-05-20 16:56:39 +03:00
Olivier Goffart	bdba56f60b	Always wait on the thread before emiting finished ... This ensure that there would be no way to have two thread running Refactor all the location where finished is called in a single function	2014-05-20 12:32:06 +02:00
Daniel Molkentin	7ade4bb6e6	AccountSettings: Handle button states more correctly ... Fixes #1779	2014-05-19 15:46:23 +02:00
Daniel Molkentin	86117aed0d	autostart unix impl: use mkpath instead of mkdir ... Fixes TestUtility::testLaunchOnStartup(), if .config/ does not exist.	2014-05-19 12:42:04 +02:00
Klaas Freitag	43fe7b0d55	Detect directory case sensitivity clash on windows	2014-05-16 15:24:01 +02:00
Olivier Goffart	e1f8eb5aa5	Another way to force a sync when choosing 'Keep files'	2014-05-15 19:36:01 +02:00
Olivier Goffart	f40a054cb7	Revert "Re-sync immediatly after "Keep files" when all files were removed" ... This causes infinite sync loops This reverts commit 8b469d3992.	2014-05-15 19:29:40 +02:00
Eran	3777074e84	Remove extra space between the parenthesis when displaying estimation in the system tray	2014-05-15 17:46:25 +03:00
Daniel Molkentin	81c768099e	Folder: Correctly reflect paused state after restart	2014-05-15 15:04:48 +02:00
Daniel Molkentin	4bcaebb322	Decrease debug noise	2014-05-15 15:04:48 +02:00
Olivier Goffart	8b469d3992	Re-sync immediatly after "Keep files" when all files were removed ... Fixes #1710	2014-05-15 11:48:01 +02:00
Olivier Goffart	bb929db7e6	fix warning	2014-05-15 11:29:23 +02:00
Olivier Goffart	90ee274744	We need to call csync_commit in every error cases ... Else there will still be outdated tree in the memory and the further sync will be confused Relates to #1710	2014-05-15 11:18:06 +02:00
Daniel Molkentin	9f6e9f8e1b	Fix crash: if the credentials cannot be cast, don't deref, assume change	2014-05-15 11:12:18 +02:00
Klaas Freitag	f89bfce068	Enable core dumping if the env variable OWNCLOUD_CORE_DUMP is defined ... Set OWNCLOUD_CORE_DUMP to anything to get a core dump in case of crashing.	2014-05-15 11:01:21 +02:00
Klaas Freitag	ef44a59bed	Better debugability.	2014-05-15 09:45:50 +02:00
Klaas Freitag	d96139f698	Commented verbose logging.	2014-05-15 09:45:50 +02:00
Daniel Molkentin	de970eb0a5	Fix wizard flow with shibboleth	2014-05-15 09:43:26 +02:00
Eran	5310a3cc1d	better time prediction	2014-05-14 16:57:14 +03:00
Daniel Molkentin	17a2e224c4	Fix memleak	2014-05-14 12:53:12 +02:00
Daniel Molkentin	5ed4710d64	Merge pull request #1726 from owncloud/debian_bsd ... Make Debian GNU/kFreeBSD compile	2014-05-14 12:20:17 +02:00
Klaas Freitag	5493c22584	Do not dispatch invalid progress information to avoid "unknown" messages	2014-05-14 11:52:22 +02:00
Klaas Freitag	64f4d1b387	Removed block parameter from terminateSync. ... Do not pretend to immediately terminate the sync but let csync finish planfully and free the mutex.	2014-05-14 11:52:22 +02:00
Daniel Molkentin	cdd8c8165b	Add missing header to fix Qt5 compilation	2014-05-14 11:22:56 +02:00
Daniel Molkentin	ba959f7cf9	CookieJar refactoring required to overcome issues in Shibboleth support ... The shibboleth implementation no longer maintains its own QNAM. Instead, MirallAccessManager now holds a custom QNAM implementation which saves cookies to a file on disk. This patch also reduces some complexity wrt the browser window, which used to be deleted via a roundtrip to its callee, which is not longer required. Fixes #1764 and Enterprise bug #165 Going forward, AbstractCredentials::getQNAM() could maybe removed entirely.	2014-05-14 11:11:45 +02:00
Eran	1509c4ffba	made the time description more malleable ,added support for none size update estimation (ie.. deletion), made the estimation more responsive at start and less jittery after some time	2014-05-14 10:55:04 +03:00
hefee	07f57b1982	make Debian GNU/kFreeBSD compile	2014-05-13 16:51:42 +02:00
Olivier Goffart	574e030caf	Use a different key than "user" to store the shib user ... There is a HACK from commit fa0a2764a4 Which save the http user as a user for all credidentials, but that cannot work with shibboleth Fixes https://github.com/owncloud/enterprise/issues/175	2014-05-13 11:54:36 +02:00
Eran	71ea2b582c	changed the systray to display total size and estimated time when the syncronization actually has size changed the descriptive time logic to be more generic	2014-05-12 17:36:27 +03:00
Eran	219098c182	Changed the time estimate string to be more textual, also added lower limit to the estimate to prevents starting estimation jittering	2014-05-12 00:26:17 +03:00
Olivier Goffart	091e9bbd52	Fix crash when _engine is not available ... Fixes #1671 and #1675	2014-05-07 16:17:08 +02:00
Olivier Goffart	ce09e11011	Revert "Do not dereference the _engine member variable without check." ... bubbleUpSyncResult is only called from slotSyncFinished, so if _engine is invalid there, it is also invalid in slotSyncFinished This reverts commit aee7515d42.	2014-05-07 16:13:43 +02:00
Olivier Goffart	f034bcb9ae	only increment the progressbar for files when the file has been fully transfered	2014-05-07 12:35:02 +02:00
Klaas Freitag	a50c39cd0c	Maintain the original inode value for renamed files. ... In case two renames are done on the same file/folder very quickly we lost the information that the second operation was also a rename. That was because we tried to get the inode value from a stat on the file once the first rename was finished. But at that point, the file was already gone because of the second rename. Now the original inode is kept and written to db in case the file can not be stat'ed. This fixes bug #1737	2014-05-06 12:55:54 +02:00
Klaas Freitag	370dd99e47	Super useful source comment.	2014-05-06 09:30:50 +02:00
Olivier Goffart	1631cfdaf1	Fix not blacklisting error 5xx	2014-05-02 17:26:28 +02:00
Olivier Goffart	2e76fe87c2	Fix reporting the right error in a GET ... We always reported the lack of e-tag instead of the real error	2014-05-02 17:26:28 +02:00
Markus Goetz	6c44f53645	Set network timeout to 300 sec ... As per previously used values (see source and changelog)	2014-05-02 15:35:40 +02:00
Olivier Goffart	988c162d2f	Have only one place where we read the timeout	2014-05-02 13:04:53 +02:00
Olivier Goffart	88cb047197	Add a timeout when using the QNAM propagation	2014-04-30 18:17:49 +02:00
Klaas Freitag	7f7154ed40	Auto generate the Export header. ... This should fix oem builds.	2014-04-30 13:55:40 +02:00
Klaas Freitag	a8c1ffc2f4	Add a header file for owncloudcmd.cpp to avoid (auto)moc problems.	2014-04-30 13:55:40 +02:00
Klaas Freitag	df8b5b1ea6	Removed unused Q_OBJECT	2014-04-30 13:55:40 +02:00
Olivier Goffart	ce50cdecf1	Add one byte per files in the computation of the progress bar ... So it feels like the progress bar is moving when operating of file that are empty or when deleting or renaming files	2014-04-30 13:20:20 +02:00
Olivier Goffart	77c7439329	Don't include the directory size in the overall progress ... We don't include them in the total amout of files so it should not be included in the progress either. Also, for some reasons directories seems to be 16kB on windows	2014-04-30 12:57:30 +02:00
Markus Goetz	925c6485e6	Propagator: Dont show silly string for non-error	2014-04-30 11:36:57 +02:00
Olivier Goffart	d62deabf9b	Fix updating mtime ... Fixup commit 9193286fc1 Use the right URL for the PROPPATCH and HEAD, do not let other jobs start when we wait for the UpdateMTimeAndETagJob Update the etag and the fileid of the real item.	2014-04-30 10:24:17 +02:00
Markus Goetz	876de8fd69	Networkjobs: Remove stray include	2014-04-29 17:55:26 +02:00
Olivier Goffart	983f9c5dde	The job restore job need to be run with QMetaObject::invoke ... Because the job might be in a different thread.	2014-04-29 16:58:24 +02:00
Olivier Goffart	9193286fc1	Support old server which do not have the x-oc-mtime support ... Owncloud 4.5 Or owncloud 5 with chunking Fixes https://github.com/owncloud/core/issues/8392	2014-04-29 16:58:24 +02:00
Olivier Goffart	1b8d11182b	Add missing include ... This was required so the compiler sees the declaration of CredentialsFactory::create which should be exported	2014-04-29 16:04:24 +02:00
Olivier Goffart	dcc5c105eb	fix forward declaration of CredentialsFactory::create	2014-04-29 15:50:19 +02:00
Klaas Freitag	64b42333b0	Fix typo.	2014-04-29 15:36:13 +02:00
Olivier Goffart	3ee729bc4a	Add export macro to all classes that need to be exported	2014-04-29 15:31:14 +02:00
Daniel Molkentin	a268b03990	Try to not have windows stay-on-top	2014-04-29 15:31:03 +02:00
Olivier Goffart	9f0848ba15	Merge remote-tracking branch 'origin/libowncloudsync_noqtgui'	2014-04-29 12:23:15 +02:00
Olivier Goffart	f159b028b4	Add a compile option to not blacklist error code 5xx	2014-04-29 11:39:46 +02:00
Olivier Goffart	7e702778a1	Add missing line break	2014-04-29 11:27:31 +02:00
Eran	35b3ddd61f	Made the estimated time only appear in the systray when the sync has actual size.	2014-04-29 02:43:35 +03:00
Eran	a892b79dba	Seperated the systray estimation text to a seperate action, fixed an integer rounding bug	2014-04-29 02:31:27 +03:00
Eran	cd22a1846f	Fixed Indentation and multiple concurrent files syncing case ... ... ..Also increased the height of folder progress bar alittle in order to accommodate the added estimation data	2014-04-28 18:49:27 +03:00
Markus Goetz	4489a56c65	Csync: Set error at correct place	2014-04-28 17:25:18 +02:00
Markus Goetz	7f752c7e93	Csync: Plug code for csync_file_locked_or_open	2014-04-28 16:57:56 +02:00
Daniel Molkentin	2d3ea59755	Limit the mac workaround to the Mac OS X platform	2014-04-28 10:13:53 +02:00
Eran	eadcdab8e7	Issue-#142 : Added support for current file completion estimation. ... Changed the account settings estimation to display both current file and overwhole estimation. Decresed the progress font size to fit the added information	2014-04-27 00:48:12 +03:00
Olivier Goffart	9da261acd8	Do not read from the database when upgrading from 1.5 ... We need to make sure that the file id are updated (if the user had upgraded from owncloud 5 to owncloud 6 while using owncloud 1.5)	2014-04-25 13:31:44 +02:00
Eran	46ffd1c29a	Issue-142 : added time estimation and bandwidth indicator to the systry and active download	2014-04-25 01:08:25 +03:00
Olivier Goffart	642c16b09b	Missing EXPORT	2014-04-24 23:57:42 +02:00
Olivier Goffart	5c92c190f0	Add EXPORT macro to owncloudsync library ... Not all the class are exported currently, only the one that seems to be used by the command line tools	2014-04-24 23:45:20 +02:00
hefee	9b7a3d00ee	Using QFile::decodeName instead of QLatin1String	2014-04-23 18:59:40 +02:00
Sandro Knauß	1d862b77af	merged 1.5 into master	2014-04-23 18:54:49 +02:00
Olivier Goffart	f2519e9d87	Fix function signature: pass argument by const reference	2014-04-22 19:52:09 +02:00
Markus Goetz	197d180cb9	Propagator: Add support for CSYNC_CONFLICT_FILE_USERNAME	2014-04-22 16:17:49 +02:00
Markus Goetz	4be20db670	Propagator: Add makeConflictFileName function	2014-04-22 16:07:18 +02:00
Olivier Goffart	46d6191bc2	Also list folder for which the alias starts with '.' ... Fixes #1695	2014-04-22 14:26:08 +02:00
Olivier Goffart	ee22f377af	Start the folder watcher when new folder are added ... Before, we would only set up a file system watcher when we read the config at startup. But we also need to do it in the other case when the user configure new folder to watch	2014-04-22 14:15:43 +02:00
Olivier Goffart	44a04227f1	Update dynamically the error message in the account settings ... This let the error be shown when the conneciton is missing at startup And also remove the red background when there is no longer an error	2014-04-22 14:08:37 +02:00
Olivier Goffart	707c6fcc5d	An abort on the reply is not usually a password error. ... Copy the code from HTTPCredidentials	2014-04-22 12:52:13 +02:00
Olivier Goffart	edb1f61241	Fix compilation without the BUILD_ONLY_LIBRARIES mode	2014-04-22 12:44:01 +02:00
Olivier Goffart	3fac5f91c8	In case of error, report the right error instead of missing etag ... also, missing etag is not a fatal error	2014-04-22 12:43:38 +02:00
Olivier Goffart	1338c08622	Fix compilation on linux with BUILD_LIBRARIES_ONLY	2014-04-22 11:33:38 +02:00
Olivier Goffart	0cf8091705	Merge pull request #1700 from wakeup/master ... Fix non-closed p tag	2014-04-22 10:08:29 +02:00
Klaas Freitag	c24732f641	More debugable code.	2014-04-22 09:33:07 +02:00
Markus Goetz	77ac092975	WiP: Attempt to compile without UI	2014-04-21 19:57:15 +02:00
Volkan Gezer	78e5e4ab66	Fix non-closed p tag	2014-04-21 15:29:42 +02:00
Volkan Gezer	9b71643c1c	Space fix	2014-04-20 14:54:40 +02:00
Olivier Goffart	b08284e4cc	Fix the background check job for the connection ... We can't use the quota job for that as it needs the credidentials and therefore may re-enter the credidential code when we are currently trying to fetch the credentials. The quotainfo.cpp part of this patch is basically a revert of d836b80153	2014-04-19 09:49:52 +02:00
Olivier Goffart	fa38bf7029	Make sure the fileid are saved to the database when upgrading from owncloud5 to owncloud6 ... We fetch the id from the server, but don't save them in the database. I Could have used INSTRUCTION_UPDATED for that, but then i would need to update the reconcile algorithm to take in account the fact that UPDATED is possible there. Instead, use should_update_etag which means the db is going to be written again Remove reference to old instruction _UPDATED and _DELETED which does not make sens with the new propagator Improve the test to test this case, and that etags are properly writen to the DB when there is a fake conflict	2014-04-18 18:27:27 +02:00
Klaas Freitag	d143044f4a	Add missing cases to avoid "unknown action" under some circumstances. ... Most of the translations are not used because they translate pre propagation states. Fixes #1674	2014-04-15 16:54:49 +02:00
Klaas Freitag	aee7515d42	Do not dereference the _engine member variable without check. ... This can cause the crash because the _engine member is deleted in the sync finished slot. The solution is to store the stopWatch object before the engine is destroyed. Fixes bug #1675	2014-04-15 16:28:18 +02:00
Klaas Freitag	82ab5fdcb9	Fix condition if network limit change is logged or not.	2014-04-15 16:28:18 +02:00
Klaas Freitag	4c6e6f6302	Add initialisations for member variables. ... Avoids some valgrind warnings.	2014-04-15 16:28:18 +02:00
Klaas Freitag	0a2791270a	Add a reset method.	2014-04-15 16:28:18 +02:00
Klaas Freitag	c920f81562	Add braces.	2014-04-15 16:28:18 +02:00
Daniel Molkentin	d836b80153	Fix reconnect after server disconnect ... Fixes #1679 Fixes #1568 Fixes #1659	2014-04-14 17:51:57 +02:00
Daniel Molkentin	efc4ff4d88	Fix redirects in CheckServerJob	2014-04-14 15:12:38 +02:00
Daniel Molkentin	dc043b5765	Try scheme://host/owncloud if scheme://host/ did not work ... Fixes #1680	2014-04-14 15:10:08 +02:00
Daniel Molkentin	ef9a318cd9	AbstractNetworkJob Allow finished() to defer Job deletion ... This allows to reuse the Job	2014-04-14 15:08:43 +02:00
Volkan Gezer	8250fb81b3	Fix typo.	2014-04-11 15:10:47 +02:00
Klaas Freitag	30a14b9f45	Install ocsync library to private lib directory, use rpath to find it.	2014-04-11 13:28:11 +02:00
Klaas Freitag	09e05392bf	Ignore all sync log files in the sync dir.	2014-04-09 22:02:28 +02:00
Daniel Molkentin	d3d202de68	Fix dataLocation on Linux/BSD ... From the Qt 5 documentation: Note: when porting QDesktopServices::DataLocation(obsolete) to QStandardPaths::DataLocation, a different path will be returned. QDesktopServices::DataLocation was GenericDataLocation + "/data/organization/application", while QStandardPaths::DataLocation is GenericDataLocation + "/organization/application". We'll resort to the deprecated version, since we'll need to fix data locations to be XDG compliant sooner than later anyway (currently scheduled for 1.8)	2014-04-09 14:59:08 +02:00
Daniel Molkentin	87010fbe1a	SSL Button: Fix issues around printing Hash sums ... - Use SHA 265 instead of obsolete MD5 where possible (Qt5) - Remove <tt> formatting: that simply looked ugly - Wrap SHA 265 hash - Use spaces as separators As usual, the default needs to remain ':' separation, because it's needed to pass valid hashes to csync.	2014-04-09 14:30:51 +02:00
Klaas Freitag	7c40dc1a9a	Ignore changes on .owncloudsync.log in the linux filewatcher. ... Also remove some verbose and unused logging.	2014-04-08 13:06:34 +02:00
Daniel Molkentin	b34b4e37aa	Add Qt Keychain also when building with Qt5	2014-04-08 10:56:07 +02:00
Daniel Molkentin	69bdccfd2f	Include correct QtKeychain headers ... ..depending on Qt version	2014-04-07 17:46:06 +02:00
Daniel Molkentin	1d70426bb7	Build with BOTH Qt4 and 5	2014-04-07 17:25:25 +02:00
Daniel Molkentin	6a2fe6be67	Build fix: QAtomicInt has no implicit integer conversion in Qt5	2014-04-07 16:49:01 +02:00
Klaas Freitag	3d67d203fe	Fix content-length calculation for sizes multiple of the chunk size.	2014-04-07 16:29:06 +02:00
Klaas Freitag	fc06945b26	use the lowercase app name for icon in the desktop file. ... fixes #1642	2014-04-07 15:14:58 +02:00
Klaas Freitag	9cdcc925c1	Do not log useless stuff.	2014-04-07 15:10:55 +02:00
Markus Goetz	d35c0f3ade	Propagator: Fix chunking for real ... The reset() (using seek()) didn't work.	2014-04-05 14:26:24 +02:00
Markus Goetz	0f7d448058	Propagator: Fix chunking	2014-04-04 15:41:35 +02:00
Klaas Freitag	435e7e3eec	HACK to avoid continuation: See task #1448 ... We do not know the _modtime from the server, at this point, so just set the current one. (rather than the one locally)	2014-04-04 10:56:33 +02:00
Klaas Freitag	08dd9796d1	HACK to avoid continuation: See task #1448 ... We do not know the _modtime from the server, at this point, so just set the current one. (rather than the one locally)	2014-04-04 10:50:40 +02:00
Olivier Goffart	462ba7d942	Don't dead lock when all the files are removed ... SyncEngine is on the main thread, no need of the legacy BlockingConnection	2014-04-03 17:47:49 +02:00
Klaas Freitag	cf87fdff7f	Keep the updater data in the log struct for the synclog. ... Also, shorten the timestamp and add the sync direction.	2014-04-03 16:56:50 +02:00
Markus Goetz	565bb540d6	Propagator: Add debug message regarding legacy vs QNAM	2014-04-03 16:37:40 +02:00
Olivier Goffart	eaf5681f61	Put the sync log in the actual folder	2014-04-02 16:36:32 +02:00
Olivier Goffart	03ef2aadde	Remove undeeded includes ... And don't use 'using namespace' in headers	2014-04-02 16:23:57 +02:00
Olivier Goffart	f09076180d	don't add the list of field on the log for every sync	2014-04-02 16:21:07 +02:00
Olivier Goffart	d5d3c1a23a	Fix compilation with Qt5 ... We don't need QtWidgets, and we don't need Uility::escape	2014-04-02 16:21:06 +02:00
Markus Goetz	b18f1ad386	SyncEngine: Removed unused signal	2014-04-02 12:47:15 +02:00
Klaas Freitag	8625ec250b	Add a trust ssl certificate switch	2014-04-01 16:14:24 +02:00
Klaas Freitag	d731f4718d	Add an simple SSL error handler for owncloudcmd.	2014-04-01 16:14:24 +02:00
Olivier Goffart	607e48a68b	let configure the default count of the blacklist	2014-04-01 13:54:47 +02:00
Olivier Goffart	bfe6a50b19	Fix some error cases in the SyncEngine ... Always cleanup properly when we bail out. Also fix thread safety of the SyncJournalDB	2014-04-01 13:41:47 +02:00
Olivier Goffart	3acdfc0004	Make configurable the maximum amount of job in parallel ... Bia the environement variable OWNCLOUD_MAX_PARALLEL	2014-03-28 11:20:07 +01:00
Olivier Goffart	a1fc7f0a25	Make the chunk size configurable via an environement variable ... OWNCLOUD_CHUNK_SIZE	2014-03-28 11:11:02 +01:00
Olivier Goffart	8de9bec122	Remove progress info from csync ... csync doesn't do no propagation no more	2014-03-28 10:50:15 +01:00
Olivier Goffart	765a18b74a	Fix compilation with Qt4	2014-03-28 10:26:42 +01:00
Olivier Goffart	350283fe06	Remove obsolete code that removed the sync journal when the sync directory is deleted ... Since the journal is now in the same directory, we don't need this security anymore When the directory is removed, the sync will error out saying that the journal cannot be loaded or created	2014-03-28 10:23:09 +01:00
Olivier Goffart	2ba62b79b4	Make the size of the log maximum 1MiB	2014-03-28 10:13:35 +01:00
Olivier Goffart	e0b6395d18	Use sane datastructure in Utility::StopWatch ... We don't want to logging to be O(N^2) Also avoid usage of macro when possible	2014-03-28 09:50:13 +01:00
Olivier Goffart	ba896b0550	Avoid copies of the StopWatch	2014-03-28 09:39:50 +01:00
Olivier Goffart	36a2c861c2	Only build the static library when BUILD_LIBRARIES_ONLY is defined	2014-03-28 09:34:21 +01:00
Olivier Goffart	7f975e0b2f	Avoid macro when it can easily be done with a local variable	2014-03-28 09:27:05 +01:00
Olivier Goffart	69fcbd3b0d	Fix Qt4 compilation ... And a typo	2014-03-27 18:19:56 +01:00
Olivier Goffart	d6525a979d	Do not let user change it's login while using shibbolet ... Fixes #915	2014-03-27 17:59:50 +01:00
Markus Goetz	54313338cd	SyncEngine: new aboutToPropagate signal	2014-03-27 17:04:31 +01:00
Markus Goetz	09e6207ce9	SyncEngine: Fix typo	2014-03-27 15:19:02 +01:00
Denis Dzyubenko	000e0bb600	Fast forwarded qtmacgoodies	2014-03-27 10:39:56 +01:00
Olivier Goffart	de2335c1db	Show the folders when in the accountsettings in the first start	2014-03-26 19:31:37 +01:00
Olivier Goffart	332c6cf726	Fix invalid signal connection	2014-03-26 19:31:37 +01:00
Klaas Freitag	086dd07d69	Log the processed items to a logfile.	2014-03-26 18:16:27 +01:00
Klaas Freitag	dd6b71bad6	Use a stopwatch to meassure the time consumed.	2014-03-26 18:16:27 +01:00
Klaas Freitag	9af2339596	Store the request duration and timestamp to final item	2014-03-26 18:16:27 +01:00
Klaas Freitag	0fcef5f604	Add data to store interesting info from the sync run (other tree)	2014-03-26 18:16:27 +01:00
Klaas Freitag	c41935d49d	Add a class to write a machine readable sync log file.	2014-03-26 18:16:27 +01:00
Klaas Freitag	7b84defd56	Add a stopwatch utility class with lap times. ... Allows to meassure the duration of something that started at a point of time, with some small convenience methods.	2014-03-26 18:16:27 +01:00
Klaas Freitag	505429b582	Add a duration and the repsonse timestamp to the jobs.	2014-03-26 18:16:27 +01:00
Klaas Freitag	11bbad79e2	Use QTimer as object member rather than pointer based. ... Avoid crashes if timer is zero.	2014-03-26 18:16:27 +01:00
Klaas Freitag	6e6f647c63	Change data type for fileId to QByteArray.	2014-03-26 18:12:22 +01:00
Olivier Goffart	2ad7b0aae0	Fix crash on first run when no account are configured	2014-03-26 17:42:05 +01:00
Olivier Goffart	588633a0f2	Fix leak: don't leak the settings	2014-03-26 17:42:05 +01:00
Markus Goetz	d5659442b2	SyncEngine: Sanity bail out if DB does not exist suddenly ... The update/reconcile worked for me, but the Propagate step had an invalid DB path but still went on (and then messed things up)	2014-03-26 16:57:50 +01:00
Markus Goetz	c6e5f39f7f	SyncJournalDb: Verbose log on load failure	2014-03-26 16:40:00 +01:00
Olivier Goffart	38344589c4	Exxtract the exception message from reply to PUT ... Might be usefull to debug Internal Server Error Fixes #1366	2014-03-26 12:02:22 +01:00
Denis Dzyubenko	6c28151e0f	Fast forwarded qtmacgoodies submodule	2014-03-26 10:15:35 +01:00
Daniel Molkentin	1c4af687ea	Compile on Mac again	2014-03-26 07:20:24 +01:00
Daniel Molkentin	c3d37efa6c	Fix OS X compilation	2014-03-25 23:33:46 +01:00
Daniel Molkentin	3ac1849963	Don't moc twice	2014-03-25 20:55:04 +01:00
Olivier Goffart	b4f992b944	Merge pull request #1446 from owncloud/remove-tooltip ... remove superfluous tooltip from server address input field	2014-03-25 20:16:26 +01:00
Daniel Molkentin	45ec489f71	Merge branch 'master' of github.com:shadone/mirall into shadone-master ... Conflicts: cmake/modules/QtVersionAbstraction.cmake src/CMakeLists.txt src/mirall/owncloudgui.cpp	2014-03-25 19:56:45 +01:00
Daniel Molkentin	e2fe4972d9	Don't show ocsync version, it's part of mirall now	2014-03-25 19:04:05 +01:00
Mathieu Arnold	84b4872938	And make it runnable on FreeBSD too. ... Patch by: Tobias Berner	2014-03-25 17:23:11 +01:00
Mathieu Arnold	3f9bd1d72a	Fix build on FreeBSD. ... We use libinotify, so the linux folderwatcher works. Based on a patch by: Tobias Berner	2014-03-25 17:22:54 +01:00
Markus Goetz	91f416ffc7	Fix compile after changing Account::davPath()	2014-03-22 09:41:32 +01:00
Sandro Knauß	47274f1075	Merge remote-tracking branch 'respect-XDG_CONFIG_HOME' into 1.5	2014-03-21 17:20:15 +01:00
Markus Goetz	ff95cbd04b	Account: Don't hardcode WebDAV path	2014-03-21 17:14:04 +01:00
Markus Goetz	cc5fabdab0	Engine: Introduce jobCompleted() signal	2014-03-21 17:13:02 +01:00
Markus Goetz	ff95e233bc	Token Credentials: Support actual tokens	2014-03-21 17:12:26 +01:00
Markus Goetz	f72e1cc837	Log: Don't override level for csync ... The level shall be set from Folder or owncloudCmd only.	2014-03-21 13:52:35 +01:00
Olivier Goffart	8e6674e784	Merge branch '1.5' ... Conflicts: src/owncloudcmd/owncloudcmd.cpp	2014-03-21 10:06:45 +01:00
Olivier Goffart	8aace3284f	owncloudcmd: Fix an error during update phase would not terminate ... the QApplication::quit() would be run before the exec() and would be a noop, and then exec would just wait forever.	2014-03-21 10:03:11 +01:00
Olivier Goffart	bb9d6b34c7	Remove FIXME and TODO ... They are outdated	2014-03-20 16:42:43 +01:00
Olivier Goffart	07025c7432	Remove a FIXME ... The commit message say that this line should be necessary to show the information when the setting dialog is open, but this is working now via the signals	2014-03-20 16:42:43 +01:00
Olivier Goffart	b65601aaa4	Remove FIXME ... This has been refactored since the comment was added and is no longer a hack	2014-03-20 16:42:43 +01:00
Olivier Goffart	756e1c4a12	Prefer the use of _isDirectory over item._type == SyncFileItem::Directory	2014-03-20 16:42:42 +01:00
Olivier Goffart	c5f8a2555d	Rename _dir to _direction ... (to avoid confusion with directory)	2014-03-20 16:42:42 +01:00
Olivier Goffart	a1ab9c84c7	Remove FIXME in syncengine	2014-03-20 16:42:42 +01:00
Olivier Goffart	23f3a6b319	restore the last change menu ... It was not yet implemented after the progress refactoring	2014-03-20 14:43:10 +01:00
Olivier Goffart	ebeb668a62	QNAM jobs: Make sure there is an etag is proper and not changed when one resume ... Those tests are existing on the legacy jobs. We check there is an etag so we make sure a proxy is not in between. (We have seen user complaining because their proxy is replacing the pages with one that says they need to enter their login and password) Also it is important to check that the etag has not changed if we resume (this may happen if the file is changed on the server between the update phase and the propagate phase, and that we resume this file)	2014-03-20 13:31:42 +01:00
Klaas Freitag	ca536f467a	Proper initialization to avoid build warnings.	2014-03-20 12:35:16 +01:00
Olivier Goffart	05d3273591	Detect the error that may happen when downloading a file	2014-03-20 11:35:30 +01:00
Daniel Molkentin	eef57032f8	OCUpdater: Compare to the current version ... Fixes #1548	2014-03-18 00:28:26 +01:00
Olivier Goffart	6377dca4b0	Add the file and line number of the debug in the debug view	2014-03-17 12:15:45 +01:00
Olivier Goffart	f05320c32c	Clean the debug a bit	2014-03-17 12:15:16 +01:00
Olivier Goffart	b0f8a24c20	CSyncThread was renamed, give proper names in Folder ... take in account that the object live in the same thread	2014-03-17 11:47:23 +01:00
Olivier Goffart	c841b9c0c4	Remove unused libsync_HEADERS ... This was unused and is redudent with owncloudsync_HEADERS	2014-03-17 11:36:53 +01:00
Olivier Goffart	7b482c0e96	Rename CSyncThread to SyncEngine ... CSyncThread has not been a thread for a long time now	2014-03-17 11:34:51 +01:00
Olivier Goffart	bf5091d862	Merge branch '1.5'	2014-03-17 11:26:28 +01:00
Olivier Goffart	5c45ede4a5	Read the quota as double ... The server is sending floating point number when the amount of storage is set to a custom number (say 1.2GB) This should fix #1374	2014-03-17 10:37:06 +01:00
Olivier Goffart	cabcdd890e	Only run the CheckQuota job if the account is connected ... We use another job to check the connection. And this may cause wrong password failure as we are still in the wizzard Fixes #1567	2014-03-17 10:35:43 +01:00
Olivier Goffart	0a5e691ba3	Remove debug output that might cause a crash ... The account may not be finilized when this is called while the wizzard is still running on first connection	2014-03-17 10:22:14 +01:00
Olivier Goffart	ba300c2fc1	Fix memory leak: Don't use raw pointers	2014-03-17 10:04:42 +01:00
Olivier Goffart	62e95e540b	Remove Progress::Kind ... It's not really used, one need to look at the instruction of the items being processed to see what happens	2014-03-14 18:43:23 +01:00
Olivier Goffart	d744b5e481	Fix the file count in the progress ... And clear the ignored files between syncs	2014-03-14 18:29:23 +01:00
Olivier Goffart	f9b82d852c	Do not destroy the settings dialog when it is hidden. ... That way the protocol widget stay filled. And the state is kept	2014-03-14 17:39:20 +01:00
Olivier Goffart	33289bde29	Merge remote-tracking branch 'origin/1.5' ... Conflicts: CMakeLists.txt VERSION.cmake src/CMakeLists.txt	2014-03-14 17:27:50 +01:00
Olivier Goffart	9053662fe8	remove Progress::SyncProblem and the problem slots ... They are merged into normal progress	2014-03-14 17:18:26 +01:00
Markus Goetz	07904e078a	CSyncThread: Emit a signal for each file before propagate ... This can be used to display info before the sync is happening	2014-03-14 14:08:32 +01:00
Olivier Goffart	aacc278583	Refactor the progress ... Consider that there might be several files processed at the same time	2014-03-14 13:32:32 +01:00
Daniel Molkentin	87f3755b1f	Deploy with Qt5	2014-03-13 00:52:01 +01:00
Markus Goetz	a2467b5dea	CMake: Do options one directory above ... This fixes linking when keychain was not desired.	2014-03-12 14:20:38 +01:00
Denis Dzyubenko	aee4c06b8d	Renamed a member variable to have underscore prefix for consistency	2014-03-11 20:34:00 +01:00
Denis Dzyubenko	89a4833cae	Fixed a memory leak in FSEvents folderwatcher backend	2014-03-11 20:34:00 +01:00
Denis Dzyubenko	255d255217	Fixed ignored paths matching on OS X. ... We now listen to changes to files and when an event is received we first match the file name to the "ignored paths list" and only if the the file that was changed didn't match figure out which directory needs to be synced.	2014-03-11 20:34:00 +01:00
Denis Dzyubenko	902de2dc93	Fixed a memory leak in FSEvents file system watcher	2014-03-11 20:34:00 +01:00
Denis Dzyubenko	f7c075099b	Removed bogus commented out line	2014-03-11 20:34:00 +01:00
Markus Goetz	0bbcee7354	CMake: Fix else	2014-03-11 17:56:29 +01:00
Markus Goetz	8a18cf811e	CMake: Fix warning	2014-03-11 17:33:45 +01:00
Markus Goetz	4e7e25c569	Improve libowncloudsync ... * Introduce TokenCredentials * Introduce static compiling * Have compile flags for smaller compile	2014-03-11 17:05:44 +01:00
Klaas Freitag	bc41e6bc99	Allow proper translation for sync activity through GuiLog. ... This fixes bug #1550	2014-03-11 10:55:20 +01:00
Klaas Freitag	c8a8eb35fa	Disable the folder if it is going to be removed.	2014-03-10 12:22:06 +01:00
Klaas Freitag	8bf2c54b56	Install include dirs app name aware.	2014-03-07 13:05:17 +01:00
Olivier Goffart	7cab77e879	Call the start method assyncroniously ... That was my intention, which is why i did not do a direct call to start. This should fix issue #1536	2014-03-06 21:01:08 +01:00
Olivier Goffart	feb49b2768	Saner defaults	2014-03-06 20:34:11 +01:00
Olivier Goffart	4e25595520	Better error classification	2014-03-06 20:33:17 +01:00
Olivier Goffart	4aaa256b11	Do not beleive that the credidential are wrong when the job is cancelled ... Otherwise, aborting the sync will make the client beleive the credidentials are wrong.	2014-03-06 20:31:48 +01:00
Markus Goetz	630f61142a	Proxy: Try to fix issue ... See eb7074e9f0 for discussion	2014-03-06 17:48:18 +01:00
Olivier Goffart	ac393c6374	Do not sent more chunk and cancel the upload when the file change while uploading chunks	2014-03-06 16:04:32 +01:00
Olivier Goffart	5e012366ab	Keep string translatable ... (In french, one may want to add a space before the colon. Other languages may want to change the order) Also use the two argument version of arg() to avoid issues if the first string contains a '%1' sign	2014-03-06 15:01:34 +01:00
Olivier Goffart	ed1294d668	Avoid double delete	2014-03-06 14:28:58 +01:00
Olivier Goffart	ed2316a53f	Add missing line break ... (silent warning)	2014-03-06 14:10:42 +01:00
Olivier Goffart	e5a8cd4521	Merge branch '1.5' ... Conflicts: VERSION.cmake	2014-03-06 14:10:08 +01:00
Jan-Christoph Borchardt	5ce4763868	move percent indicator of space usage to correct location	2014-03-05 12:55:32 +01:00
Jan-Christoph Borchardt	bafc90cfd8	clarify which space is used, fix #1517	2014-03-05 12:54:47 +01:00
Klaas Freitag	66b152ac69	Remove left over member variables.	2014-03-03 18:12:12 +01:00
Olivier Goffart	6df00ad08c	Only removes the password from the credidentials if it has been fetched before ... Also only run the propfind job if the credidentials are readon, and fetch them otherwise	2014-03-03 17:55:15 +01:00
Olivier Goffart	76b24ff00d	Revert "Do not wipe the credentials from config for reconnect." ... This reverts commit 9eb3452a71. We need that or wrong password can never be changed	2014-03-03 17:21:20 +01:00
Olivier Goffart	60a1d50ec9	Keep the rentrency flag when asking the user for the password	2014-03-03 17:16:57 +01:00
Klaas Freitag	9eb3452a71	Do not wipe the credentials from config for reconnect. ... This should fix bug #1491	2014-03-03 16:39:38 +01:00
Klaas Freitag	228de7eede	Make the CheckServerJob ignoring credential fails.	2014-03-03 16:37:29 +01:00
Klaas Freitag	2164f5d9b7	Remove a superflous MessageBox. User is asked for Password instead.	2014-03-03 16:36:59 +01:00
Klaas Freitag	4240010046	Add method clearCookieJar which wipes QNAMs cookies.	2014-03-03 16:36:30 +01:00
Klaas Freitag	1eb0875518	Use the mirall config file for all Keychain jobs. ... Also set the job as parent to get proper deletion of the settings object.	2014-03-03 16:35:57 +01:00
Klaas Freitag	b8e52304bd	Do proper initialization of _fetchJobInProgress. ... That confused win32, since this flag was true very often.	2014-03-03 16:33:59 +01:00
Olivier Goffart	0658802048	Fix layout of the network tab ... Fixes #1491	2014-02-28 13:17:04 +01:00
Olivier Goffart	eeb68919bf	Do not erase the username and password from the config if we never connected ... If we never fetched the credidentials, the _user and _password will be empty, we should therefore not try to save them because it would just erase them. Version 1.5.2 always try to fetch the creds at startup. But now we only do it if we detect an internet connection	2014-02-28 12:51:06 +01:00
Olivier Goffart	9a60732542	Do not erase the full account config if an old version of the client stored the password	2014-02-28 12:51:06 +01:00
Daniel Molkentin	36cd9d9ced	Shibboleth: Move browser window to the offset of the setup wizard	2014-02-27 17:07:59 +01:00
Daniel Molkentin	9c70ee68d2	Mask password lineedit	2014-02-27 17:07:59 +01:00
Olivier Goffart	e809a59049	Remove spurious error message. ... Sometimes 'success' is false without apparent reason. Just remove the message	2014-02-27 17:03:42 +01:00
Olivier Goffart	96c535d712	Make the parrallel uploaded also check for problem in Shared	2014-02-27 14:13:22 +01:00
Markus Goetz	a652fec5a0	csync: Remove more unused stuff	2014-02-27 13:33:22 +01:00
Daniel Molkentin	33ae2eb19f	Try to handle auth requests by a Shibboleth IdP	2014-02-27 13:18:53 +01:00
Olivier Goffart	d4fa955950	Don't fetch credidentials from application.cpp ... They will be fetched by the connection validator after doing the status.php check	2014-02-27 13:06:29 +01:00
Olivier Goffart	869793592d	Merge branch '1.5' ... Conflicts: VERSION.cmake src/mirall/owncloudpropagator.cpp src/mirall/owncloudpropagator.h	2014-02-27 11:40:34 +01:00
Daniel Molkentin	d4dd5afbe7	Revert "Make "Sign Out" forget the cookies" ... This reverts commit 8607300195. This approach is too dangerous for 1.5.2.	2014-02-26 15:05:15 +01:00
Olivier Goffart	8607300195	Make "Sign Out" forget the cookies ... If we keep the cookies, next time we sign in, the entered password does not matter as the server still think our session is logged in.	2014-02-26 13:23:52 +01:00
Olivier Goffart	e468ea2d68	Avoid re-entrency in HTTPCredidential::fetch ... It is likely to re-enter if there is two jobs that asks for a password. Example: 1. log out 2. restart the application 3. enter a wrong password 4. enter a wrong password again a few times 5. enter the correct password 6. it should must not prompt for the password again. Because of the re-entrency, it was still prompting for the password several times after the right password had been entered	2014-02-26 13:10:11 +01:00
Daniel Molkentin	05a1f7b1bb	Another fix for the reconnect-logic	2014-02-26 11:26:50 +01:00
Markus Goetz	c7e70533a0	Shibboleth: Detect also QNAM redirects ... If a QNAM job (e.g. Quota or ETag job) gets redirected, we'll invalidate and then prompt to re-fetch the credentials from the user. (The keychain credentials will be wrong so they get deleted)	2014-02-25 14:22:55 +01:00
Markus Goetz	065690c2ce	Shibboleth: Have proper invalidation if timeout during sync	2014-02-25 09:33:28 +01:00
Markus Goetz	b56843ead2	Account: Fix Metatype registratition	2014-02-24 15:31:11 +01:00
Markus Goetz	51b5f3c9b2	Propfind Job: Print redirect URL in log	2014-02-24 15:20:49 +01:00
Daniel Molkentin	7f508c0718	Account needs qRegisterMetaType	2014-02-24 14:56:57 +01:00
Daniel Molkentin	45a7d4ff4c	Fix Wizard when returning from later steps ... We need to reset the credential type when returning to the first page from later steps. Otherwise, unfinished credential instances and their NAM will try to fetch data, which will fail with weird symptoms.	2014-02-24 14:56:57 +01:00
Daniel Molkentin	995e8938ad	SSLButton: Fix certificate display	2014-02-24 14:56:56 +01:00
Daniel Molkentin	5c1d612761	Account settings: Set correct state icon right away	2014-02-21 21:02:35 +01:00
Olivier Goffart	cd13144415	Fix adding a file in a Shared readonly directory ... It should not create a conflict in that case. Also when editing a file, create a conflict using the normal way, after downloading the file and checking it is not the same	2014-02-21 10:53:09 +01:00
Daniel Molkentin	8e7290b450	Fix online state handling ... Before this commit, parts of mirall were aware of the state, but not all. Also, the state was not set back to Connected again in all cases. This commit introduces the following changes: - Make QuotaInfo a member of Account - QuotaInfo and Folder (EtagJob) can put the client in disconnected mode - FolderMan now disables etag-polling when offline Fixes #1459 Fixes #1441	2014-02-20 23:24:03 +01:00
Daniel Molkentin	30d0e2fee8	Remove stray debug	2014-02-20 23:23:46 +01:00
dragotin	c38c3ce6e2	Merge pull request #1450 from owncloud/remove-file-string ... remove 'File' word from notification	2014-02-20 17:31:57 +01:00
Klaas Freitag	04647b0d61	Handle empty passwords returning from the keychain read procedure. ... This is needed if the keychain does not have the an QSettings based fallback any more.	2014-02-20 16:53:38 +01:00
Klaas Freitag	e991bcd112	Do not store the password in the config file. Erase it if it is there. ... This fixes bug #1458	2014-02-20 14:35:02 +01:00
Markus Goetz	6a55324261	OwncloudCmd: Struct needs to be zeroed ... Else the --silent was always true on Windows where memory did not get zeroed.	2014-02-19 17:50:15 +01:00
Klaas Freitag	82afb3b613	If a file in a read only share was edited, restore and create conflict. ... This fixes bug #1448	2014-02-19 17:21:43 +01:00
Olivier Goffart	f5e16540a1	Merge branch '1.5' ... Conflicts: src/mirall/owncloudpropagator.cpp	2014-02-19 15:38:03 +01:00
Daniel Molkentin	726b41b0c7	Shib: Close browser window after login	2014-02-19 15:34:43 +01:00
Olivier Goffart	e74f0f2854	Better support when user remove or rename the Shared directory	2014-02-19 15:23:36 +01:00
Markus Goetz	65ffe53c20	Register metatype at better place	2014-02-19 14:53:31 +01:00
Markus Goetz	06f2989ac8	Fix build on Qt4 ... Unfortunately I had to remove the 'static'	2014-02-19 13:29:00 +01:00
Olivier Goffart	a51f050a08	More fix for moving shared directories ... Abort a directory job if the first job fails Also make sure the jobs are in the directory job of their destination paths	2014-02-19 13:08:35 +01:00
Markus Goetz	399b08ad40	OwncloudCmd: Register a meta type	2014-02-19 12:00:38 +01:00
Olivier Goffart	5b561e4462	Use AUTOMOC ... This should also fix the compilation of owncloudcmd.cpp Since we have a Q_OBJECT in a .cpp file and qt_wrap_cpp would not generate the moc file.	2014-02-19 11:55:08 +01:00
Olivier Goffart	1be322579c	Merge remote-tracking branch 'origin/master' ... Conflicts: src/owncloudcmd/owncloudcmd.cpp	2014-02-19 11:19:56 +01:00
Markus Goetz	b7c7c9f3eb	Accountsettings: Fix warning	2014-02-19 10:59:57 +01:00
Markus Goetz	9237293cc0	OwncloudCmd: Fixup URL ... Allow users to specify owncloud(s) or http(s)	2014-02-19 10:57:29 +01:00
Markus Goetz	63083a558b	OwncloudCmd: Print update phase duration values	2014-02-19 10:51:04 +01:00
Olivier Goffart	d4bd327fef	Merge branch 'parallel_upload' ... Conflicts: src/mirall/csyncthread.cpp	2014-02-19 10:24:34 +01:00
Olivier Goffart	2de288c5f3	Merge remote-tracking branch 'origin/1.5' ... Conflicts: VERSION.cmake	2014-02-19 10:21:23 +01:00
Markus Goetz	fcc0e89044	Update phase: Allow benchmarking / progress update	2014-02-18 21:41:20 +01:00
Jan-Christoph Borchardt	8267b9e590	remove 'File' word from notification	2014-02-18 18:42:49 +01:00
Jan-Christoph Borchardt	5a68e5f58d	remove superfluous tooltip from server address input field	2014-02-18 17:21:25 +01:00
Klaas Freitag	e4965ab06b	Mac FS watcher: ignore events from the same process	2014-02-18 16:28:25 +01:00
Olivier Goffart	496d900fee	Refactor the renameReplace in its own function ... Share a bit more code between legacy and qnam download job	2014-02-18 14:05:52 +01:00
Olivier Goffart	58bda69f8b	PropagateRemoteRename is not a legacy job ... move it back to propagatorjobs.cpp	2014-02-18 13:52:40 +01:00
Olivier Goffart	89b5ddec56	Fix the logs in the update phase ... Since csync use a thread local variable for the logs, we need to reset it when we enter the update thread	2014-02-18 13:48:13 +01:00
Olivier Goffart	f7419094f3	move the file system helpers in their own file	2014-02-18 12:54:40 +01:00
Olivier Goffart	432f377750	Use the legacy jobs when using bandwidth limiting ... Or if a environement variable is set	2014-02-18 12:24:35 +01:00
Olivier Goffart	c32beb957d	Move the jobs around between files ... Renamed owncloudpropagator_qnam to propagator_qnam Move the jobs in propagatorjobs.cpp Move the neon jobs that have a qnam equivalent into propagator_legacy.cpp and rename the jobs accordingly	2014-02-18 12:21:05 +01:00
Denis Dzyubenko	a51cb0982b	Added Mac-specific settings dialog that looks more native	2014-02-18 02:22:16 +01:00
hefee	1b03dc759b	fixing typo ... GNU Public License-> GNU General Public License	2014-02-17 22:42:51 +01:00
Olivier Goffart	a39caa1cda	Make owncloudcmd work with the parallel upload/download ... Also make it work when there syncing a remote subfolder	2014-02-17 17:31:03 +01:00
Olivier Goffart	a4ee8d6f6f	Remove unused function	2014-02-17 15:25:47 +01:00
Olivier Goffart	b35e38f80f	Parallel download	2014-02-17 13:48:56 +01:00
Klaas Freitag	e134ae22ac	Disable explorer.exe integration on WinXP	2014-02-13 17:21:30 +01:00
Daniel Molkentin	e66757335b	Theme: Update general disclaimer.	2014-02-13 17:04:52 +01:00
Markus Goetz	372f8b3426	OS X: Document how to disable the auto updater	2014-02-13 14:11:04 +01:00
Olivier Goffart	7b6269b4bf	Fix chunking ... - Do not start them in parallel, start them in sequence instead, as they are quite and there are already other jobs running in parallel normaly - Do not load the fill into memory - Support resuming	2014-02-13 14:02:05 +01:00
Markus Goetz	8b9cd432b5	OS X: Read system-wide plist in /Library ... Needed for http://doc.owncloud.org/desktop/1.5/autoupdate.html#preventing-auto-updates	2014-02-13 12:52:57 +01:00
Daniel Molkentin	beb9752f09	Merge remote-tracking branch 'origin/1.5'	2014-02-12 21:17:06 +01:00
Daniel Molkentin	fd40a25030	Use the appName (which is the short name) instead of the full length name ... The full length name is allowed to change (or should be)	2014-02-12 18:06:01 +01:00
Daniel Molkentin	05ae467cd5	Remove debug	2014-02-12 18:05:28 +01:00
Daniel Molkentin	958253bb2b	Respect skipUpdate policy from global config files and windows policy.	2014-02-12 17:55:05 +01:00
Daniel Molkentin	bcf73cfc40	SSLButton: Omit arrow on Windows which can't display it	2014-02-12 17:55:05 +01:00
Daniel Molkentin	f79ecfe001	more verbose ssl error logging	2014-02-12 17:54:45 +01:00
Olivier Goffart	a4442ebb40	Merge branch 'master' into parallel_upload ... Conflicts: src/mirall/owncloudpropagator.cpp src/mirall/owncloudpropagator.h	2014-02-12 16:50:45 +01:00
Olivier Goffart	93f31fa9d7	Merge branch '1.5'	2014-02-12 16:44:24 +01:00
Olivier Goffart	f35b1f8a2b	Only starts 6 jobs in parallel	2014-02-12 16:33:55 +01:00
Olivier Goffart	6db8daabf7	Make abort work even when there are parallel uploads	2014-02-12 16:33:55 +01:00
Olivier Goffart	a677f97b7f	Fix removing and renaming directories from the Shared directory	2014-02-12 13:44:55 +01:00
Olivier Goffart	01c0a3c099	use Utility::sleep	2014-02-12 11:16:27 +01:00
Markus Goetz	153aa31da2	OS X: Workaround Qt5 QNAM bug ... This made the sign out/sign in handling not work. (cherry picked from commit 104cf680a6)	2014-02-12 11:14:43 +01:00
Markus Goetz	8c9a65635f	Propagator: Fix compilation ... It is still protected on Qt4	2014-02-10 15:46:09 +01:00
Markus Goetz	104cf680a6	OS X: Workaround Qt5 QNAM bug ... This made the sign out/sign in handling not work.	2014-02-10 15:42:46 +01:00
Markus Goetz	79d14f0760	Propagator: Use cross platform sleep function	2014-02-10 14:34:48 +01:00
Klaas Freitag	6387777c18	Added chunking for the new uploading.	2014-02-10 13:00:22 +01:00
Klaas Freitag	41a4f1fc37	Only wait half a second before the next folder sync is started.	2014-02-07 11:53:58 +01:00
Daniel Molkentin	5a6a8b504c	Mac OS: Build fix	2014-02-06 22:32:17 +01:00
Daniel Molkentin	97345447ab	Updater: Unify Sparkle&non-Sparkle URLs ... ...now that we have the support on the server-side.	2014-02-06 18:56:33 +01:00
Olivier Goffart	bb378902ae	Also force an update of the etag in case of renames ... Imagine we have a file: foo/bar/moo if we do mv 'foo' 'foo2' and that we issue a MOVE on the server and will update the entry 'foo' in the database with the new etag If we write the etag of foo but not the etag of the sub item, when we read from db on the next sync, we will miss them and beleive they have been removed on the server	2014-02-06 17:56:27 +01:00
Olivier Goffart	8f1494f8f2	Report an error if fetching the etag fails ... Very important in case of renames, else, if the server did not perform the rename, we may end up deleting the files	2014-02-06 17:56:27 +01:00
Daniel Molkentin	4ae66b8b20	ShibbolethCredetials: Try to avoid re-auth ... ...by storing the shib cookie in key chain	2014-02-06 13:02:01 +01:00
Daniel Molkentin	ccb45bfea6	Move code from HTTPCredentials to more generic locations ... This is a preparation to make them usable from the Shibboleth credentials class.	2014-02-06 13:02:01 +01:00
Daniel Molkentin	bee5940c42	Credentials: Remove unused fetchFromUser methods	2014-02-06 13:02:01 +01:00
Olivier Goffart	f67d2e6418	Start all the jobs in parallel	2014-02-06 12:11:45 +01:00
Olivier Goffart	9a6275a5e3	use QNAM for the PUT ... Not yet supported: - chunking - if the file changes while uploading - aborting - owncloudcmd (because of the dependency to the account and the credidentials)	2014-02-06 11:50:16 +01:00
Olivier Goffart	2d9c0b6c31	Move CSyncThread in the main thread, and just do the neon jobs in a thread ... It is important because then we can do assynchronious job that needs QNAM in the main thread	2014-02-05 20:18:03 +01:00
Olivier Goffart	49562ca3b6	Remove unused members	2014-02-05 16:40:56 +01:00
Daniel Molkentin	33ab854922	SslErrorDialog: Ensure to run into a timeout while showing the dialog	2014-02-05 14:18:31 +01:00
Markus Goetz	1471e15674	Sparkle: Add more delegate methods	2014-02-04 18:43:49 +01:00
Markus Goetz	e001e70816	Sparkle: Get it working	2014-02-04 17:37:01 +01:00
Olivier Goffart	4ade023b96	Find another way to ignore the csync journal from the file watcher	2014-02-04 16:46:14 +01:00
Olivier Goffart	ec266054be	Don't use QFileInfo to get the last modified time. ... We can use the _modtime, since normaly we just set the the modtime of the file to this time. The problem is that Qt does follow symlinks (FILE_FLAG_OPEN_REPARSE_POINT) And therefore was causing problem with symbolic links. Fixes #1307	2014-02-04 16:17:58 +01:00
Olivier Goffart	324214d072	fix the 'Sign In' menu entry	2014-02-04 15:06:17 +01:00
Klaas Freitag	ae5c9a29f6	Detect renames and removes in read only Shared directory, restore files. ... This fixes bug #1386	2014-02-04 15:03:06 +01:00
Klaas Freitag	72a6b00919	Add some usage hints.	2014-02-04 15:03:06 +01:00
Olivier Goffart	e06cfe06fe	FolderWatcher: ignore the csync journal	2014-02-04 14:57:25 +01:00
Olivier Goffart	d2a41342e1	Better error message when the write permission are missing in the local directory ... Fixes #1394	2014-02-04 11:10:22 +01:00
Markus Goetz	6f960d406e	Qt5: Use same path for config as Qt4	2014-02-04 10:02:28 +01:00
Daniel Molkentin	c19978bdc4	Fix Qt5 jenkins build failure	2014-02-04 08:50:45 +01:00
Markus Goetz	fdc8050e3d	Folder Wizard: Re-evaluate after local folder changed	2014-02-03 18:19:25 +01:00
Markus Goetz	62f5b0ebac	Folder Wizard: Make it more clear that we mean a remote folder	2014-02-03 17:27:54 +01:00
Markus Goetz	11c368f0bc	Sparkle: Fix compilation if not found	2014-02-03 16:31:24 +01:00
Daniel Molkentin	19e7c4f66f	NSISUpdater: Fix logic to invoke updater on non-explicit start	2014-02-03 13:46:20 +01:00
Klaas Freitag	971caca5e8	Implement change of the network throttling during a running sync run.	2014-02-02 12:51:19 +01:00
Daniel Molkentin	c2f3cfa4b5	Amendment to last commit	2014-01-31 14:53:20 +01:00
Daniel Molkentin	52971c27cf	Updater: More refinements	2014-01-31 14:49:10 +01:00
Daniel Molkentin	b3683976ca	Updater: Fix corner cases related to failed auto-updates ... - Don't re-download updates whom's auto-install has clearly failed before - Don't signal newly available auto-upgrade if it has failed once - Remove downloaded update after (un)successful auto-update - Remove as many temporary keys after an (un)successful auto-update	2014-01-31 12:42:00 +01:00
Daniel Molkentin	4c6e0b5c07	SSL Button fixes ... - Use OU as display name if CN is empty (often true for CA/interm. certs) - Handle trust anchors in intermediate chain gracefully	2014-01-31 10:35:35 +01:00
Daniel Molkentin	4e0cf7c822	Fix win32 build	2014-01-31 09:35:43 +01:00
Daniel Molkentin	528d434c1f	Amendment to last commit	2014-01-30 13:07:32 +01:00
Daniel Molkentin	2f81999d6c	Fix OS X build	2014-01-30 12:16:09 +01:00
Klaas Freitag	225123951d	Make compile under MacOSX	2014-01-30 11:17:14 +01:00
Daniel Molkentin	dfa1dfaa7d	AutoRaise SSLButton	2014-01-30 09:53:00 +01:00
Daniel Molkentin	74db151427	SSLButton: remove superflous extra argument	2014-01-30 09:53:00 +01:00
Daniel Molkentin	cb8131c382	Remove cmake message	2014-01-29 12:16:21 +01:00
Olivier Goffart	6540f54512	Don't use QDateTime::toTime_t or QDateTime::fromTime_t ... They only take an uint, and time_t is 64bit. This breaks when date are before 1970 Fixes #1380	2014-01-29 11:47:13 +01:00
Daniel Molkentin	1aa050bea9	Add Tests, make Updater classes into a static lib	2014-01-29 10:43:21 +01:00
Daniel Molkentin	ca5f96e1bb	Updater: More refactoring towards testability	2014-01-29 10:43:21 +01:00
Daniel Molkentin	d361bda922	Fix wording	2014-01-28 16:23:39 +01:00
Daniel Molkentin	62f4e813ee	Settings: Allow opening links in updater label	2014-01-28 16:23:24 +01:00
Daniel Molkentin	505e0e9632	Fix build on Win32 ... regression introduced by ec9efd78	2014-01-28 15:49:19 +01:00
Olivier Goffart	50aa31d192	winEventFilter does not exist on Qt5	2014-01-28 15:30:58 +01:00
Daniel Molkentin	c8006f1163	Compile fix	2014-01-28 13:42:09 +01:00
Daniel Molkentin	637565cca1	Updater: Don't overwrite unannouned (newer) versions	2014-01-28 13:36:16 +01:00
Daniel Molkentin	a22884d164	Show message if the updater times out	2014-01-28 13:36:16 +01:00
Daniel Molkentin	58fd57fdcd	Make update URL a compile time option	2014-01-28 13:36:16 +01:00
Daniel Molkentin	2bee51c101	Updater: Logic fix	2014-01-28 13:36:16 +01:00
Olivier Goffart	2ed5dd178a	Fix fetching the user name in the wizzard	2014-01-28 13:18:21 +01:00
Olivier Goffart	803cb5d015	fix signal slot connection	2014-01-28 12:45:41 +01:00
Olivier Goffart	e31000d759	Handle the fact that the user might cancel the password dialog ... Add a new state of the account in which the credidentials are invalid, but we are still trying to get the user enter his password. Make sure that fetched() is ALWAYS emitted after we call fetch on the credidentials, so we can know that the user pressed cancel. In that case, go in the SignedOut state. Fixes #1353	2014-01-28 11:49:09 +01:00
Daniel Molkentin	f408593d27	more build fixes	2014-01-28 11:01:05 +01:00
Daniel Molkentin	6d21058ca1	build fixes	2014-01-28 10:34:56 +01:00
Daniel Molkentin	1da94e5e2b	Updater: More refactoring ... - Renamed GenericUpdater -> OCUpdater - Make more API Private - Split up in classes to reduce complexity: - PassiveUpdateNotifier subclass for Linux - NSISUpdater for Windows	2014-01-28 10:01:23 +01:00
Olivier Goffart	397763ba61	Fix HttpCredentials::invalidateToken to invalidate the password in the config file	2014-01-27 16:57:10 +01:00
Daniel Molkentin	72ae44b8b1	Updater: relaunch Client after update	2014-01-27 13:04:27 +01:00
Olivier Goffart	e6be6fc695	Remove dead code	2014-01-27 12:44:46 +01:00
Olivier Goffart	18966bf061	Add missing include	2014-01-27 12:36:52 +01:00
Olivier Goffart	bf95509dbe	Do not include "private" header from "public" header	2014-01-27 12:31:54 +01:00
Olivier Goffart	50b9a7b191	remove unused include from header file	2014-01-27 11:58:50 +01:00
Olivier Goffart	08c03d19b9	Only one quote should be enough ... Should fix #1295	2014-01-24 20:28:17 +01:00
Daniel Molkentin	42f5aa072d	Link against Sparkle if available	2014-01-24 11:58:11 +01:00
Klaas Freitag	688d394576	Check for INotify if compiling for Linuxe and friends	2014-01-23 16:05:35 +01:00
Klaas Freitag	5841cf4020	Add and remove watches for folders independent from sync dir. ... Before it was just in case of download.	2014-01-23 13:23:27 +01:00
Klaas Freitag	e9e132c06c	Make use of the new linux folder watcher.	2014-01-23 13:23:27 +01:00
Klaas Freitag	e3723fcfc2	Add a new folder watcher implementation for Linux.	2014-01-23 13:23:27 +01:00
Daniel Molkentin	8485a7fd30	Fix typo	2014-01-22 16:09:22 +01:00
Daniel Molkentin	129aef5beb	Revert "Formatting hashes with : seems to be out of fashion" ... This reverts commit c52e3a0732.	2014-01-22 00:00:34 +01:00
Daniel Molkentin	54c0c4057b	Improve SSL detail display	2014-01-21 15:54:06 +01:00
Daniel Molkentin	c52e3a0732	Formatting hashes with : seems to be out of fashion	2014-01-21 15:25:51 +01:00
Klaas Freitag	699f6a62f8	Do not set sync-state to Prepare in setSyncEnabled(). ... This method is also called if the sync was disabled due to network problems and such, ie. from the ETag change check. In that case, we do not want to go to the Prepare state as we not neccessarily want to have the folder synced now. This fixes the problem that the folders were resynced way to often which we had in master for a couple of days now.	2014-01-21 15:25:05 +01:00
Olivier Goffart	61f3b839ab	Fix compilation in Qt5 ... Some Qt SSL function used to return QString now return a QStringList. By having QStringList(...).join(':') the code will compile both if the ... is a QString or a QStringList. So the code will still compile in Qt4.	2014-01-21 15:09:12 +01:00
Olivier Goffart	29590fa00b	Revert "Commented opening of files from the activity view as it does not work." ... This reverts commit c50b0a995b. This was only broken on windows and probabyl fixed by commit 23f52bcd	2014-01-21 13:01:05 +01:00
Olivier Goffart	0c33fc6e8a	Do not block while launching the explorer on linux ... Fixes #1338	2014-01-21 13:01:05 +01:00
Daniel Molkentin	c4c36d641b	Remove garbage include	2014-01-21 12:34:51 +01:00
Klaas Freitag	4d8e65cfd0	Hide useless logging that indicates an error.	2014-01-21 12:10:49 +01:00
Daniel Molkentin	2370060ac5	Implement Certificate Information Widget ... Currently used in status window. Before, there was no way to know about the current certificate situation. Fixes #44	2014-01-21 09:21:33 +01:00
Daniel Molkentin	d4bb0e44cd	Wizard: Gracefully fall back to HTTP if HTTPS connection fails ... If the connection fails, the user is now being asked if he does agree to a new attempt via an unencrypted connection. If he complies, the connection will be reattempted using plain HTTP. Fixes #1356	2014-01-20 19:46:09 +01:00
Daniel Molkentin	9b9b62d4e3	Wizard: Prepend 'https://' if no scheme is set ... First part of fix for #1356	2014-01-20 17:53:46 +01:00
Daniel Molkentin	2780dae569	Setup Wizard: Fix http(s) label size	2014-01-20 17:41:57 +01:00
Daniel Molkentin	562513d5a5	Propagator: Don't pass arbitrary strings as formating string ... Not a security issue since this code was never in any release.	2014-01-20 17:22:29 +01:00
Daniel Molkentin	a2e9353296	Fix copy & paste problem in Ignore List Editor ... Fixes #1355	2014-01-20 17:08:30 +01:00
Olivier Goffart	7f76fcff5e	Do not account the size of deleted or renamed file in the progress ... Fixes #1360	2014-01-20 17:00:28 +01:00
Olivier Goffart	0afbb264e0	cleanup mutex usage in CSyncThread ... The only method which is used from another thread is abort(). So the only thing that needs protection is that function, and the function which may race with. Which are csync_request_abort which should not race with csync_resume	2014-01-20 17:00:28 +01:00
Klaas Freitag	7bb7b1d73b	Remove wipeAllJournals after rebase mistake.	2014-01-20 16:19:30 +01:00
Klaas Freitag	0eebc0e5be	Add folder to schedule queue in setupFolders method. ... This fixes bug #1352	2014-01-20 16:19:30 +01:00
Klaas Freitag	a6b0ccfa12	Remove explicit logging.	2014-01-20 16:19:30 +01:00
Klaas Freitag	ce077f97c6	Checks if the folder from map is still defined. ... I saw a crash were a folder which was deleted was dereferenced later in the Quota check slot. There the folder pointer returned from folder map was zero.	2014-01-20 16:19:29 +01:00
Klaas Freitag	c705a6360d	Rather removeFolder than addFolder to watcher (typo fix).	2014-01-20 16:19:29 +01:00
Olivier Goffart	be874e36da	remove unused variable and functions	2014-01-20 15:10:53 +01:00
Olivier Goffart	3a9c485515	Fix crashwhile removing a folder ... in a QMap, Accessing an entry that does not exists create the null entry We should not use operator[] if we are not sure the folder indeed exists	2014-01-20 14:59:35 +01:00
Olivier Goffart	4df1d7d893	Remove unused variables	2014-01-20 14:59:23 +01:00
Olivier Goffart	bbf3a64c02	Fix crash. ... toUtf8() returns a temporary QByteArray wuich is only valid until the end of the statement (the next ';'). QByteArray::data() returns a pointer to the QByteArray's data which is only valid if the QByteArray is valid. Keeping the char* is therefore wrong.	2014-01-20 14:24:20 +01:00
Olivier Goffart	316aade340	Merge branch 'csync_merge' ... Conflicts: src/CMakeLists.txt	2014-01-20 13:27:33 +01:00
Klaas Freitag	45c75f722c	Show an indicator if the url is encrypted or not in connection wizard. ... Fixes bug #1350	2014-01-16 17:40:46 +01:00
Olivier Goffart	6257ed6605	Make sure that the jobs have the Q_OBJECT macro. ... so tr() works there	2014-01-16 14:06:17 +01:00
Klaas Freitag	0455d96462	Fix untranslated error messages.	2014-01-16 13:04:57 +01:00
Klaas Freitag	d2e8043a4a	Use ClientProxy that reads the client config in commandline client. ... Fixes mirall#1347	2014-01-16 12:52:11 +01:00
Klaas Freitag	98689d48f1	Check if configuration actually exists. ... If not, set System Proxy as default.	2014-01-16 12:52:11 +01:00
Klaas Freitag	ec9efd7894	Make use of the new Proxy handling class.	2014-01-16 12:52:11 +01:00
Klaas Freitag	671100ce5c	Add a class ClientProxy that handles proxy setting for Qt and csync.	2014-01-16 12:52:11 +01:00
Daniel Molkentin	96633307c0	Move owncloudcmd into Bundle on OS X ... Fixes #1300	2014-01-15 18:14:37 +01:00
Daniel Molkentin	2009fbc886	Deploy all of Sparkle manually	2014-01-15 17:52:19 +01:00
Daniel Molkentin	4caa038de6	More sparkle fixes	2014-01-15 16:01:35 +01:00
Daniel Molkentin	f5dc2b3127	Compile on OS X	2014-01-15 12:45:43 +01:00
Olivier Goffart	c7227297af	Make it compile with the merge of csync mirall	2014-01-15 12:20:03 +01:00
Daniel Molkentin	dc9f145a24	New Updater for Windows, passive notification on Linux, Sparkle on Mac	2014-01-15 11:09:31 +01:00
Klaas Freitag	55da857e59	A bit of refactoring, add useful names and set the alias properly. ... The alias field is now set from the last component of the picked local dir. Also some tooltips were added.	2014-01-14 17:40:42 +01:00
Klaas Freitag	aba1252e60	Remove inotify from cmake files.	2014-01-14 15:06:06 +01:00
Klaas Freitag	561f32cede	License header cleanups.	2014-01-13 16:16:19 +01:00
Klaas Freitag	e0d8d93b50	Removed obsolete inotify class of folderwatcher.	2014-01-13 16:07:52 +01:00
Klaas Freitag	3d8505d7f4	Adopt mac folderwatcher to the new folderwatcher.	2014-01-13 16:00:41 +01:00
Klaas Freitag	18171862ac	Unify folderwatcher private constructor.	2014-01-13 15:29:05 +01:00
Klaas Freitag	0e5858b1aa	Add a pathIsIgnored method to the folderwatcher.	2014-01-13 15:29:05 +01:00
Klaas Freitag	5482ad1fd3	Remove event buffering from watcher, other refactoring.	2014-01-13 15:28:56 +01:00
Klaas Freitag	f9080c59ab	Remove FolderWatcher from Folder and move to FolderMan.	2014-01-13 11:30:27 +01:00
Klaas Freitag	a12288ff21	Use folderwatcher based on Qt for Linux.	2014-01-13 11:30:27 +01:00
Klaas Freitag	d5b8d24f91	Add NoSymLink tag to the filter specification. ... Should finally fix bug #1331	2014-01-10 09:09:22 +01:00
Klaas Freitag	9da06f10f6	Removed unused event interval getter/setter.	2014-01-10 09:09:22 +01:00
Olivier Goffart	ebee52ea8a	Merge branch '1.5'	2014-01-09 12:32:08 +01:00
Klaas Freitag	e5804b5d12	Use a more Qt'ish folder recursing method, remove unused class. ... Added unit test.	2014-01-08 14:36:42 +01:00
Klaas Freitag	e5d43c2b9c	Add a utility function to write a random file.	2014-01-08 14:36:42 +01:00
Klaas Freitag	a522cebf0c	Add missing switch case.	2014-01-08 14:36:42 +01:00
Olivier Goffart	1bc4089d95	Fix hiding temporary files on windows ... tmpFileName is a relative path, and we need an absolute path to pass to the function that hides the files	2014-01-08 13:33:16 +01:00
Olivier Goffart	b7b06a8795	Preserve the permission of the file we download ... Related to issue #820	2014-01-08 13:17:35 +01:00
Olivier Goffart	4006e490f3	Do not write the removed folder on the DB ... Should fix #1329	2014-01-08 12:51:42 +01:00
Klaas Freitag	273463daf4	Fix progress for the case that the source file changes during upload. ... If the source file changes, the overall transmission size is not longer correct. Fixed that by pushing the change over the previously calculated size to csyncthread. Also set the mtime and size in the item object in propagator to avoid doublicate uploading.	2014-01-07 15:42:21 +01:00
Klaas Freitag	7da84dbe44	Check on timer member is zero.	2014-01-07 10:30:41 +01:00
hefee	4e0496f74d	respect XDG_CONFIG_HOME for getting user config dir. ... Under linux the XDG Base Directory Specification define different enviroment variables where to store what.	2013-12-31 02:10:44 +01:00
Sven Strickroth	8743be6f11	Close dialog if button was clicked not just pressed ... Signed-off-by: Sven Strickroth <email@cs-ware.de>	2013-12-21 03:36:43 +01:00
Klaas Freitag	38cc564aed	Show proper sync status in tray, incl. Pause status.	2013-12-20 15:16:52 +01:00
Klaas Freitag	72b479c1e0	Added proxy support to owncloudcmd.	2013-12-19 16:48:10 +01:00
Klaas Freitag	d17be6f1ff	Do the neon ssl initialization. ... This fixes bug #1298 and also probably #1297. More tests needed.	2013-12-19 13:33:31 +01:00
Klaas Freitag	c50b0a995b	Commented opening of files from the activity view as it does not work. ... See https://github.com/owncloud/mirall/issues/1295	2013-12-17 14:16:25 +01:00
Klaas Freitag	66c0a3b448	Read password from old settings if exist.	2013-12-17 12:56:01 +01:00
Klaas Freitag	23f52bcd56	Fix open the explorer code.	2013-12-17 10:16:25 +01:00
Stefan Profanter	a93b9ee33a	Fixed parent folder detection if sibling directory starts with same name ... Since `cleanPath` removes all the trailing slashes (84bfbd4cb0:src/corelib/io/qdir.cpp#L2118) the check at line 138 wrongly assumed that `D:\Test` is a parent folder of `D:\TestFoo`.	2013-12-15 16:22:53 +01:00
Daniel Molkentin	bef180a7bc	Remove UTF-8 BOM, confuses old GCCs	2013-12-13 20:27:08 +01:00
Daniel Molkentin	9010e1015e	Better fix for override urls	2013-12-12 17:17:07 +01:00
Klaas Freitag	9bf15178f9	Fix button states in account widget	2013-12-12 16:38:45 +01:00
Daniel Molkentin	5b2c734fe5	Respect the override URL properly	2013-12-12 16:20:01 +01:00
Klaas Freitag	bc5f7d899a	Save and restore activity view state. ... Fixes bug #1256	2013-12-12 15:16:43 +01:00
Klaas Freitag	ec77ecfd0f	Show error reason for blacklisted files in sync activity.	2013-12-12 12:21:24 +01:00
Klaas Freitag	09745c7f75	Fix: Allow to retry sync also for fatal err conditions. ... Otherwise there would not have been a chance to resync for example data that was Forbidden because of a read only share. Also removed some commented code.	2013-12-12 11:39:05 +01:00
Daniel Molkentin	9ffb33293c	QuotaInfo: Keep polling quota if a previous request fails	2013-12-12 10:53:51 +01:00
Klaas Freitag	aa213eeafb	Do not check for the ETag in case the HTTP request connected.	2013-12-11 13:51:38 +01:00
Daniel Molkentin	76a60e889c	Start timer only after the last quota request was answered	2013-12-11 13:48:31 +01:00
Olivier Goffart	fa195eb1e8	Logger: Initialize all variables ... To avoid valgrind warnings in owncloudcmd	2013-12-11 13:23:42 +01:00
Klaas Freitag	b68e721f05	Do not error out on ETag if the status klass is != 2.	2013-12-11 12:59:11 +01:00
Klaas Freitag	bbfb2f2a60	Do not force resync if status is SyncResult::Problem.	2013-12-11 12:59:11 +01:00
Olivier Goffart	bf309f83f4	Don't keep the temporary file if the transfer fails because of a wrong etag ... The downloaded file is corrupted, remove it.	2013-12-11 12:48:11 +01:00
Daniel Molkentin	80d202c630	Fix build on Win32	2013-12-10 17:19:36 +01:00
Olivier Goffart	47308cdc01	define NE_LFS from cmake	2013-12-10 16:20:49 +01:00
Daniel Molkentin	03e9a06c7d	Fix build	2013-12-10 16:07:49 +01:00
Thomas Müller	370cf45357	fixing add button behavior in single folder mode	2013-12-10 15:59:59 +01:00
Thomas Müller	638b62a3ae	prevent crash on 'add folder'	2013-12-10 15:59:59 +01:00
Klaas Freitag	6707e93f31	Add NE_LFS define for correct size of ne_off_t	2013-12-10 15:28:02 +01:00
Olivier Goffart	0360babe02	usleep is not working on windows, use QThread::usleep ... Shoud fix #1082	2013-12-10 14:03:01 +01:00
Klaas Freitag	a743f804f5	Ignore another sqlite journal tmp name that shows up on win32.	2013-12-10 13:19:57 +01:00
Olivier Goffart	b6e4575dea	Do not initialize all the application if another instance is running ... This fixes a crash becasue we were constructing the systemtray and then destroying it too early before the systemtray could initilize itself. (This work around a bug in QSystemTray which crashes if it is destroyed before it is registered to the X11 server)	2013-12-10 12:48:59 +01:00
Daniel Molkentin	2cf7ba91c1	Don't install headers on OS X	2013-12-09 20:39:55 +01:00
hefee	f8478ac27b	Fixing typos	2013-12-09 20:17:56 +01:00
Olivier Goffart	bb2f221edf	Fix broken slot connection ... The slot was renamed.	2013-12-09 19:19:49 +01:00
Daniel Molkentin	1291ffaf02	Small adjustments to the last commit	2013-12-09 17:16:42 +01:00
Olivier Goffart	89d1e2d924	When reconfiguring, we need to clear the _currentSyncFolder ... Else, if we reconfigure when the folder is syncing, it may be impossible to sync again. This happens for example when changing the password when the folder is syncing	2013-12-09 17:16:04 +01:00
Klaas Freitag	857ef33056	Use proper email in license header.	2013-12-09 17:02:17 +01:00
Daniel Molkentin	f5e8efd435	Add build number into versioning scheme ... This is an enabler to improve update experience	2013-12-09 16:39:13 +01:00
Olivier Goffart	e5edb8e2c7	Fix opening the explorer with a selected file on windows. ... Should Fix #1249	2013-12-09 16:13:48 +01:00
Klaas Freitag	5f31d13236	Install headers for owncloudsync	2013-12-08 08:55:18 +01:00
Klaas Freitag	fc986b0ab8	If item is a directory, remove its contents from the database as well. ... Fixes bug #1257	2013-12-06 16:38:43 +01:00
Klaas Freitag	c5e435f9bd	Let recursive removal also remove the top dir.	2013-12-06 16:37:30 +01:00
Klaas Freitag	599451d250	Unchanged files still count as files.	2013-12-06 16:37:01 +01:00
Klaas Freitag	af78f1996c	Set action string as tooltip	2013-12-06 15:50:14 +01:00
Klaas Freitag	41d5445980	Display rename-target in sync protocol action column.	2013-12-06 15:07:25 +01:00
Klaas Freitag	e5afd8b901	Maintain the file type correctly.	2013-12-06 14:11:51 +01:00
Klaas Freitag	6fad20d5fc	Show local MOVE operations only for top level directory instead for all ... files. This fixes bug mirall#1240	2013-12-06 12:32:26 +01:00
Daniel Molkentin	dff17ec08e	A different user constitutes a different account ... Fixes #1231	2013-12-05 19:03:40 +01:00
Daniel Molkentin	df5a72eb38	Resize wizard if advanced options are required ... Fixes #1130	2013-12-05 17:43:57 +01:00
Olivier Goffart	fa9d9c9909	Maybe we need to destroy the decompress context before the request. ... Possibly fix the issue #1229	2013-12-05 16:51:39 +01:00
Daniel Molkentin	a0d1dc8807	Avoid horizontal scrollbar ... ...by intproducing more tooltips and set eliding to center elide You can still force a scrollbar, but it's not there by default and the center eliding makes pathes more meaningful Fixes #1213	2013-12-05 16:42:07 +01:00
Klaas Freitag	9e2f6c0258	Close the sync journal if a folder gets removed. ... This fixes bug #1252	2013-12-05 16:06:46 +01:00
Daniel Molkentin	ee2efbb071	Fix for c3dc84c58f. ... This resulted in the wizard not coming up the second time around because it wasn't destructed properly. Also fix a comment.	2013-12-05 16:00:32 +01:00
Daniel Molkentin	c3dc84c58f	Don't close setup wizard when the initial sync run is started ... Fixes regression over 1.4.2	2013-12-04 20:26:18 +01:00
Daniel Molkentin	72b0f4e573	Add man page for owncloudcmd ... Fixes #1234	2013-12-04 20:07:05 +01:00
Klaas Freitag	861de89e9c	Add translatable error messages for individual file errors. ... The error messages coming out of the csync updater and were string based before which could not be translated.	2013-12-04 12:19:38 +01:00
Klaas Freitag	a6dfc0a83e	Refactoring, pick proper method name.	2013-12-04 11:36:24 +01:00
Klaas Freitag	859f776440	Set proper enable state of blacklist button after the dialog was opened. ... Also set proper tooltips.	2013-12-04 11:32:46 +01:00
Klaas Freitag	4b7f75059a	Fixed check for SQL command successs.	2013-12-04 10:31:05 +01:00
Klaas Freitag	b3620e320b	Avoid a comparison warning on win32	2013-12-03 17:09:57 +01:00
Klaas Freitag	883576cb95	Fix Win32 move file operation.	2013-12-03 17:07:42 +01:00
Daniel Molkentin	62ec7aa9c5	Add file forgotten in last commit	2013-12-03 16:24:17 +01:00
Daniel Molkentin	99fc570267	Replace Q_OS_WIN32 by Q_OS_WIN ... Fixes #1238	2013-12-03 16:23:49 +01:00
Olivier Goffart	1f5c4bde14	Fix windows rename of temporary files	2013-12-03 16:10:44 +01:00
Klaas Freitag	046d180d2f	Rather count the blacklist items in the database. ... Use database functions to count the entries rather than trying to compute it from the progress items the widget got.	2013-12-03 14:48:49 +01:00
Klaas Freitag	278e76b774	Add blackListEntryCount method.	2013-12-03 14:48:49 +01:00
Olivier Goffart	09d850bfaa	When the temporary file is the same size as the file we would download, just keep it ... Don't download the file if the temporary file is complete. else, we get error from server: Requested Range not satisfiable	2013-12-03 14:44:04 +01:00
Klaas Freitag	f0a6047ecf	Add a button to acitivity view to clean the blacklist.	2013-12-03 14:04:01 +01:00
Klaas Freitag	e8ffb17b3b	Add a slot to wipe the folder's blacklist.	2013-12-03 14:04:01 +01:00
Klaas Freitag	09d4fa2127	Fixed wording, do not expose the term blacklist to users.	2013-12-03 14:04:01 +01:00
Daniel Molkentin	f521301c51	Add plugins in install_qt4_executable to ensure the lib paths get fixed up ... Fixes #1228	2013-12-03 13:33:50 +01:00
Olivier Goffart	de5161137f	remove unneeded file	2013-12-03 13:11:41 +01:00
Klaas Freitag	1abfd4ba44	Fixed wording, removed the term "problem".	2013-12-03 12:31:28 +01:00
Klaas Freitag	ecf45856e1	Add missing call to CloseHandle on the win32 platform. ... This fixes bug mirall#1236 and also mirall#1237 Also some minor cleanups.	2013-12-03 10:08:17 +01:00
Klaas Freitag	c03b2bbc87	Make unblacklisting depending on Up or Download ... Compare modtime in case of uploading and ETag in case of downloading as they are the correct indicators.	2013-11-29 16:16:04 +01:00
Klaas Freitag	2f708c0877	Move checkAccountExists out of gui class.	2013-11-29 16:16:04 +01:00
Olivier Goffart	58eb000163	Make the "details" manu entry work ... Fix #1214	2013-11-29 11:18:59 +01:00
Olivier Goffart	f5f56e45c0	Fix pausing one of the folder pauses all foder after it while restarting.	2013-11-29 10:57:34 +01:00
Klaas Freitag	951ac79a68	Destinguish between rename and move in wording.	2013-11-28 10:58:04 +01:00
Olivier Goffart	ef8fe11f5a	Do not write the directory etag in the database in case of soft error ... Else we won't retry next time as we think nothing has changed.	2013-11-28 10:01:30 +01:00
Olivier Goffart	30db533cea	Stop iterating files when aborting.	2013-11-28 10:01:30 +01:00
Olivier Goffart	99eeaa0db5	no need to set twice the error string ... done() is already taking care of that	2013-11-28 10:01:30 +01:00
Klaas Freitag	80a01ecff3	Use the activity icon in settings dialog.	2013-11-28 09:47:49 +01:00
Klaas Freitag	0d85810c23	Change tab name in settingsdialog to Activity rather than Status.	2013-11-28 09:44:09 +01:00
Klaas Freitag	23007613a9	Fix progress bar in new propagator.	2013-11-27 16:48:16 +01:00
Daniel Molkentin	0fc51704f5	Enable accessibility on OS X ... Fixes #736	2013-11-27 15:43:47 +01:00
Daniel Molkentin	46a403eb02	Report connection errors explicitly on explicit sign in attempts ... Implicit connection attempts fail silently. This is roughly what users expect from e.g. mail clients. Fixes #1205.	2013-11-27 14:15:56 +01:00
Daniel Molkentin	e719e80409	ConnectionValidator: Account::setState no longer takes a bool ... This makes the client come up with the correct state when the initial connect fails.	2013-11-27 14:12:30 +01:00
Daniel Molkentin	310278f580	Account: Swap connected and disconnected state ... Also, avoid full integer enumeration	2013-11-27 14:11:10 +01:00
Klaas Freitag	59072a81f1	Put detailed sync status widget into ButtonGroup for common style.	2013-11-26 14:27:32 +01:00
Klaas Freitag	d55bffb319	Removed not longer needed Info button. ... The detailed sync status is now in the same dialog in another tab.	2013-11-26 14:15:37 +01:00
Klaas Freitag	232cbc45b5	Simplify progress and error signals again. ... Now handle everything through the progress signal and let the errors be progressed in the done slot. Remove unused code, fix sorting of the list, more efficiency. This fixes #916	2013-11-26 14:02:11 +01:00
Klaas Freitag	a88d45bff4	Comment some unused code.	2013-11-26 14:02:11 +01:00
Klaas Freitag	090e474d70	Add a couple of missing progress signals.	2013-11-26 14:02:11 +01:00
Klaas Freitag	4f7546768b	Do not blacklist Softerrors.	2013-11-26 14:02:11 +01:00
Klaas Freitag	7a3c086be2	Display a proper error message for missing sync directory on server. ... this fixes bug mirall#1149	2013-11-26 14:02:11 +01:00
Olivier Goffart	5c8b6ed902	Fix Remove -gzip from etag ... Remove it from both "foo"-gzip and "foo-gzip" See issue #1195	2013-11-26 12:10:52 +01:00
pascalBokBok	489cc8aa29	Remove spammy "sync starting" notification on every program start.	2013-11-26 10:01:36 +01:00
Daniel Molkentin	0d85dcdd9e	Toggle Settings window when clicking on the icon ... This restores the old behavior for every DE but OS X and Ubuntu Unity (which respond to all clicks by opening the menu). Discussed in #896	2013-11-26 03:15:03 +01:00
Daniel Molkentin	7eddff39e7	Wizard: Allow /index.php or /remote.php/webdav in URLs. ... We will strip those. Also works on paste. Fixes #349	2013-11-26 02:32:04 +01:00
Daniel Molkentin	81e47b0896	Folder wizard: sanitize error detection ... * Wrap text properly * Format multiple warnings as bullet points * Use 'Folder' instead of 'Directory' everywhere * Fix false positives when checking if one directory contains another * Fix logic errors in target folder warning detection Fixes #1201	2013-11-26 02:03:00 +01:00
Daniel Molkentin	ef0c7348ad	Account Settings: Fix label	2013-11-26 00:04:50 +01:00
Daniel Molkentin	050bb55f1e	Wizard: Do not start from scratch if the initial folder is non-default ... Before, the folder was initialized to "ownCloud" in any case, which lead the wizard to conclude it had to sync everything anew, because the location moved -- even if the folder location was manually corrected. Fixes parts of #1172	2013-11-26 00:04:33 +01:00
Markus Goetz	fa715ce135	Propagator: Open download file as Unbuffered	2013-11-25 19:25:19 +01:00
Markus Goetz	911e0bdd6e	Propagator: Check write errors when downloading	2013-11-25 19:25:19 +01:00
Olivier Goffart	fa0f773fcb	Separate the case of file changing durng upload in the chunk or non chunk case. ... If the file is changed between chunk, it is easy and we can just retry as the file has not been changed on the server. But if the file is changed after it has been updated on the server, we must still update the database with the etag. (and possibly delete the partial file) Relates to issue #1002	2013-11-25 19:16:54 +01:00
Markus Goetz	ac8296fb94	Propagator: Check E-Tag when resuming ... Should fix #756	2013-11-25 19:01:04 +01:00
Daniel Molkentin	f47ce2fea6	Account Settings: Set initial button state correctly ... Fixes #1185	2013-11-25 17:56:09 +01:00
Klaas Freitag	33ff6b3934	Even if problems occured show the Ok-Icon in the setup dialog. ... Fixes bug #942.	2013-11-25 17:49:59 +01:00
Olivier Goffart	ca3d8ab193	Add one case of missing -gzip removal	2013-11-25 17:48:57 +01:00
Daniel Molkentin	d85009a2e9	Account Settings: fix connect error ... Fixes #1198	2013-11-25 17:34:40 +01:00
Markus Goetz	72d2ac09e3	Propagator: Don't ignore error if no HTTP error code	2013-11-25 16:37:48 +01:00
Olivier Goffart	6b7da798b8	Remove -gzip from Etag ... Fix #1195	2013-11-25 16:30:13 +01:00
Klaas Freitag	2e4043b498	Show proper error message and icon according to error class.	2013-11-25 16:18:07 +01:00
Klaas Freitag	dc29046d61	Add new progressProblem signal and slots. ... Now the sync problems are handled differently than the sync progress to ease error message handling and stuff.	2013-11-25 16:18:07 +01:00
Klaas Freitag	0c6dca25c4	Register meta type for SyncProblem	2013-11-25 16:18:07 +01:00
Klaas Freitag	1a3f246c46	Add new Error Types to progress: Soft, Normal, Fatal.	2013-11-25 16:18:07 +01:00
Daniel Molkentin	ad6c42b031	Wizard: let us handle/ignore credential failures	2013-11-25 15:50:19 +01:00
Daniel Molkentin	9ddedf81ac	Cleanup: "Use QMutexLocker"	2013-11-25 15:34:17 +01:00
Daniel Molkentin	685c13dead	Distiguish "Signed out" from "Disconnected"	2013-11-25 15:34:17 +01:00
Daniel Molkentin	2a17a2a102	Remove credential-exposing debug output	2013-11-25 15:34:16 +01:00
Daniel Molkentin	4e22fff427	Introduce online/offline state, accessible via GUI	2013-11-25 15:34:16 +01:00
Daniel Molkentin	6165c38289	Fix indentation	2013-11-25 15:34:16 +01:00
Daniel Molkentin	f554cca3d6	Fix initial state of quota info class.	2013-11-25 15:34:16 +01:00
Daniel Molkentin	67132326d2	Prefix tooltips with app name	2013-11-25 15:34:16 +01:00
Daniel Molkentin	ea2b5fb29c	Query credentials when needed. Put the account offline if user aborts. ... This is only implemented for HTTP auth. Shibboleth still does its own thing.	2013-11-25 15:34:16 +01:00
Daniel Molkentin	0a2861a731	Disable quota polling when default account does not exist or is offline	2013-11-25 15:34:16 +01:00
Olivier Goffart	6f17131e3c	Fix mutex usage in the journal ... All public function must lock the mutex. And therefore none of the journal function may call public function because the mutex is already locked. So have a public commit that lock the mutex, and a private commitInternal that assume the mutex is locked	2013-11-25 15:11:37 +01:00
Olivier Goffart	ca3885de2a	Fix some SQL error and warning ... Such as: Error opening the db: "Driver not loaded Driver not loaded" or QSqlDatabasePrivate::removeDatabase: connection '...' is still in use, all queries will cease to wor We need to clear the QSqlDatabase _db handle before calling removeDatabase. And we also need to give a different name to different folder database, just to be sure	2013-11-25 15:07:58 +01:00
Daniel Molkentin	37d6f6eeab	Build on OS X	2013-11-25 10:54:18 +01:00
Klaas Freitag	fd1552f7a0	Handle SoftError and show blacklisted files.	2013-11-24 22:27:11 +01:00
Klaas Freitag	055a8d7e74	Do not display error messages if user aborts the sync run.	2013-11-24 22:26:50 +01:00
Klaas Freitag	1964e60eb0	Do not show an error message if user aborted. Also CSYNC_STATUS fixes.	2013-11-24 22:21:29 +01:00
Klaas Freitag	11acfde55a	Refresh the Protocol widget when the dialog is raised.	2013-11-24 22:20:43 +01:00
Klaas Freitag	ecb2444923	Handle changing source file in upload correctly. ... Delete the file on the server if the source file is new, but the source did not arrive completely within a timespan.	2013-11-22 19:45:26 +01:00
Klaas Freitag	65bd4be16e	Make sure all queries are initialized on our database object. ... Since we use a database with the non default name, we need to do that, otherwise the query is initialized on the default db which is not open in our case.	2013-11-22 15:37:35 +01:00
Klaas Freitag	8d2950f66c	Enable the overall file count in progress again.	2013-11-21 11:37:47 +01:00
Klaas Freitag	55e82ee4c1	Made transaction management a bit more transparent. Some fixes.	2013-11-21 11:13:58 +01:00
Klaas Freitag	aa17be40cc	Some database code cleanups.	2013-11-20 18:19:14 +01:00
Klaas Freitag	97c661c909	Cleanups	2013-11-20 14:59:58 +01:00
Klaas Freitag	2767e7084a	Minor cleanups.	2013-11-20 14:27:44 +01:00
Klaas Freitag	5900b1ad25	Add blacklisting for files with error conditions.	2013-11-20 14:27:44 +01:00
Klaas Freitag	20b9ae757d	Add a http status code varialbe to the sync item object.	2013-11-20 14:27:44 +01:00
Klaas Freitag	aff2dd9f44	The IGNORE statement is handled further down the code.	2013-11-20 14:27:44 +01:00
Klaas Freitag	e30c484a7a	Ignore the SIGPIPE signal as that disturbs debugging with Qt Creator. ... It is questionable why this happens and if this patch really helps, or if it might have side effects. Input appreciated :)	2013-11-20 14:27:44 +01:00
Klaas Freitag	0f6dd8748f	Fixed some header wording.	2013-11-20 14:27:44 +01:00
Klaas Freitag	a342f63fdf	Changed wording: Replaced Protocol against Status.	2013-11-20 14:27:44 +01:00
Daniel Molkentin	5c4d240c66	Build on mac with Qt 5 ... I still had this patch on disk.	2013-11-19 14:41:40 +01:00
Markus Goetz	e551e92e13	Downloads: Ignore file if no ETag was sent ... Fixes part of #970	2013-11-19 12:44:25 +01:00
Markus Goetz	b98d97a96d	SyncJournalDb: Fix warnings ... I got those warnings for the latter sync runs: 11-19 10:58:15:997 QSqlDatabasePrivate::removeDatabase: connection 'qt_sql_default_connection' is still in use, all queries will cease to work. 11-19 10:58:15:997 QSqlDatabasePrivate::addDatabase: duplicate connection name 'qt_sql_default_connection', old connection removed.	2013-11-19 11:28:08 +01:00
Klaas Freitag	f30ac49264	Cached more queries, used safe QSqlQuery pattern	2013-11-18 13:02:09 +01:00
Klaas Freitag	49ba252fff	Database initialize code cleanup. ... If the QSqlQuery class is called with a query in the constructor, the query is executed immediately. In fact, we executed each query twice before. Later on we might want to implement a wrapper clas around the query.	2013-11-18 10:02:33 +01:00
Klaas Freitag	69269f8f75	Use transactions to speed up database access.	2013-11-18 10:02:32 +01:00
Klaas Freitag	e73730cb94	Close database after retrieval of file record count. ... As the csync updater opens the database itself, it is cleaner to close the db before and open it again after csync has finished. Added a close method to the journal class.	2013-11-18 10:02:32 +01:00
Klaas Freitag	098e04c13f	Set PRAGMA synchronous to NORMAL	2013-11-18 10:02:32 +01:00
Klaas Freitag	b0f6628584	Moved implementation of start() to cpp file.	2013-11-18 10:02:32 +01:00
Klaas Freitag	42f6867329	Add some useful logging.	2013-11-18 10:02:32 +01:00
Daniel Molkentin	0a9a3d8f04	Cleanup in folderman	2013-11-18 09:37:09 +01:00
Daniel Molkentin	ec850e83b9	Folders need to be setup before initializing the GUI ... This fixes the incomplete context menu	2013-11-18 09:37:09 +01:00
Markus Goetz	08665d6ac2	Settings: Don't specify encoding ... QSettings automatically does escaping. When UTF-8 was set, I got all kind of problems with the QByteArray for the geometry and the umlaut in my name for the proxy user.	2013-11-18 09:30:42 +01:00
Markus Goetz	4194a078d5	Revert "set utf8 for the central settings file" ... This reverts commit 6758c89130.	2013-11-15 15:45:21 +01:00
Daniel Molkentin	6758c89130	set utf8 for the central settings file	2013-11-15 14:43:48 +01:00
Olivier Goffart	c15a1eedd1	Only update the db for ETAG if the etag has changed for directories	2013-11-15 13:53:18 +01:00
Klaas Freitag	bf6e1f10ce	Prepare the queries after the database was migrated.	2013-11-15 11:21:27 +01:00
Klaas Freitag	c22f8a47f1	Initialise values properly, avoid warning.	2013-11-15 10:32:13 +01:00
Klaas Freitag	858facb5e0	Use precompiled database statements.	2013-11-15 10:32:13 +01:00
Olivier Goffart	b3972a5ba8	Do not fetch the file id in the propagator with a HEAD ... Normally, the fileid comes with the PUT or the GET. If it did not comes with the PUT, it means the server do not support fileid, we should not query it with a useless HEAD. Also, in case the fileid changes (which it should not) update anyway to the new fileid in the db	2013-11-15 10:18:19 +01:00
Daniel Molkentin	36e8273da0	fix mac builds	2013-11-14 20:53:56 +01:00
Daniel Molkentin	7ba8983f0a	Change all Network Jobs to use start()	2013-11-14 19:20:19 +01:00
Markus Goetz	088aa6ebdd	Wizard: Default button to Next	2013-11-14 19:13:59 +01:00
Markus Goetz	767ec4ed59	Wizard: Support redirects again	2013-11-14 17:54:38 +01:00
Markus Goetz	b12b8c981d	Wizard: Also reset timeout on forwards	2013-11-14 17:23:56 +01:00
Markus Goetz	b499a62593	Wizard: Timeout handling for CheckServerJob	2013-11-14 17:23:56 +01:00
Markus Goetz	fa0a2764a4	Fix changing URL in wizard	2013-11-14 17:23:56 +01:00
Markus Goetz	a537a98f03	Tray menu: Populate at start	2013-11-14 17:23:56 +01:00
Olivier Goffart	e8e27b61f6	Revert the changes that fetch the file id in the propagator. ... We don't want to fetch the file id in the propagator. Revert "Put item member variable to base class." This reverts commit f7aa2aa348. Revert "Add isValidFileId and getFileIdPropget methods." This reverts commit ccd254abba.	2013-11-14 14:59:03 +01:00
Daniel Molkentin	578431c791	Fix building owncloudcmd in case of theming	2013-11-14 14:20:09 +01:00
Klaas Freitag	f7aa2aa348	Put item member variable to base class.	2013-11-14 11:37:32 +01:00
Klaas Freitag	ccd254abba	Add isValidFileId and getFileIdPropget methods.	2013-11-14 11:37:08 +01:00
Daniel Molkentin	8f61cc4041	Hint the OS to not show [?] in Wizards and Dialogs ... Fixes #1156	2013-11-13 20:12:56 +01:00
Daniel Molkentin	21c9fc2d35	Cleanup	2013-11-13 19:11:46 +01:00
Daniel Molkentin	171572e400	Remember paused state throughout application restarts ... Fixes #823	2013-11-13 18:58:35 +01:00
Olivier Goffart	52e01b39d6	Adapt to csync 'md5'->'etag' change	2013-11-13 14:28:41 +01:00
Daniel Molkentin	af1dcfd179	Compile fix	2013-11-13 14:24:02 +01:00
Daniel Molkentin	233a6908dd	Partial revert "Compile with Qt5" ... This reverts commit 878ae56a71.	2013-11-13 14:19:01 +01:00
Daniel Molkentin	ae83c12f05	Fix compiler warning	2013-11-13 14:19:01 +01:00
Daniel Molkentin	878ae56a71	Compile with Qt5	2013-11-13 14:00:12 +01:00
Daniel Molkentin	2ff4ebc72f	Make user() available throught AbsctractCredentials	2013-11-13 13:59:35 +01:00
Daniel Molkentin	ca79d3b437	Merge remote-tracking branch 'origin/master' into account_refactoring	2013-11-13 13:55:58 +01:00
Klaas Freitag	14081a197b	Call ne_sock_init and ne_sock_exit to initialize neons SSL stack. ... See https://github.com/owncloud/mirall/issues/1115 for more details on why that is done here now.	2013-11-11 17:47:24 +01:00
Daniel Molkentin	9fe2549938	Add user info if the auth backends provides it	2013-11-11 16:57:15 +01:00
Klaas Freitag	e0a50d4bb9	PostSyncCleanup added: Remove superfluous entries from database after ... sync.	2013-11-11 16:45:40 +01:00
Daniel Molkentin	ad1c1f4130	Remove legacy code	2013-11-11 15:36:49 +01:00
Daniel Molkentin	22ed29a30b	Remove obsolete credentialstore class	2013-11-11 15:24:07 +01:00
Daniel Molkentin	64b59f8679	Don't use integration directory	2013-11-11 15:22:51 +01:00
Daniel Molkentin	406ed5a0c0	Make new folder wizard work again	2013-11-11 15:20:07 +01:00
Daniel Molkentin	d5081f4328	Fix logic	2013-11-11 14:02:54 +01:00
Daniel Molkentin	95d7afb0d0	cleanups	2013-11-11 10:57:33 +01:00
Klaas Freitag	2b2987d962	Make sure to rebuild the recent changes menu.	2013-11-11 10:06:14 +01:00
Klaas Freitag	2eb77445be	Add rename actions to progress dispatching. ... With that fix rename operations are shown as such in the progress window and in bubble help etc.	2013-11-08 16:21:59 +01:00
Daniel Molkentin	12b1b38351	Fix connect	2013-11-08 14:02:13 +01:00
Daniel Molkentin	b0abb6362a	Don't set the content header length ... This breaks POSTS and is not needed in QNAM, since QNAM does this itself internally.	2013-11-08 14:01:56 +01:00
Klaas Freitag	a458ffd472	Add missing return in error case.	2013-11-08 12:56:54 +01:00
Daniel Molkentin	60b6f520e7	Make Shibboleth browser aware of Accounts ... Needed for SSL error handling. It's also more consistent.	2013-11-07 18:47:38 +01:00
Daniel Molkentin	8d0d5b4077	Make redirects work	2013-11-07 18:46:57 +01:00
Daniel Molkentin	5c9a6afb82	Fix crash when opening settings without a valid account	2013-11-07 18:46:28 +01:00
Klaas Freitag	162acc1cc2	Fix conflict file handling, create a proper conflict file name. ... Before this fix, the conflict file name was set in the file name variable which lead to the problem that the subsequent rename of the temp file to the final final filename was moving the temp file on the conflict file. No final file was there.	2013-11-07 16:53:22 +01:00
Daniel Molkentin	64ef43d918	Fix the key used for storing the password	2013-11-07 15:59:58 +01:00
Daniel Molkentin	33c3d2a7d0	Wizard: Initialize account credentials. ... Required to be able to readily retrieve the user name later on	2013-11-07 15:24:49 +01:00
Daniel Molkentin	1238ab4f69	fix broken connect() statement	2013-11-07 12:50:55 +01:00
Daniel Molkentin	a42ff5a07c	Show floating point prec. in account settings, too	2013-11-07 12:50:39 +01:00
Daniel Molkentin	aa4b6bd4ea	Readd "online" notion as a state in account. ... This gets updated by the ConnectionValidator. Not sure if that's the best choice, but it mimmicks the old behavior the closest.	2013-11-07 12:22:17 +01:00
Daniel Molkentin	478ba9c5ef	Fix approved SSL certificates being forgotten	2013-11-07 12:04:45 +01:00
Daniel Molkentin	bd46ad56fc	Add new quotainfo class	2013-11-07 10:14:38 +01:00
Daniel Molkentin	bde5e86c50	Reformatting fixes	2013-11-07 10:14:25 +01:00
Daniel Molkentin	ec0f01fd7c	Ensure an SSL Error Handler is always available	2013-11-07 10:14:12 +01:00
Klaas Freitag	fe4c1cc35a	Remove straycat code from mirall.	2013-11-06 14:20:44 +01:00
Daniel Molkentin	800abbf8b7	Make http credentials work	2013-11-05 18:16:00 +01:00
Daniel Molkentin	3af622d535	Make quota display work	2013-11-05 18:15:47 +01:00
Klaas Freitag	ee4cbf52dc	Remove straycats collected in the reconcile phase from journal.	2013-11-05 17:53:01 +01:00
Klaas Freitag	5cd2be058d	Fix local rename.	2013-11-05 17:50:09 +01:00
Klaas Freitag	3a21edca2b	Keep originalFile member as QString rather than C string. ... This avoids encoding problems with interesting file names.	2013-11-05 17:48:51 +01:00
Klaas Freitag	c6a926842a	Fix recursivley flag misinterpretation.	2013-11-05 17:47:51 +01:00
Daniel Molkentin	440b5164ad	Build fix	2013-11-04 16:41:59 +01:00
Daniel Molkentin	cc5f17a7d2	Merge remote-tracking branch 'origin/master' into account_refactoring ... Conflicts: src/mirall/accountsettings.cpp src/mirall/folder.cpp	2013-11-04 16:38:55 +01:00
Daniel Molkentin	85d5b82811	- Make saving/restoring accounts work. ... - Prepare for fetching quota	2013-11-04 16:36:23 +01:00
Olivier Goffart	f0a1ac4346	Fix syncing folder with nothing in it ... Do the start after connecting, as the finish may be imediate if there is nothing to do.	2013-10-31 12:11:56 +01:00
Olivier Goffart	bdc39f9cc2	Allow folder that are prefix of another	2013-10-31 11:41:56 +01:00
Olivier Goffart	d3ae2f42a7	Reset the proxy module property at every sync ... This is required for the fix for #713 Since the module properties are shared in global variables shared by every folders, removing another folder may clean the proxy settings. So we need to restore them at every sync	2013-10-31 11:39:43 +01:00
Olivier Goffart	df39ab0b2f	Don't leak the system tray	2013-10-31 10:52:19 +01:00
Olivier Goffart	28833ee5ac	Fix crash when removing folder while syncing. ... We need to set _thread to 0 after destoying it	2013-10-31 10:51:45 +01:00
Klaas Freitag	c66a1d1895	Removed unused code from LocalRename	2013-10-30 18:14:33 +01:00
Klaas Freitag	cdee0dc1cf	Added a PropagateLocalRename job to do local renames.	2013-10-30 17:37:34 +01:00
Klaas Freitag	a43c5fcfe8	Fix header name according to changes on server master.	2013-10-30 17:37:34 +01:00
Olivier Goffart	5c67f39476	Ignore error 404 on DELETE ... This may happen if we have stale entries in the database	2013-10-30 17:33:06 +01:00
Olivier Goffart	fb47657b1f	Make F6 in the account config sync the selected folder, for debugging purposes ... Issue #409	2013-10-30 16:58:08 +01:00
Olivier Goffart	76d46af4b7	Revert "Implement a sync now button" ... Actually, after discussion with the team, we decided this button is a bad idea This reverts commit b56fcd8ebd.	2013-10-30 16:48:28 +01:00
Daniel Molkentin	86af2848dd	Merge remote-tracking branch 'origin/master' into account_refactoring ... Conflicts: src/mirall/accountsettings.cpp	2013-10-30 16:37:49 +01:00
Daniel Molkentin	4ca310b63b	Remove ownCloudInfo for good	2013-10-30 16:33:15 +01:00
Daniel Molkentin	59bc1d8966	Credential Store is no longer static ... It now belongs to HttpCredentials	2013-10-30 16:32:34 +01:00
Daniel Molkentin	14c2ff44f3	More porting to Account class ... - Finish port of owncloud setup wizard to Account - Deprive MirallConfigFile of the customHandle	2013-10-30 16:31:47 +01:00
Olivier Goffart	b56fcd8ebd	Implement a sync now button ... The button is in the account config, next to the "pause/resume" button Fixes #409	2013-10-30 16:27:00 +01:00
Olivier Goffart	e38d6d974b	Replace _Button* with _button ... Identifiers starting with underscore and uppercase are reserved in C++.	2013-10-30 15:52:30 +01:00
Olivier Goffart	9500c5ffab	Do not change the instruction anymore when we finish an item ... The status is in the status. Keep the original instruction so the UI knows what to display for eath item	2013-10-30 10:46:05 +01:00
Olivier Goffart	b079cedbf5	Use the status instead of the instruction for finished items	2013-10-30 10:44:41 +01:00
Olivier Goffart	6e088e28f5	Adjust the mtime in case of fake conflicts ... "Fake conflicts" happen when the etag changes on the server, and the mtime changes on the client, but the actual file is still exactly the same. We correctly detect them as false conflict and we do not generate the conflict file for them. But we should also update the local mtime to the server mtime so future sync don't get confused.	2013-10-29 12:23:51 +01:00
Olivier Goffart	01e2743bae	Always download the conflicted files. ... Conflicts have a direction==NONE. And they need to be downloaded, not uploaded	2013-10-29 12:13:30 +01:00
Olivier Goffart	75ffa787a6	emit the EndDownload progress at the right place. ... It was put in rename instead of download	2013-10-29 12:13:30 +01:00
Olivier Goffart	4ad9f34807	Save the UPDATED files in the database ... Those are files that were detected as "resolved conflict". They should have been a conflict because they both were new, or both had their local mtime or remote etag modified, but the size and mtime is the same on the server. This typically happen when the database is removed. Nothing will be done for those file, but we still need to update the database.	2013-10-29 12:13:30 +01:00
Daniel Molkentin	a91799a11c	Make the setup wizard compile again ... - introduces more jobs - needs more cleaning up	2013-10-28 20:01:59 +01:00
Olivier Goffart	adc47948a5	Add a comment explaining OwncloudPropagator::start	2013-10-28 17:00:27 +01:00
Olivier Goffart	6e886e28e9	Merge branch 'propagator-job' ... Conflicts: src/mirall/owncloudpropagator.cpp	2013-10-28 16:26:25 +01:00
Klaas Freitag	e63fc184a5	Options parsing added.	2013-10-28 16:07:13 +01:00
Olivier Goffart	84a40dcb59	Refactor the new propagator in jobs ... This makes the code (IMHO) more easy to understand, and will allow even more easy parallelism	2013-10-28 15:58:35 +01:00
Olivier Goffart	8e90782107	Make owncloudcmd display the debug output	2013-10-28 15:45:37 +01:00
Klaas Freitag	68ba99b7f0	Fixed fileID parsing and improved logging.	2013-10-28 15:28:34 +01:00
Klaas Freitag	2fefc428a8	Write file Id to journal table. ... Since this requires a change of existing sync journals, database migration code was added.	2013-10-25 13:31:00 +02:00
Klaas Freitag	17220f2604	Query file Id from server if unknown.	2013-10-25 13:31:00 +02:00
Klaas Freitag	7a68961b25	Add handling for the file_id data to the sync items.	2013-10-25 13:31:00 +02:00
Daniel Molkentin	aa2baa45fb	Cleanups, ownership for ssl error handler	2013-10-24 12:55:26 +02:00
Daniel Molkentin	eda5feb82c	Bring back proper ssl handling	2013-10-24 00:29:08 +02:00
Daniel Molkentin	d2b445c80c	Basic port, misses wizard	2013-10-23 14:48:53 +02:00
hefee	38679f79b5	Need inotify on FreeBSD for libsync	2013-10-23 01:24:27 +02:00
hefee	a927caf2b0	Fixing Utility::platform for all platforms	2013-10-23 00:59:29 +02:00
Daniel Molkentin	29c846a764	WIP: Dissolve owncloudinfo class	2013-10-21 21:42:52 +02:00
Daniel Molkentin	a91ba0fd48	WIP: Move network tasks from ownCloudInfo into Job classes.	2013-10-18 12:24:29 +02:00
Daniel Molkentin	a25d55a265	Add QtJson to 3rdparty, use it in ownCloudInfo	2013-10-18 02:00:19 +02:00
Olivier Goffart	0efbfb10aa	Fix MOVE of directory. ... Remove the right entry from the database (i.e: the original file name) Fetch the etags of the sub entries	2013-10-17 13:06:39 +02:00
Olivier Goffart	cb8006b89f	Fix comments of the propagation step. ... Also, don't mark item as removed if the instruction is not REMOVE	2013-10-17 12:09:44 +02:00
Klaas Freitag	660469cbf5	Do not propagate a move of the Shared folder.	2013-10-17 10:48:31 +02:00
Daniel Molkentin	a06e551469	Merge pull request #1103 from Absolight/freebsd-port ... Patches for FreeBSD	2013-10-16 08:52:46 -07:00
Olivier Goffart	746b86a1dd	Save the progress db once a chunk has been upload ... Allow to resume when we cancel the sync	2013-10-16 16:47:24 +02:00
Mathieu Arnold	1c594b6a8d	FreeBSD doesn't have statvfs64, like MacOS X.	2013-10-16 15:57:59 +02:00
Olivier Goffart	313832de8d	Put the progress database within the journal	2013-10-16 12:01:14 +02:00
Olivier Goffart	2c63f7a24d	Merge branch '1.4' ... Conflicts: VERSION.cmake src/mirall/application.cpp src/mirall/application.h src/mirall/csyncthread.cpp src/mirall/folder.cpp src/mirall/folder.h src/mirall/folderman.cpp	2013-10-15 17:00:53 +02:00
Olivier Goffart	10fba886dc	Do not elide the progress text ... It's size is computed so the text fit, there is no need to alide it. Fixes #1094	2013-10-15 14:58:34 +02:00
Klaas Freitag	d0d362664b	Handle proxy on folder level, not folderman level.	2013-10-14 16:11:52 +02:00
Klaas Freitag	f841450dae	Do append non empty lines not starting with a hash to ignores.	2013-10-14 16:11:52 +02:00
Klaas Freitag	a3927c5c2c	Avoid quick flickering up of the ok-icon for the sync prepare state. ... For the SyncPrepare phase now the icon that was displayed before is kept. If the folder was disabled before, the sync icon is displayed.	2013-10-14 12:59:08 +02:00
Klaas Freitag	89cfa387cd	Remove bogus html formatting tag.	2013-10-14 11:46:02 +02:00
Olivier Goffart	1fccb23442	Don't show desktop notification when the user don't want to ... Fix #1093	2013-10-14 11:33:47 +02:00
Klaas Freitag	bfd50ffcd0	Do not show progress if nothing is transmitted, show number of deletes.	2013-10-14 11:16:17 +02:00
Klaas Freitag	4f2a171913	Avoid quick flickering up of the ok-icon for the sync prepare state. ... For the SyncPrepare phase now the icon that was displayed before is kept. If the folder was disabled before, the sync icon is displayed.	2013-10-11 17:54:26 +02:00
Daniel Molkentin	005d70a73c	Proxy support: Reset useSystemConfiguration() in all cases but DefaultProxy ... Fixes #1016	2013-10-11 14:25:35 +02:00
Klaas Freitag	592291cbcb	Fix initialized after warning.	2013-10-11 12:10:47 +02:00
Klaas Freitag	7236bd7dd4	Make problem warnings not appearing in the tray. ... This fixes bug #944: Do not show the warning icon in the tray.	2013-10-11 12:09:27 +02:00
Klaas Freitag	c02d5f41a5	Remove bogus html formatting tag.	2013-10-11 12:09:27 +02:00
Daniel Molkentin	5a7cd815ab	Reconnect if network is unavailable after startup ... Fixes: #1080	2013-10-11 11:43:23 +02:00
Daniel Molkentin	c2c01bccfc	Fix literal occurances of "ownCloud" in GUI	2013-10-10 11:35:22 +02:00
Daniel Molkentin	2240039442	Fix literal occurances of "ownCloud" in GUI	2013-10-10 11:34:45 +02:00
Klaas Freitag	fb4728c7ee	Handle sync enable flag correctly in folder scheduling. ... This fixes bug #1083. Conflicts: src/mirall/folder.cpp	2013-10-10 11:32:56 +02:00
Klaas Freitag	f34621578e	Use qint64 rather than int64_t.	2013-10-09 14:33:24 +02:00
Klaas Freitag	5e50b1f1fd	Add some progress meassuring logging.	2013-10-09 14:33:09 +02:00
Klaas Freitag	3c95d342ee	Handle sync enable flag correctly in folder scheduling. ... This fixes bug #1083.	2013-10-09 14:27:28 +02:00
Klaas Freitag	53ac5427a8	Integrate progress dialog into settings dialog.	2013-10-09 14:27:28 +02:00
Klaas Freitag	1ed8afba09	Minor changes.	2013-10-09 14:27:28 +02:00
Klaas Freitag	ef81a8a2ad	Use qint64 rather than int64_t.	2013-10-08 15:41:15 +02:00
Klaas Freitag	fa9d1614e7	Add some progress meassuring logging.	2013-10-08 14:07:46 +02:00
Olivier Goffart	05fbfb520f	Protect the sync database by a mutex since it is used by the thread	2013-10-04 21:05:46 +02:00
Daniel Molkentin	805e1330ad	Compile with MinGW	2013-10-04 20:29:42 +02:00
Olivier Goffart	7c6fcf688c	Fix the fact that some success was reported as error	2013-10-04 15:55:59 +02:00
Olivier Goffart	127055dd70	Refactor a bit the error reporting from the propagator ... Add different classes of error failures. Fatal error means the sync should be stopped. SoftErrors are not to be displayed to the user. We still need to make a classification of the errors.	2013-10-04 15:55:59 +02:00
Markus Goetz	f4929e849e	CsyncThread: Activate recursive PROPFIND	2013-10-04 15:42:40 +02:00
Mackie Messer	ba9ac03b0b	Put plugins in PlugIns, not Plugins on Mac ... Requires 770539f0a5 on csync	2013-10-04 13:01:46 +02:00
Mackie Messer	0257f7e169	Add sqlite plugin for OS X	2013-10-04 13:01:46 +02:00
Olivier Goffart	8ed2588cdf	Fix build with Qt5	2013-10-03 23:14:10 +02:00
Olivier Goffart	d8d2d36638	Fix SQL Query	2013-10-03 23:00:47 +02:00
Olivier Goffart	baa9ba089c	Save the database after each operation.	2013-10-03 22:41:12 +02:00
Olivier Goffart	3495b822a5	TMP	2013-10-03 20:01:07 +02:00
Daniel Molkentin	be88d425fc	Fix connecting to the mysql db	2013-10-03 19:52:09 +02:00
Klaas Freitag	94a06cec5b	WIP on the journal database.	2013-10-03 18:52:02 +02:00
Klaas Freitag	4008f6b309	Fix file status enum names.	2013-10-03 17:55:32 +02:00
Klaas Freitag	daac6886a0	Added method setFileRecord to update sync journal	2013-10-03 17:48:14 +02:00
Daniel Molkentin	e304dfd5b9	Add socketapi ... Slightly amended by: Daniel Molkentin <danimo@owncloud.com>	2013-10-03 17:05:01 +02:00
Klaas Freitag	2e3aabf99b	Read header without prefix path now that it's in 3rdparty.	2013-10-03 16:47:48 +02:00
Klaas Freitag	59bf8740a0	Add c_jhash.h header from csync to 3rdparty.	2013-10-03 16:41:23 +02:00
Olivier Goffart	21cd57228e	Fix build with Qt5 ... Missing SQL module	2013-10-03 16:29:47 +02:00
Klaas Freitag	4501c64e61	Do not include whole header of csync_exclude.	2013-10-03 16:22:31 +02:00
Klaas Freitag	273105e78b	Handle new case SyncAbortRequested.	2013-10-03 16:21:54 +02:00
Klaas Freitag	2707116350	Minor fixes for file_status	2013-10-03 16:12:50 +02:00
Klaas Freitag	c7d30bae98	Handle new sync result enum.	2013-10-03 15:32:44 +02:00
Klaas Freitag	be328581a7	Implemented sync status function for overlay icons.	2013-10-03 15:29:10 +02:00
Klaas Freitag	c32bc27b3e	Add sync journal database class that opens the csync db to read from it.	2013-10-03 15:29:10 +02:00
Klaas Freitag	0fef88a9b9	Some comments added.	2013-10-03 15:29:10 +02:00
Klaas Freitag	3e0fc56495	Dont show the [i] icon in the tray, see bug #942	2013-10-03 15:29:10 +02:00
Olivier Goffart	396ec4f888	Fix race condition in the logger. ... Logs can come from multiple thread, we need to keep the _logstream protected by a mutex	2013-10-03 14:37:13 +02:00
Olivier Goffart	79ea7c3eed	Abort the sync asynchroniously ... Don't block the GUI when clicking on pause Mirall issue #968	2013-10-03 14:36:32 +02:00
Olivier Goffart	b18810f381	Implement abort with the new propagator ... abort was implemented in csync after the new propagator was written, so it was not working with the new propagator	2013-10-03 14:35:56 +02:00
Daniel Molkentin	339ed20abc	Utility::showInFileManager(): Substitute valid desktop file parameters	2013-10-03 12:05:00 +02:00
Klaas Freitag	44ed577992	List results for all folders, not only one.	2013-10-03 11:36:18 +02:00
Klaas Freitag	f6685accc3	Use subdirs for more xdg dirs to go through	2013-10-02 19:23:06 +02:00
Klaas Freitag	2c2e79c13d	Consider the folder of items to delete from info window.	2013-10-02 19:23:06 +02:00
Daniel Molkentin	81961068a2	Utility: Move OS specific implementations into separate files	2013-10-02 19:15:56 +02:00
Daniel Molkentin	4e91a6450c	Change the recent changes menu and file item dialog behavior ... Recent Changes: - "No items synced recently" - Add separator to the details section - Make items clickable (will open file location in file manager) - If a file was deleted, disable it File Item Dialog: - Make items clickable (will open file location in file manager) This is implemented via a new method Utility::showInFileManager(QString), which goes through great lengths to use use the right file manager on all OSes/WMs/DEs, and make sure it selects the file in question if possible. This needs good testing, though. Fixes #1044	2013-10-02 18:17:48 +02:00
Daniel Molkentin	3dc2547bb5	WIP	2013-10-02 18:16:32 +02:00
Olivier Goffart	47f299f0ee	Send the last known etag to the server in a If-Match header ... That way we avoid race conditions in case the file changed between the update and the reconcile	2013-10-02 15:57:49 +02:00
Olivier Goffart	d135aab86c	clear the etag in every cases, not only when we upload files	2013-10-02 15:57:49 +02:00
Olivier Goffart	e2a2b882bb	Remove the unused errorDetails ... It was not displayed to the user. Only use errorString instead. Also report neon error to the user	2013-10-02 15:57:49 +02:00
Klaas Freitag	d8309a64cb	Even more cleanup.	2013-10-02 15:55:15 +02:00
Klaas Freitag	55722099fa	More refactoring: Logger and Logbrowser out of application class.	2013-10-02 15:29:24 +02:00
Klaas Freitag	2149814428	Fix/enhance user information about problems on startup. ... Pass the error conditions to the gui class.	2013-10-01 18:25:43 +02:00
Klaas Freitag	ea1c951006	Refactoring: Moved all GUI related computing out of application class. ... Created ownCloudGui class to contain all gui related stuff.	2013-10-01 13:58:01 +02:00
Klaas Freitag	4a96f9a5c9	Add Mirall namespace.	2013-10-01 13:58:01 +02:00
Klaas Freitag	fcc4151810	Fix sequence of directories in help text.	2013-10-01 13:58:01 +02:00
Klaas Freitag	82cd79c004	Add unify defines to header.	2013-10-01 13:58:00 +02:00
Klaas Freitag	74983af3b4	Make evaluateSync public, review pls.	2013-10-01 13:58:00 +02:00
Klaas Freitag	f5bcb11fe9	Add connected server to error message.	2013-10-01 13:58:00 +02:00
Klaas Freitag	f6f1c638a5	Allow Constructor to be public, for synclibrary	2013-10-01 13:58:00 +02:00
Daniel Molkentin	e250672e4a	CMake: libhttplib -> httplib	2013-09-30 23:16:04 +02:00
Daniel Molkentin	9b62104f30	Add Folder column to Details sync protocol ... Also fixes padding Fixes #1037	2013-09-30 14:12:59 +02:00
Daniel Molkentin	df36ebf308	Merge branch '1.4' ... Conflicts: VERSION.cmake	2013-09-30 13:34:10 +02:00
Daniel Molkentin	86e42a9cf0	Fix possible endless loop in inotify ... Fixes #1041	2013-09-27 20:10:12 +02:00
Klaas Freitag	de9dcbd231	Transmit the new mtime of the file with the PUT request. ... If the server supports it already, we can save another request by sending the mtime as a header value in the PUT request and check the servers reply for a acknoledge header.	2013-09-25 14:26:13 +02:00
Klaas Freitag	5cf13dfa32	Make logging work again.	2013-09-24 15:56:03 +02:00
Klaas Freitag	27b9a5aed9	Merge branch '1.4', brings in the changes we did for 1.4.1	2013-09-24 14:18:25 +02:00
Klaas Freitag	7048bd8cc9	Handle app icon names properly.	2013-09-24 12:19:29 +02:00
Klaas Freitag	0959ceeff2	Disable delete of folder object temparily.	2013-09-23 15:10:42 +02:00
Klaas Freitag	1988c9d8c4	Do complete sync if network was disconnected. ... This fixes owncloud/mirall#1007	2013-09-23 15:10:42 +02:00
Klaas Freitag	1eaa1e47fe	Be more careful with items in model when deleting rows.	2013-09-23 15:10:42 +02:00
Klaas Freitag	31923b314e	Removed left over stuff from refactoring.	2013-09-23 15:10:42 +02:00
Klaas Freitag	ee840b62e5	Fix syncEnable in folder and folderman.	2013-09-23 15:10:42 +02:00
Daniel Molkentin	363efaa408	Theming build fix: Icons need shortname	2013-09-20 23:09:41 +02:00
Daniel Molkentin	b0beeea95f	More fixes related to object destruction on exit ... - _logBrowser is not delete on close, call deleteLater - move writing geometry out of dtor. - _folderWizard was unused, remove it and all related noops Hopefully solves #945	2013-09-20 14:18:28 +02:00
Daniel Molkentin	d0a4650d69	Settings: calculate sidebar width dynamically ... Fixes #1020	2013-09-20 10:40:22 +02:00
Daniel Molkentin	ec5a84cf01	Pop up config wizard if no server url is configured. ... Fixes #1018.	2013-09-19 17:24:22 +02:00
Daniel Molkentin	a057eb8590	Fix focus issue during setup wizard	2013-09-19 14:52:41 +02:00
Daniel Molkentin	6a8753b119	Start only one wizard, delete it when done	2013-09-19 12:11:46 +02:00
Daniel Molkentin	23fab90a31	_tray is a QPointer, not a QScopedPointer	2013-09-18 16:41:37 +02:00
Daniel Molkentin	8fdf9cac6b	Try to be more graceful during shutdown ... - Do not delete _tray, use deleteLater() via QScropedPointer - force closing any dialoges that might want to write their geometry in aboutToQuit(), before the actual destruction of the sync thread, etc starts. This tries to fix #945	2013-09-18 15:42:35 +02:00
Daniel Molkentin	525d12f5a2	Make "Sync started" message optional ... Fixes #934	2013-09-18 14:14:42 +02:00
Daniel Molkentin	15d247a708	Ui::SslErrorDialog belongs within the Mirall namespace	2013-09-18 14:06:23 +02:00
Daniel Molkentin	a1d0b85277	Add copyright header to syncfileitem.h ... Fixes #993	2013-09-15 22:49:24 +02:00
Daniel Molkentin	5e5a77b040	Fix parameter order	2013-09-15 22:48:12 +02:00
Daniel Molkentin	e420ae6942	Folder Wizard: Fix various issues ... - Use data role for pathes - call root dir "ownCloud" - don't connect() multiple times - ensure chars like # or ? in path are interpreted as part of the url path segment Should fix #992	2013-09-15 22:47:35 +02:00
Thomas Müller	e38d0807c9	moving back to 1024 as divider for kB, MB, GB & TB ... (cherry picked from commit c87c456ae0)	2013-09-13 20:14:47 +02:00
Thomas Müller	c87c456ae0	moving back to 1024 as divider for kB, MB, GB & TB	2013-09-13 15:00:49 +02:00
Daniel Molkentin	f97bb240d7	Setting thread priority is only possible after calling start()	2013-09-11 15:52:07 +02:00
Daniel Molkentin	574e029254	Setting thread priority is only possible after calling start()	2013-09-11 15:51:06 +02:00
Klaas Freitag	ce5934461e	Do not en- or disable the watcher in setSyncEnabled. ... The watcher is handled through the start and stop sync hooks in the folder class. Even if the the folder is disabled and the watcher fires, the folder does not schedule because it checks first if the folder is enabled.	2013-09-11 12:33:07 +02:00
Klaas Freitag	80332fb6ab	Do not en- or disable the watcher in setSyncEnabled. ... The watcher is handled through the start and stop sync hooks in the folder class. Even if the the folder is disabled and the watcher fires, the folder does not schedule because it checks first if the folder is enabled.	2013-09-11 12:30:29 +02:00
Klaas Freitag	287ec2f3df	Enable and disable syncing also in the folder objects.	2013-09-11 10:50:03 +02:00
Klaas Freitag	eb5824f713	Handle startup network errors correctly.	2013-09-11 10:49:45 +02:00
Klaas Freitag	eded901f69	Minor code cleanups-	2013-09-11 10:49:10 +02:00
Klaas Freitag	6f637e40d8	Enable and disable syncing also in the folder objects.	2013-09-11 10:32:09 +02:00
Klaas Freitag	ec06663dee	Handle startup network errors correctly.	2013-09-11 10:32:09 +02:00
Klaas Freitag	3c5c432e1d	Minor code cleanups-	2013-09-11 10:32:09 +02:00
Olivier Goffart	927f7549d4	Revert "Compile (find httpbf)" ... This reverts commit 2d2e843804. Turns out i had an old build of csync	2013-09-11 09:00:27 +02:00
Olivier Goffart	177114f8d9	Initialize the size of the SyncItem	2013-09-11 08:49:09 +02:00
Olivier Goffart	6bfdfd1af0	Fix progress with new propagator	2013-09-11 08:42:29 +02:00
Olivier Goffart	2d2e843804	Compile (find httpbf)	2013-09-11 08:11:03 +02:00
Daniel Molkentin	fd30df82cb	Folder Wizard: More sanity checks ... Check if a server folder or its parent is already part of a sync and refuse to create a sync in this case. Avoids "recursive syncing" Fixes #962	2013-09-10 23:38:00 +02:00
Daniel Molkentin	55f2fcb4c6	Folder Wizard: More sanity checks ... Check if a server folder or its parent is already part of a sync and refuse to create a sync in this case. Avoids "recursive syncing" Fixes #962	2013-09-10 23:37:52 +02:00
Daniel Molkentin	d8888432c3	Send basic auth in utf8. ... Implies circumventing QAuthenticator and handling authentication manually again. Fixes #941	2013-09-10 23:04:10 +02:00
Daniel Molkentin	59425741b6	Send basic auth in utf8. ... Implies circumventing QAuthenticator and handling authentication manually again. Fixes #941	2013-09-10 23:03:52 +02:00
Daniel Molkentin	3577ba2981	Fix httpbf/neon linkage	2013-09-10 19:50:44 +02:00
Daniel Molkentin	48b4c57d92	Use shared version of libhttpbf, package it on win	2013-09-10 14:45:08 +02:00
Daniel Molkentin	f597f99198	Wait up to 30 secs before complaining about missing systray ... Conflicts: src/mirall/utility.cpp Fixes #949	2013-09-10 11:40:02 +02:00
Daniel Molkentin	00d09763af	Fix compile error	2013-09-10 11:37:52 +02:00
Daniel Molkentin	5639572ef3	Wait up to 30 secs before complaining about missing systray	2013-09-10 11:37:52 +02:00
Olivier Goffart	6da2f6bbaa	Qt5: QSettings is no longer case insensitive	2013-09-09 14:00:13 +02:00
Olivier Goffart	198cb43ad6	Qt5: Q_WS_* macro were deprecated, replace by QT_OS_* ... in particular, QT_WS_X11 is no longer defined	2013-09-09 13:31:39 +02:00
Daniel Molkentin	51a7cbeb55	kill warning	2013-09-05 20:15:55 +02:00
Daniel Molkentin	171a9e1575	fix Qt 5 build on Mac/Win	2013-09-05 19:53:39 +02:00
Klaas Freitag	76deabe4df	Use List to handle errors and display multiline.	2013-09-05 19:28:23 +02:00
Klaas Freitag	74ec37f3c7	Use List to handle errors and display multiline.	2013-09-05 19:25:59 +02:00
Daniel Molkentin	6b9950a9a0	Qt5: DBUS is only needed for FDO	2013-09-05 18:41:49 +02:00
Daniel Molkentin	35ac6610c7	Compile with Qt5 on Linux	2013-09-05 17:13:31 +02:00
Daniel Molkentin	23d8f01012	Fix locating translations on linux	2013-09-05 11:08:00 +02:00
Daniel Molkentin	05178f0fbf	Fix locating translations on linux	2013-09-05 11:06:40 +02:00
Klaas Freitag	8fe102662d	Merge branch 'propagator-ng': Fixes to work with new LGPL ocsync. ... Conflicts: src/mirall/csyncthread.cpp	2013-09-04 16:33:06 +02:00
Daniel Molkentin	625b21152e	Merge branch 'qt5'	2013-09-04 15:01:21 +02:00
Klaas Freitag	4fa6faf608	Hide quota and display explanation if no quota info is available.	2013-09-03 14:25:28 +02:00
Klaas Freitag	a24ae13d9c	Added logging to quota info result slot.	2013-09-03 14:25:28 +02:00
Daniel Molkentin	64dd0d1b45	Consistent look for top-labels	2013-09-03 14:24:34 +02:00
Klaas Freitag	81c720c05b	Remove dots from the end of error messages.	2013-09-02 17:37:16 +02:00
Klaas Freitag	edcdcb945a	Show the reason why a file was ignored.	2013-09-02 17:25:23 +02:00
Daniel Molkentin	ab4c6247c7	Fix display of "Monochrome icon" setting ... The logic was inverse, and there was a typo in the string. Oh my...	2013-08-31 14:14:24 +02:00
Olivier Goffart	02b3033ca3	Use the same convention as on the server to format strings ... * use power of 10 SI units * use "B" instead of "bytes" * use at least 2 significant digit, but no more than one digit after the period	2013-08-29 12:06:41 +02:00
Olivier Goffart	a27c8ad90c	Fix crash in case of error ... the QObject::parent() is 0	2013-08-28 21:26:42 +02:00
Olivier Goffart	bf6d0a521c	Compile with Qt5	2013-08-28 20:58:22 +02:00
Olivier Goffart	336bbb2403	Compile with Qt4	2013-08-28 20:14:40 +02:00
Daniel Molkentin	73da086964	Initial changes to also build on Qt5, doesn't compile yet	2013-08-28 17:03:31 +02:00
Daniel Molkentin	58f4f3623f	Startup: Unity has no proper Systray implementation ... ...so it can't respond to isSysTrayAvailable()	2013-08-28 15:51:00 +02:00
Daniel Molkentin	18a58f73de	Startup: Unity has no proper Systray implementation ... ...so it can't respond to isSysTrayAvailable()	2013-08-28 15:45:52 +02:00
Olivier Goffart	c15de69156	Reconfigure the proxy when needed	2013-08-27 10:02:59 +02:00
Daniel Molkentin	b97701586e	Properly install icons	2013-08-26 21:18:56 +02:00
Daniel Molkentin	ec5c65a530	install correct file	2013-08-26 20:35:56 +02:00
Daniel Molkentin	77e7a1fa8d	Fix casing in settings dialog	2013-08-26 20:22:24 +02:00
Daniel Molkentin	f6d45b68ef	More clear error messages	2013-08-26 20:20:10 +02:00
Daniel Molkentin	24d76a0d75	desktop file == executable	2013-08-26 20:20:10 +02:00
Olivier Goffart	c3326efe94	Do not sort the entries in the syc protocol dialog alphabetically ... The entries should be sorted chronogically. But now the QTreeWidget can only sort them alphabetically by the time, which is not what we want. Disalbe the sorting, and always insert the elements in the reverse order. Fix #890	2013-08-26 17:27:44 +02:00
Daniel Molkentin	c0e056bb84	Only show help if a URL is provided	2013-08-26 14:27:39 +02:00
Olivier Goffart	e78eab46ff	Fix saving the geometry of the log browser	2013-08-23 12:41:29 +02:00
Olivier Goffart	19a08f8d5e	Make remember the size of the settings dialog ... Before, we saved the geometry in the closeEvent which is only called if the user press the [x] in the title bar. But it is not called when the user accept the dialog (by pressing the close button or the enter key) So save the geometry in the destructor of the dialog instead. One also must call delete from the Application destructor because it was leaking	2013-08-23 12:25:16 +02:00
Olivier Goffart	c6319117fd	Better default size for the setting dialog	2013-08-23 11:59:49 +02:00
Daniel Molkentin	b0ab3ca80b	Theme: Add documentation after recent changes	2013-08-23 10:36:09 +02:00
Daniel Molkentin	9f89a2fe76	More adjustments around the application name ... - libname is now derived from binary name (which is lowercase) - remove superflouos reimplementation of appName() in owncloud theme - APPLICATION_SHORTNAME is now optional (and if not set, equals APPLICATION_NAME	2013-08-23 10:30:03 +02:00
Daniel Molkentin	e386bfb550	fix x-compilation	2013-08-23 00:36:05 +02:00
Olivier Goffart	d3a333e03c	Fix the 'copy button' in the protocol log ... Fix #863 Also added more padding for the filename because it might be big, and in case it's not enough, always add at least a space.	2013-08-22 16:20:04 +02:00
Olivier Goffart	04d3e282fb	Stop the poll timer when the folder is disabled ... No need to request etag every 30 second for disabled folder. When the folder is re-enabled, the Timer is actived again after the sync	2013-08-22 12:35:28 +02:00
Olivier Goffart	4be5f970d5	Default to no limit upload ... We don't want to make the transfer slow by default	2013-08-22 12:26:34 +02:00
Daniel Molkentin	42abf4101c	Honor cmake's install prefix ... since the entire ting is so incredibly broken in cmake, use the approach taken by csync (which emulates the approach of autotools), to get the directories right. This mandates changes in the theme, which need discussion (APPLICATION_SHORTNAME must now equal appName(), and APPLICATION_NAME should equal appGuiName()).	2013-08-22 09:40:25 +02:00
onnozweers	13a6393ec5	Adding "Type=Application" to desktop file (to fix autostart in Ubuntu)	2013-08-21 22:11:02 +02:00
Olivier Goffart	3c2bb1e2bc	Compile after the merge	2013-08-21 15:29:04 +02:00
Olivier Goffart	24af9f38f4	Merge branch 'csync_lgpl' into propagator-ng ... Conflicts: src/mirall/csyncthread.cpp src/mirall/csyncthread.h src/mirall/folder.cpp src/mirall/progressdispatcher.h src/mirall/syncfileitem.h	2013-08-21 13:19:02 +02:00
Daniel Molkentin	e5117a98c9	Quota bar: Reduce border width to 1px per request ... As requested by Jan	2013-08-21 11:34:49 +02:00
Daniel Molkentin	c1f7af7e6f	Write desktop file manually, add gnome startup property ... Fixes #893	2013-08-21 11:09:56 +02:00
Olivier Goffart	b4c116e2a2	Add the new directories comming from the sync in the watcher	2013-08-21 00:45:36 +02:00
Klaas Freitag	98efab83a1	Compile against ocsync based on csync 0.50	2013-08-20 13:26:03 +02:00
Olivier Goffart	29d2094626	Hide password in the account settings ... Fix #811	2013-08-19 13:42:01 +02:00
Klaas Freitag	c3b82e6818	Fix sequence for recently changed items.	2013-08-19 13:06:48 +02:00
Olivier Goffart	1a7c89326b	Fix crash when finishing the wizard ... As shown on this backtrace: =13334== Invalid read of size 8 QCoreApplication::postEvent(QObject*,QEvent*, int) Mirall::ownCloudInfo::slotReplyFinished() [...] ==13334== Address 0x1afb91d8 is 8 bytes inside a block of size 16 free'd operator delete(void*) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) QNetworkAccessManager::~QNetworkAccessManager() Mirall::MirallAccessManager::~MirallAccessManager() [...] Mirall::ownCloudInfo::setNetworkAccessManager(QNetworkAccessManager*) Mirall::ownCloudInfo::setCustomConfigHandle(QString const&) Mirall::OwncloudSetupWizard::slotAssistantFinished(int) [...] Mirall::OwncloudWizard::basicSetupFinished(int) Mirall::OwncloudWizard::slotCurrentPageChanged(int) [...] QWizard::currentIdChanged(int) (in Mirall::OwncloudWizard::successfulStep() Mirall::OwncloudSetupWizard::finalizeSetup(bool) Mirall::OwncloudSetupWizard::slotAuthCheckReply(QString const&, [...] Mirall::ownCloudInfo::ownCloudDirExists(QString const&, QNetworkReply*) Mirall::ownCloudInfo::slotReplyFinished() The QNetworkManager was destroyed in a slot connected to a signal emited by slotReplyFinished, but we did not finish with the QNetworkReply yet. Fix the crash by using QueuedConnection so the QNetworkAccessManager is not destroyed before slotReplyFinished has completed.	2013-08-19 12:43:52 +02:00
Daniel Molkentin	3a1f04ac2d	Allow folders with characters that need percent-encoding ... Fixes #191	2013-08-18 20:24:24 +02:00
Daniel Molkentin	2c8e95a0f4	Be more specific when disconnecting the signal ... Fixes a crash, amends be48cb646c	2013-08-18 19:41:01 +02:00
Klaas Freitag	a9d94ef732	Show error message in status dialog in error case.	2013-08-18 19:27:20 +02:00
Klaas Freitag	2756d17873	Fix/add missing status strings to theme.	2013-08-18 19:20:25 +02:00
Klaas Freitag	34d7f84fc2	Minor cleanup.	2013-08-18 17:59:03 +02:00
Daniel Molkentin	cea9b389bf	Account Settings: Use native highlight color	2013-08-18 17:00:37 +02:00
Daniel Molkentin	71b1e881d8	Setup Wizard: Only label button "Connect" where suitable	2013-08-18 15:23:52 +02:00
Daniel Molkentin	7ba47e9d44	Code formatting fixes	2013-08-18 15:23:52 +02:00
Daniel Molkentin	be48cb646c	Setup wizard: Start sync when displaying result page	2013-08-18 15:23:52 +02:00
Klaas Freitag	47eb5ff1d9	Do not keep the log if the log window is not visible.	2013-08-18 13:28:40 +02:00
Klaas Freitag	b608f5a670	Progressbar and quota bar tweaking.	2013-08-17 22:56:02 +02:00
Klaas Freitag	e81dc34c4e	Add a tooltip in the sync protocol list.	2013-08-17 17:57:33 +02:00
Klaas Freitag	1603e627a3	Remove superflous conflict case.	2013-08-17 17:57:33 +02:00
Klaas Freitag	bf978b3e0f	Handle Progress as a namespace rather than a class.	2013-08-17 17:57:33 +02:00
Klaas Freitag	0fdaf33288	Use correct translation call from QCoreApplication.	2013-08-17 17:57:33 +02:00
Klaas Freitag	367c4153c1	Show a bubble if the quota was exceeded.	2013-08-17 17:57:33 +02:00
Klaas Freitag	395c673a24	Fix the quota bar for quotas larger 100%.	2013-08-17 17:57:32 +02:00
Olivier Goffart	22de23c651	Fix the 'no limit' upload setting ... Fix issue #879	2013-08-17 16:11:45 +02:00
Olivier Goffart	23926d2461	small leak	2013-08-16 20:18:35 +02:00
Olivier Goffart	c03f31b6ba	put the 'Account' item first	2013-08-16 15:09:54 +02:00
Olivier Goffart	a1060a8538	fixup the layout of the account settings	2013-08-16 15:03:38 +02:00
Daniel Molkentin	b9228e64ff	Make Folder Reset an expert option (F5) ... This feature should not be required, but might be helpful in the debugging process.	2013-08-15 17:00:07 +02:00
Olivier Goffart	c4084de716	Remove the 'Remove Account' button ... It is not doing anything right now, and we have no plans to implement it in a short future Fix Issue #866	2013-08-15 16:42:08 +02:00
Olivier Goffart	3c667918e7	Fix Reconfiguration keeps sync folder definition ... Issue #875	2013-08-15 16:35:03 +02:00
Olivier Goffart	e55745cbcf	Remove connection from unexisting signal to unexisting slot	2013-08-15 16:16:22 +02:00
Daniel Molkentin	e01ce20431	Wizard: Do not use FormLayout for URL line edit ... Looks ugly on Mac Fixes #870	2013-08-15 15:58:20 +02:00
Olivier Goffart	dce8cb83d9	Do not forget the config on the second page of the wizzard ... Fixes mirral issue #874 where certificate was not stored on the first page	2013-08-15 15:45:16 +02:00
Olivier Goffart	8dc956c55b	Put all the debug in the log window ... Don't emit debug before we installed the hook and created he log window Also no debug if we use --help	2013-08-15 15:45:16 +02:00
Daniel Molkentin	6c77921a32	Admendment of last commit	2013-08-15 13:09:20 +02:00
Daniel Molkentin	55e4748f06	allow relative directories for --confdir	2013-08-15 13:01:05 +02:00
Daniel Molkentin	5ff9e02517	Implement --logfile - (log to stdout)	2013-08-15 12:24:52 +02:00
Daniel Molkentin	7f7ebc36f5	Fix showing help when app is running	2013-08-15 12:24:52 +02:00
Klaas Freitag	0e5bfc03ce	Removed label on request of Jan.	2013-08-15 12:17:01 +02:00
Klaas Freitag	b309d333a6	Minor wording and margin fixes.	2013-08-15 11:30:48 +02:00
Daniel Molkentin	ee439382ed	Logger: always log to log widget	2013-08-15 10:56:16 +02:00
Klaas Freitag	192212c682	Handle quota exceeding as error.	2013-08-15 08:15:43 +02:00
Klaas Freitag	148bdfdcd6	Some minor cleanups.	2013-08-15 08:15:43 +02:00
Olivier Goffart	e4128cd5d8	progress with new propagator	2013-08-14 19:59:16 +02:00
Daniel Molkentin	9651f1cddf	Folder Wizard: Decode percent encoding	2013-08-14 19:24:02 +02:00
Daniel Molkentin	5feb9b0806	folderwizard: layout fixes	2013-08-14 19:24:02 +02:00
Klaas Freitag	44b9ee19e7	Flatten the itemprogressdialog and show a flat list.	2013-08-14 18:24:06 +02:00
Klaas Freitag	cc16d19bc4	Removed unused defines.	2013-08-14 18:24:06 +02:00
Klaas Freitag	b96c2de2b7	Cleaned folder class, removed a couple of signals and helper classes.	2013-08-14 18:24:06 +02:00
Klaas Freitag	f882b80708	Fix wording to more consolidated style, Jan request.	2013-08-14 18:24:06 +02:00
Daniel Molkentin	4d7c014b23	Resize dialog	2013-08-14 17:47:10 +02:00
Daniel Molkentin	1f274699e5	Pressing F12 in Settings now open the log browser	2013-08-14 17:46:58 +02:00
Daniel Molkentin	697e355f07	Hide mono icon options if the resource has no mono icons	2013-08-14 16:35:42 +02:00
Olivier Goffart	f8e6326880	Default to not cancel ... So that the owncloudcmd client is not blocked	2013-08-14 15:44:30 +02:00
Olivier Goffart	67c5f513aa	Fix compilation after merge	2013-08-14 15:36:34 +02:00
Olivier Goffart	0589bfc51b	Merge branch 'master' into propagator-ng ... This just fix the conflict. Do not compile or work yet Conflicts: src/CMakeLists.txt src/mirall/csyncthread.cpp src/mirall/csyncthread.h src/mirall/owncloudfolder.cpp src/mirall/syncfileitem.h test/CMakeLists.txt	2013-08-14 15:19:21 +02:00
Olivier Goffart	04f32bd397	Revert "TMP threaded" ... This reverts commit 5bb4c3be43.	2013-08-14 14:59:32 +02:00
Olivier Goffart	e89bdfc422	Make the Pause button stop the sync	2013-08-14 14:57:56 +02:00
Olivier Goffart	c2cc9e62a7	Fix the brandwith limit ... The unit in mirall are in kbytes/s, but csync expect byte/s	2013-08-14 14:57:56 +02:00
Daniel Molkentin	1f2ae0d061	Folder Wizard UI clean up ... Input from Jan	2013-08-14 14:01:33 +02:00
Olivier Goffart	91a39588c6	re-enable the sync if the syncing was disabled because the connection is down at startup	2013-08-14 12:59:56 +02:00
Olivier Goffart	a642f86d5b	Detect connection failure from the polling	2013-08-14 12:34:03 +02:00
Olivier Goffart	00cf290574	reduce a bit the log output	2013-08-14 12:34:03 +02:00
Daniel Molkentin	b59952b539	Wrap custom message label	2013-08-14 11:58:03 +02:00
Daniel Molkentin	88b4ff9809	Wording changes proposed by Jan	2013-08-14 11:57:19 +02:00
Daniel Molkentin	ddd0965a82	Fix include after class rename	2013-08-14 11:11:47 +02:00
Klaas Freitag	0a9491ff46	Improved timestamp formatting in item sync progress dialog.	2013-08-14 08:04:46 +02:00
Klaas Freitag	32b44e3d87	Removed unused dialog class.	2013-08-14 08:04:46 +02:00
Klaas Freitag	268004b4ff	Get correct action kind from progress Dispatcher in case of Context ... kind.	2013-08-14 08:04:46 +02:00
Daniel Molkentin	6c0f6ae62e	Make copy action copy all fields again ... Fixes #863	2013-08-13 15:39:28 +02:00
Yoann Laissus	b058185d3b	Don't add empty entries in hidden files editor with an empty string ... or when cancel is clicked	2013-08-12 13:10:16 +02:00
Olivier Goffart	82fb8c49cf	Do not clear the pending event in the polling anymore ... This is useless, and can even cause problems now since polling only do a sync when the server has actually changed	2013-08-09 14:10:21 +02:00
Daniel Molkentin	d3378c131a	Fix formatting for 1 byte size in octetsToString()	2013-08-09 13:02:24 +02:00
Daniel Molkentin	ff4d2d488f	Add cancel button to wizard on Mac ... Fixes #848	2013-08-09 01:08:46 +02:00
Daniel Molkentin	b0852b4cf5	No ... for entires that do not spawn a dialog	2013-08-08 20:27:16 +02:00
Daniel Molkentin	c047b4d4de	Seems autowrapping doesn't work everywhere. Enforce it	2013-08-08 17:52:09 +02:00
Olivier Goffart	6655da9d24	Fix warning	2013-08-08 16:03:57 +02:00
Daniel Molkentin	4e3d4c3153	Credits: Add Jan	2013-08-08 15:51:36 +02:00
Olivier Goffart	52a47fbc67	Force a sync run after 5 minutes	2013-08-08 14:32:14 +02:00
Daniel Molkentin	0086916b4d	Retain all old settings when running the setup wizard ... Fixes #825 Fixes #759	2013-08-08 13:04:05 +02:00
Klaas Freitag	df5ef6fe67	Added new information icon.	2013-08-08 11:16:28 +02:00
Klaas Freitag	c9e51dcfc1	Display properly elided text in progress.	2013-08-08 11:16:28 +02:00
Daniel Molkentin	c05adfd817	Open Top-Level-Dialogs modal, not semi-modal	2013-08-08 10:36:09 +02:00
Daniel Molkentin	055410e38f	Setup proxy connection before every sync	2013-08-08 00:46:23 +02:00
Krzesimir Nowak	87cb2a7114	Set busy cursor when doing page loading in browser.	2013-08-07 15:05:42 +02:00
Krzesimir Nowak	a875b46a80	Add cookie handling for Shibboleth credentials. ... Which cookies are going to be stored are determined only when setting up or modifying an account. Cookie handling allow us to avoid choosing Identity Provider everytime when browser page appears.	2013-08-07 15:03:13 +02:00
Krzesimir Nowak	704ba791fd	Fail the sync if we close the browser without passing proper credentials.	2013-08-07 15:03:13 +02:00
Daniel Molkentin	c24d6bd71c	Notify user if there is a problem with the inotify watcher	2013-08-07 15:00:10 +02:00
Daniel Molkentin	9b319cf189	Significantly simply logging	2013-08-07 15:00:10 +02:00
Klaas Freitag	1a9eb19f0d	Fix even more compile warnings.	2013-08-07 14:51:31 +02:00
Klaas Freitag	1943cc60b6	Added missing switch cases to calm compiler warnings.	2013-08-07 14:46:57 +02:00
Daniel Molkentin	f8878833de	Fix compiler warning	2013-08-07 12:18:44 +02:00
Klaas Freitag	364d4340fd	Show a more informative problem message in progress.	2013-08-07 12:15:28 +02:00
Klaas Freitag	6226a6ee8f	Enable delete messages for progress display.	2013-08-07 10:28:34 +02:00
Daniel Molkentin	c49edeb09d	Fix regression in FolderWizard over 1.3 ... Now it's possible to also pick subdirectory of in arbitrary depths again	2013-08-06 21:50:22 +02:00
Klaas Freitag	7e794cd94f	Tell the progress dialog about a new sync result object.	2013-08-06 18:07:59 +02:00
Klaas Freitag	933a62de01	Add recent action entries in correct sequence to menu.	2013-08-06 18:07:31 +02:00
Klaas Freitag	23f8e3b4f8	Allow Delete notification.	2013-08-06 18:06:54 +02:00
Klaas Freitag	3502edf71b	More detailed strings for the progress kind.	2013-08-06 18:06:39 +02:00
Klaas Freitag	4d8a371e43	Display information from SyncResult.	2013-08-06 18:06:05 +02:00
Klaas Freitag	01fd3242c4	Add folder alias to sync result structure.	2013-08-06 18:04:42 +02:00
Klaas Freitag	9c289334e9	Handle notifications for deletes.	2013-08-06 18:04:08 +02:00
Krzesimir Nowak	002142539b	Remove most of the dead code in Shibboleth setup page. ... The effect of most of the code wasn't even visible after making a browser an independent window.	2013-08-06 14:56:26 +02:00
Krzesimir Nowak	e1d1c10fad	Fix workflow in wizard. ... Pressing back in third window should show us browser again. Closing browser window should show us server setup window again.	2013-08-06 14:35:11 +02:00
Krzesimir Nowak	577bc546d8	Handle SSL problems also for Shibboleth servers.	2013-08-06 11:56:27 +02:00
Olivier Goffart	a9f23a8331	Get the etag of all subfolder for the root directory ... The root directory etag is not updated when the files change. That's why we need to check the etag of all its sub items	2013-08-05 20:13:39 +02:00
Olivier Goffart	5d24599546	Fetch the etag of the folder to see if it has changed before syncing ... Notice that this does not work for the toplevel directory yet, as owncloud does not change the etag of the root folder	2013-08-05 20:13:39 +02:00
Olivier Goffart	07d9d3770b	Refactor: move the pollTimer to the folder	2013-08-05 20:13:39 +02:00
Daniel Molkentin	c9ddb12b5a	Build after merge	2013-08-05 20:14:22 +02:00
Daniel Molkentin	0932ee6051	Merge branch 'shibboleth' ... Conflicts: src/CMakeLists.txt src/mirall/application.h	2013-08-05 19:54:06 +02:00
Daniel Molkentin	ee1b8465a3	Revert "Temporarily log HTTP traffic done by MirallAccessManager." ... This reverts commit 5930ca8ac7.	2013-08-05 19:47:48 +02:00
Daniel Molkentin	26bd164168	Safer implementation for substitution of WebDav URL ... - Use of RegEx is dangerous with folder names containing e.g. '(' or ')'. - Didn't work in my case at all.	2013-08-05 19:45:24 +02:00
Krzesimir Nowak	00e819bd92	Make sure we don't append several copies of cookies for syncing. ... Also, make sure we don't append old Shibboleth ones as well.	2013-08-05 18:39:26 +02:00
Krzesimir Nowak	740d33b378	Revert "Go back if browser in wizard is destroyed before getting a cookie." ... This reverts commit da370c8b36.	2013-08-05 17:57:32 +02:00
Krzesimir Nowak	f0b284eda7	Refresh Shibboleth cookie if it gets outdated during sync.	2013-08-05 17:42:03 +02:00
Krzesimir Nowak	da370c8b36	Go back if browser in wizard is destroyed before getting a cookie.	2013-08-05 17:29:11 +02:00
Olivier Goffart	203b9c7f6b	leak fix	2013-08-05 16:49:18 +02:00
Daniel Molkentin	7932ec3cc1	IgnoreListEditor: slightly better text	2013-08-05 16:26:17 +02:00
Daniel Molkentin	3f15e02881	Add support for deletable ignores in IgnoreListEditor.	2013-08-05 16:13:26 +02:00
Olivier Goffart	6fb5c04bde	Finish danimo's patch that refactor the scheduler ... Wait a full poll interval after the end of the sync	2013-08-05 15:15:15 +02:00
Olivier Goffart	578bcc3522	Remove scheduler logic from folderman and moved it in folderman ... Also fetch and parse the etag when doing a PROPFIND to get the quota (Patch from danimo)	2013-08-05 15:15:15 +02:00
Daniel Molkentin	99dea76fd1	Fix path display in folder wizard ... The new implementation did not work correctly when owncloud is installed in a subdirectory.	2013-08-05 14:28:05 +02:00
Klaas Freitag	67f57a443c	Disable unknown csync flags for now.	2013-08-05 12:30:24 +02:00
Klaas Freitag	2b3b4f9daf	Start setup wizard if no config exists on startup.	2013-08-05 12:19:53 +02:00
Klaas Freitag	16d81db117	Show deletes in progress.	2013-08-05 09:39:06 +02:00
Krzesimir Nowak	5930ca8ac7	Temporarily log HTTP traffic done by MirallAccessManager. ... To be reverted later.	2013-08-02 14:30:15 +02:00
Klaas Freitag	49be4a3be2	Propagate soft errors into SyncResult, icon fixes.	2013-08-02 14:22:01 +02:00
Klaas Freitag	5e82dc1841	Some more refinements on item progress	2013-08-02 12:16:21 +02:00
Klaas Freitag	6ce1c17ee1	Give application class control over itemprogressdialog	2013-08-02 11:33:45 +02:00
Krzesimir Nowak	fb79b8a7f8	Omit the server setup page in wizard if URL is overriden by theme.	2013-08-01 19:17:41 +02:00
Krzesimir Nowak	b0236eaa24	Fix folder item being inactive.	2013-08-01 19:11:05 +02:00
Daniel Molkentin	19bbff708e	Improve FolderWizard	2013-08-01 18:22:13 +02:00
Klaas Freitag	1399ea13cc	Fixed rounding of size display.	2013-08-01 16:58:36 +02:00
Klaas Freitag	a25d9fd3b4	Added itemprogressdialog class to show the sync progress and problems.	2013-08-01 16:58:36 +02:00
Krzesimir Nowak	72d51e4667	Show browser as independent window instead of putting it into dialog. ... When browser is shown, dialog is hidden. It reappears after we are done with logging in.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	f6e3838eb2	Create a QNetworkAccessManager subclass which sets proper user agent and use it.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	c1fdecae2d	Fix misc warnings.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	4104db65bb	Remove unused method.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	36cb827406	Print correct subtitles when modifying account details.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	69a4558fe4	Actually use the remoteFolder sent by signal.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	928eae419f	Hide resolution widget in advanced setup page if nothing has changed.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	50edac8ee8	Split setup page into server and advanced parts.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	945951cda5	Fix indentation.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	fa95a638af	Fill username in HTTP credentials setup page.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	3b6aeb1fc8	Make browser inside Shibboleth wizard page a bit larger.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	6543a01418	Fix warnings emitted by clang.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	9724e52f1b	Fix warnings. ... Should be now compilable when run with -Wall -Wextra -Wpedantic -Werror.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	9413a30a08	Fix build when using QtKeyChain.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	6a9a2559d2	Fix shibboleth syncing after client restart. ... We needed to notify shibboleth-specific QNAM about new cookie and then stop cramming that cookie into request via setHeader, but rather put it to cookie jar and let Qt handle the cookie insertion into requests.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	78b6f4df01	Move the creds/ and wizard/ directories one level higher.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	b7e88aa2ef	Fix copyright headers.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	224fd21612	Fix displaying URL in account settings. ... I deleted too much code there last time.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	a6bf33c501	Make "Connect" button inactive until we get a Shibboleth cookie.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	306a9421fb	Avoid a crash when disposing Shibboleth browser.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	d5885daf0f	Move credential related files to creds directory. ... CredentialStore is now only used for HTTP credentials, so it was moved into http directory under creds.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	52b3f7105d	Remove unused stuff.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	7f6dc291c0	Create HTTP credentials object for config without type value.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	eacb849353	Fix credentials handling in csync. ... CSync module's properties can be set only after it was initialized, so we split the sync context vfunc into two: the one ran before initialization and the one ran before sync beginning.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	367bc401ee	Add Shibboleth credentials implementation.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	92af3ea725	Add and use credentials abstraction. Implement HTTP and dummy credentials. ... To achieve that MirallConfigFile now exports several general settings-related methods for subclasses (here: for HttpConfigFile), so it does not have to contain any code targeted for specific credentials.	2013-08-01 16:53:43 +02:00
Krzesimir Nowak	582ce4cfa0	Cleanup setup wizard. Split setup page into two. ... First page is for giving server URL and advanced setup and second page is for giving credentials. Second page will differ based on authentication type supported by ownCloud server. For now only HTTP credentials are supported.	2013-08-01 16:53:43 +02:00
Daniel Molkentin	1967226c71	fix networksettings.ui _again_	2013-08-01 13:48:42 +02:00
Klaas Freitag	a64724be0e	More sophisticated progress, add Recent Changes Menu to tray. ... ProgressDispatcher now stores a queue of events as well as sync problems, better known as soft errors. The tray menu displays a sub menu with 5 recent changes and adds a more... button that shows a warning icon if soft errors had happend. More to implement.	2013-07-30 22:24:48 +02:00
Klaas Freitag	a0d9d41455	Use const reference parameters for custom struct parameters.	2013-07-30 22:24:48 +02:00
Klaas Freitag	84e8ab5b71	Make progress aware of errors, first step.	2013-07-30 22:24:48 +02:00
Markus Goetz	f5bbb12434	Crash hotfix, need to dig down actual cause	2013-07-30 15:49:57 +02:00
Daniel Molkentin	f1878640c8	Linux: install all available icon sizes	2013-07-27 13:06:38 +02:00
Klaas Freitag	edf8147561	Small cleanups.	2013-07-26 15:10:03 +02:00
Klaas Freitag	3a9ab3a86f	Consolidated progress displaying to a single slot from csync.	2013-07-26 13:44:38 +02:00
Klaas Freitag	8f912ca0c5	Adopt to new progress API in csync, WIP	2013-07-25 16:28:45 +02:00
Olivier Goffart	a827056d28	Fix upload limit	2013-07-25 11:21:02 +02:00
Klaas Freitag	6c90989584	Make progress display more robust.	2013-07-25 11:00:19 +02:00
Daniel Molkentin	08acf5e9aa	Network Settings: Reword entries, fix uic warnings	2013-07-25 10:41:44 +02:00
Daniel Molkentin	bca295183b	Make use of bandwidth limiting, split general/network settings. ... Fixes #14	2013-07-24 19:53:20 +02:00
Markus Goetz	a400a2e0bb	OS X: Fix window messup	2013-07-24 17:06:35 +02:00
Daniel Molkentin	8c15839753	Remove all >= Qt 4.7 ifdefs	2013-07-24 15:34:37 +02:00
Klaas Freitag	810024f4c9	Reworked progress display for more performance. ... Moved most of the logic to the dialog class to be able to only update the GUI if there are really changes rather than doing it whenever a change happens.	2013-07-24 14:40:47 +02:00
Klaas Freitag	de7bcca5fe	Fixed signal and slot parameter list for progress.	2013-07-24 14:40:47 +02:00
Klaas Freitag	6552a48639	Make compactFormatDouble a bit smarter.	2013-07-24 14:40:47 +02:00
Daniel Molkentin	aee0f0c882	make addFolderDefintion easier to read	2013-07-24 14:27:57 +02:00
Daniel Molkentin	e353193fbb	FolderMan: Remove dead code	2013-07-24 14:23:32 +02:00
Daniel Molkentin	fb547e9100	Fix/compactify comments in folderman.h	2013-07-24 14:16:52 +02:00
Markus Goetz	44289c8781	OS X: Fix compile	2013-07-24 14:08:16 +02:00
Daniel Molkentin	d4a5ab252d	Drop Compat with Qt 4.6 ... We now require Qt 4.7 due to QNAM	2013-07-24 13:59:03 +02:00
Daniel Molkentin	a3b3c28694	CSyncThread: Fix unreachable code	2013-07-23 14:34:06 +02:00
Klaas Freitag	976c41a3b8	Beautified ProgressDispatcher	2013-07-23 13:32:33 +02:00
Daniel Molkentin	da087292fd	First version of progress in the context menu	2013-07-23 13:19:17 +02:00
Klaas Freitag	274f59f93b	Reworked progress again following mirall bug #137	2013-07-23 12:23:29 +02:00
Klaas Freitag	85d810d2cf	Rename signal from folderProgress to itemProgress.	2013-07-23 12:23:20 +02:00
Daniel Molkentin	47f151c594	FolderWizard: Return targetPath properly	2013-07-22 23:14:41 +02:00
Daniel Molkentin	7b5ef2186e	Remove accidential change	2013-07-22 23:14:12 +02:00
Daniel Molkentin	8236dafb96	INotify backend: honor ignored files ... Actually this needs a careful redesign, but this is good enough to fix the issue. Fixes: #763	2013-07-22 21:39:13 +02:00
Daniel Molkentin	56e5627b6b	ownCloudFolder -> Folder ... Fixes #769	2013-07-22 20:30:38 +02:00
Daniel Molkentin	38db0eddab	Make selection of target ListView-based ... Fixes #222	2013-07-22 18:07:44 +02:00
Daniel Molkentin	710625e2a3	Spelling bee	2013-07-22 18:06:27 +02:00
Daniel Molkentin	a5e7af6c1f	Make FolderMan a singleton ... It doesn't "belong" to application (think about lib use cases). This is better.	2013-07-22 13:59:52 +02:00
Daniel Molkentin	5fe4d2db2b	Introduce MirallConfigFile::save/restoreGeometry()	2013-07-22 12:28:43 +02:00
Daniel Molkentin	b2c587e2f8	Settings: Show overall state as account icon ... Requires the previous refactoring commit	2013-07-22 12:11:12 +02:00
Daniel Molkentin	40c2d891c1	Refactor sync result ... Sync result computation is now owned by FolderMan	2013-07-22 12:10:13 +02:00
Klaas Freitag	d5ad3a8a70	Removed mistakenly checked in file.	2013-07-22 09:47:15 +02:00
Daniel Molkentin	c74382af4f	octetsToString: Add TB case to pretty printer	2013-07-20 01:27:41 +02:00
Daniel Molkentin	0be0111724	Use WA_DeleteOnClose for settings ... instead of trying brain dead things	2013-07-20 01:27:00 +02:00
Daniel Molkentin	f0d454b511	Ignore list editor fixes	2013-07-20 01:26:11 +02:00
Daniel Molkentin	b79a45403e	Implement UI changes discussed with Jan. ... Fixes #785 Fixes #782 Fixes #781	2013-07-19 22:14:21 +02:00
Klaas Freitag	1cc60e755b	Rather show overall progress in settings dialog.	2013-07-19 17:05:46 +02:00
Daniel Molkentin	7fb7cc8c46	Don't hardcode strings, use constants instead ... This hopefully reduces the chances for regressions during refactoring.	2013-07-19 16:28:12 +02:00
Daniel Molkentin	1400889b23	Small cleanups	2013-07-19 16:28:12 +02:00
Daniel Molkentin	44fa9bd141	remove skip save pwd parameter -- not used any longer	2013-07-19 16:28:12 +02:00
Klaas Freitag	992dffa032	Add an overall progress counter to progressDispatcher	2013-07-19 13:05:30 +02:00
Klaas Freitag	5fa7e48c24	Do not show the frame around the progress.	2013-07-19 11:07:47 +02:00
Klaas Freitag	3b00dfebed	Add a textual display of the file size in progress.	2013-07-19 10:04:09 +02:00
Klaas Freitag	b42c7e07e6	More work on progress display of file up and download. ... This is at least working for file upload, untested for downloads and other operations. Needs more testing and more polish.	2013-07-17 22:34:11 +02:00
Markus Goetz	ab7bfabf12	Put cookies into csync ... We already have the auth cookies from the quota request, so put them into csync to avoid a 401 roundtrip	2013-07-17 16:27:18 +02:00
Markus Goetz	ab72644ace	Check if quota request had HTTP 207	2013-07-17 15:08:48 +02:00
Daniel Molkentin	218fa040c8	Reduce thread priority	2013-07-16 16:05:37 +02:00
Daniel Molkentin	b8f783f104	Set proxies and ignored files before every sync run	2013-07-16 16:05:04 +02:00
Daniel Molkentin	edd9d9aee3	Fix disabled state _again_ ... Seems like a bug in Designer	2013-07-12 18:05:59 +02:00
Daniel Molkentin	8c66085621	Folder wizard: Warn if a chosen dir is read-only ... Fixes #755	2013-07-12 13:54:20 +02:00
Klaas Freitag	40ab325a37	Cleaned up credentialstore class a bit. ... Removed all "user mode" stuff from the class that was used to ask the user interactively for the password. We do not do that any more.	2013-07-12 12:22:11 +02:00
Klaas Freitag	7ae95b14f4	Added method to check if the password is in the config file.	2013-07-12 12:21:34 +02:00
Klaas Freitag	6b5b9db20a	Handle progress through ProgressDispatcher class, WIP.	2013-07-11 12:32:58 +02:00
Daniel Molkentin	eb39d144e4	Use default cookie jar again	2013-07-10 18:59:01 +02:00
Daniel Molkentin	cfaaf4a2c4	Don't always send Auth headers ... Use slotAuthentication again instead.	2013-07-10 18:57:52 +02:00
Daniel Molkentin	279a738aa6	General Settings: Fix spacing in layout	2013-07-10 12:46:43 +02:00
Daniel Molkentin	10b55f11a2	Fix build for Qt <= 4.6	2013-07-10 09:48:10 +02:00
Daniel Molkentin	25065c4151	Remember geometry of LogBrowser	2013-07-10 09:34:41 +02:00
Daniel Molkentin	d2657bc154	Do display floating points with precision of 1 ... For several GB of quota, we might end up showing <1% far too long. So show one decimal number, unless it's zero.	2013-07-10 09:34:41 +02:00
Daniel Molkentin	4fde3f4a65	Quota in Account Settings: properly round value	2013-07-10 09:34:41 +02:00
Daniel Molkentin	e398cfb27c	Introduce Utility::compactFormatDouble() ... Like QLocale::toString(double, 'f', prec), but drops trailing zeros after the decimal point.	2013-07-10 09:34:27 +02:00
Daniel Molkentin	3cc670ec29	Send non-standard port along with host ... In QNAM, that's actually the default, and we were overriding it incorrectly for no obvious reason. When using the QHTTP fallback, we need to submit a non-standard port manually. Fixes #748	2013-07-10 08:43:10 +02:00
Markus Goetz	c8d9e8458a	OS X: Find out if we are a startup item	2013-07-09 17:30:50 +02:00
Markus Goetz	892419e880	OS X: Ability to disable startup item	2013-07-09 17:13:41 +02:00
Markus Goetz	13fb49cf39	Make Jenkins happy	2013-07-09 14:23:58 +02:00
Markus Goetz	eabe3f968e	Raise settings dialog when creating ... Else at least on OS X it is burried somewhere.	2013-07-09 14:18:23 +02:00
Markus Goetz	2ca5eaaab9	utility.cpp: Make compile on OS X	2013-07-09 14:07:48 +02:00
Daniel Molkentin	eed3deac67	Acount Settings: Enable in place password change	2013-07-08 14:49:01 +02:00
Daniel Molkentin	a63863b65c	Detect missing system tray ... Fixes #497	2013-07-08 14:48:58 +02:00
Daniel Molkentin	748ff13bce	Utility::freeDiskSpace() ... Does not yet work for UNC locations	2013-07-08 14:48:17 +02:00
Daniel Molkentin	6c7700c2e7	Save size of settings dialog ... Fixes #541	2013-07-08 04:01:36 +02:00
Daniel Molkentin	c8ccb014c8	Use plural form for sync notification ... Fixes #419	2013-07-08 03:19:49 +02:00
Daniel Molkentin	f1bd14e8de	Remove superflous cast	2013-07-08 01:44:49 +02:00
Daniel Molkentin	024d01a192	Cleanly install themed clients next to owncloud on Unix ... - Renames libowncloudsync for themes - Properly names i18n dir	2013-07-08 01:44:49 +02:00
Daniel Molkentin	b2d02ef0bd	Improve labeling in case of root sync	2013-07-07 01:24:56 +02:00
Daniel Molkentin	751d7deda6	Utility: Compile on Windows again ... Theme moc files belong with libowncloud	2013-07-06 22:42:02 +02:00
Daniel Molkentin	fff795146e	Make Utility::*Startup* testable	2013-07-06 22:41:59 +02:00
Daniel Molkentin	c6219581f6	More work on ignore/exclude files: ... - Introduce split between sytem and user files - Add Editor Current limitation: Picking up the changes requires a restart	2013-07-05 16:54:11 +02:00
Klaas Freitag	d0c5fb2395	Check connection at startup through ConnectionValidator	2013-07-05 13:14:48 +02:00
Klaas Freitag	6c2c81dc83	Format integer to string.	2013-07-05 11:40:44 +02:00
Daniel Molkentin	bfdb0c0012	Enable autostart when the client has been configured	2013-07-05 01:05:23 +02:00
Daniel Molkentin	d870d6c326	Implement "Show Desktop Notifications" option (default: on) ... Should make #314 subscriber happy :-)	2013-07-05 01:01:23 +02:00
Daniel Molkentin	c06410e726	Implement Launch on Startup (Win, Linux). ... Mac OS started. Untested.	2013-07-05 00:25:19 +02:00
Daniel Molkentin	ef03ebe086	Remove obsolete include	2013-07-04 20:43:20 +02:00
Daniel Molkentin	a217e8f24c	Compile fix	2013-07-04 20:21:40 +02:00
Daniel Molkentin	c164beb040	Commit squashed refactoring branch ... - introduce settings dialog - general settings for general / proxy settings - standalone proxy settings dialog removed - standalone status dialog removed - moved status dialog into settings dialog - radically cut down links in context menu - add help link to context menu This needs more cleanup and testing. Known issues: - When the wizard is called while the settings dialog is open, it will not show old information (see FIXME) - Some settings are not implemented yet (greyed out) - The counter in the FileItemDialog is not correct the first time around. Based on the discussion done with Jan and Klaas during the Nuenberg workshop.	2013-07-04 20:02:44 +02:00
Klaas Freitag	5171e5880d	Initialize member var with zero to avoid crash.	2013-07-02 17:01:16 +02:00
Klaas Freitag	2ef62524d6	Use showTrayMessage instead of _tray directly	2013-07-02 17:01:16 +02:00
Klaas Freitag	4bbb29c2b4	Terminate sync process in the wizard rather than in folderman unload.	2013-07-02 17:01:16 +02:00
Klaas Freitag	261776cc78	Remove useless log message.	2013-07-02 17:01:16 +02:00
Daniel Molkentin	3008142b1b	lowercase webdav request	2013-07-01 14:21:04 +02:00
Daniel Molkentin	152e729768	thinko	2013-06-28 23:23:42 +02:00
Daniel Molkentin	e7c77df59e	Quota: Distinguish 0 and <1	2013-06-28 23:14:09 +02:00
Daniel Molkentin	4ff1a13f32	Implement folder display. ... - Displayed as disabled action - Refactor davRequest along the way - take Verb as QByteArray - pass along a QIODevice Not implemented for Qt < 4.8	2013-06-28 23:01:31 +02:00
Daniel Molkentin	b9b18d6120	Remove unused configfile instance	2013-06-28 22:28:18 +02:00
Daniel Molkentin	4945ce3c8c	Use awesome Qt template magic	2013-06-28 22:27:53 +02:00
Daniel Molkentin	efd11b61c6	Merge branch '1.3'	2013-06-28 11:47:09 +02:00
Daniel Molkentin	f2d289326b	More whitespace changes	2013-06-27 16:57:44 +02:00
Daniel Molkentin	a1767b2f7f	String whitespace fixes	2013-06-27 16:57:15 +02:00
Markus Goetz	5e9fcf7537	Raise setup wizard	2013-06-27 16:57:15 +02:00
Markus Goetz	8192cc7eea	Setup Dialog: Fix widget size issue (2)	2013-06-27 16:57:15 +02:00
Markus Goetz	2b8e1f2504	Setup Dialog: Fix widget size issue ... in advanced settings	2013-06-27 16:57:15 +02:00
Daniel Molkentin	9d01f80744	Fix Dialog behavior ... - Fix proxy dialog being callable multiple times - Use smart pointers in more places - _owncloudSetupWizard was guarded by a smart pointer, this needs to be accounted for in other code pathes. Fixes Setup dialog not showing up when left-clicking on unconfigured instances on Windows.	2013-06-27 16:54:33 +02:00
Daniel Molkentin	d35e1baee1	Remove obsolete code	2013-06-26 17:27:44 +02:00
Daniel Molkentin	903a78623c	Minor theme changes	2013-06-25 14:51:39 +02:00
Daniel Molkentin	644b2673e0	More whitespace changes	2013-06-24 23:00:33 +02:00
Daniel Molkentin	04c8449e5f	String whitespace fixes	2013-06-24 22:58:00 +02:00
Daniel Molkentin	a662c85728	Add "Reset Folder" option to status dialog ... to recover from invalid databases. Features a big fat warning.	2013-06-24 21:17:00 +02:00
Daniel Molkentin	5c4b7d427d	Add "Reset Folder" option to status dialog ... to recover from invalid databases. Features a big fat warning.	2013-06-24 21:15:22 +02:00
Markus Goetz	12cc8bfd95	Raise setup wizard	2013-06-24 15:15:46 +02:00
Markus Goetz	11c6f20c90	Setup Dialog: Fix widget size issue (2)	2013-06-24 14:57:48 +02:00
Markus Goetz	c602ec310d	Setup Dialog: Fix widget size issue ... in advanced settings	2013-06-24 13:24:46 +02:00
Olivier Goffart	60a4180dd6	Delay the csync_init after we called status.php ... That way, if there was a redirection, it is handled propertly	2013-06-21 00:34:46 +02:00
Olivier Goffart	8e42721959	Do not store the redirected URL in the config file. ... Because it may be a temporary URL. Especially anoying in captive portal Fix issue #368 This is a revert of the revert 0bc9b6f44e With small changes	2013-06-21 00:34:28 +02:00
Daniel Molkentin	3bff5a061b	Network: Display actual error message next to code.	2013-06-20 20:02:25 +02:00
Daniel Molkentin	0bc9b6f44e	Revert "Do not store the redirected URL in the config file." ... This reverts commit 905f70a186. Patch still has issues, defer until after Beta 4	2013-06-20 19:50:34 +02:00
Olivier Goffart	905f70a186	Do not store the redirected URL in the config file. ... Because it may be a temporary URL. Especially anoying in captive portal Fix issue #368	2013-06-20 17:50:02 +02:00
Olivier Goffart	a8707b681d	Report proper error when csync_init fails ... Fix mirall issue #705	2013-06-19 18:17:32 +02:00
Olivier Goffart	5d8f9f5346	Silent clang warning	2013-06-19 18:16:43 +02:00
Daniel Molkentin	46c7026726	Answer correctly if proxy auth is needed ... Fixes #704	2013-06-19 12:48:36 +02:00
Daniel Molkentin	01ad3c4d81	Remove more dead code for readability	2013-06-19 11:31:09 +02:00
Daniel Molkentin	4ac98bde73	Remove dead code from StatusDialog	2013-06-18 17:38:20 +02:00
Olivier Goffart	1356a5bbaa	Fix reading the password from the config ... The code was expecting pwdba to be in base64, which it was not if it came from the "password" field	2013-06-18 14:19:37 +02:00
Olivier Goffart	3c320c2736	Credidentail dialog: it was suposed to be asynchronous	2013-06-18 14:19:37 +02:00
Olivier Goffart	969757199e	Fix changing the password when the password manager is not available ... Leaving the state in NoKeychainBackend would break any further attempt to get the password because CredentialStore::canTryAgain would return false.	2013-06-18 14:19:37 +02:00
Daniel Molkentin	60f1c65a48	Don't lose proxy settings when changing passwords	2013-06-17 14:25:11 +02:00
Daniel Molkentin	b87b0e16e6	Avoid infinite loop if authcheck fails	2013-06-17 13:35:54 +02:00
Daniel Molkentin	8ed0b1be55	Teach ownCloud theme about QVariant	2013-06-13 16:31:38 +02:00
Daniel Molkentin	91b5f1076f	Theming cleanups ... - remove splash screen pixmap - remove backend icon (folderIcon()) - Move owncloud ad into owncloud theme	2013-06-13 12:56:20 +02:00
Daniel Molkentin	8ec2457965	Only change subtitle if the config file actually exists	2013-06-13 12:55:07 +02:00
Daniel Molkentin	82d79b1188	Remove folder from the scheduling queue ... Not really needed, but cleaner	2013-06-12 12:42:02 +02:00
Olivier Goffart	e33601becd	Fix leak	2013-06-12 12:23:12 +02:00
Olivier Goffart	334443adbb	Fix crash when removing a folder ... The problem is that the module_property of csync are not really tight to a context, but are global to all the contextes. Which means csync_owncloud may still have a pointer to the destroyed context of the destroyed folder. By always resetting the context pointer, we make sure there is no stale pointers there	2013-06-12 12:23:12 +02:00
Daniel Molkentin	89438f7ace	Make SyncDisabler local to slotAddFolder ... This also allows us to update the folder state as soon as the wizard is being closed.	2013-06-12 09:27:20 +02:00
Daniel Molkentin	d323ec5dd9	FileItemDialog: more clarity in the label ... - finished %n sec ago -> last finished %n sec ago - switch to minutes after 60 seconds	2013-06-11 22:34:37 +02:00
Daniel Molkentin	bb5cf37330	Fix issues found after review ... - use safer formatting - remove unnecessary condition	2013-06-11 22:33:11 +02:00
Daniel Molkentin	4b0bdd648c	Do not repeat old strings ... Fixes #678, fixes #494	2013-06-11 22:14:32 +02:00
Olivier Goffart	5588fbe695	Fix clicking on the systray when the setup is not finished ... We should raise the wizard	2013-06-11 21:32:44 +02:00
Olivier Goffart	12ea381205	Do not re-use the configuration wizard. ... Create it on demand. This allow yo alays keep a cleen state. Mirall issue #668	2013-06-11 21:15:37 +02:00
Daniel Molkentin	99fbf25fb2	Keep the member variable, avoids double instanciation	2013-06-11 18:41:35 +02:00
Daniel Molkentin	b37645e14d	Revert "Put FolderWizard on the stack" ... This reverts commit 1ec5a1aaa2.	2013-06-11 18:33:39 +02:00
Daniel Molkentin	1ec5a1aaa2	Put FolderWizard on the stack	2013-06-11 18:19:09 +02:00
Daniel Molkentin	3eb7acde25	Folder wizard: use native separators in path lineedit	2013-06-11 18:18:38 +02:00
Daniel Molkentin	e53e39cfad	Remove obsolete members from enum	2013-06-11 18:17:34 +02:00
Daniel Molkentin	1a17f40233	Remove debug	2013-06-11 18:17:22 +02:00
Daniel Molkentin	10094a997a	Proxy Dialog: default to port 8080	2013-06-11 17:46:00 +02:00
Daniel Molkentin	2af38b093f	Fix status delegate ... - remove magic values - remove backend icon, put status icon in the front - elide text when > list view width - use list view font	2013-06-11 14:46:12 +02:00
Daniel Molkentin	b03c168175	Status dialog> Do not adjust pen when using Vista Style ... Light blue and white are not contrasting enough	2013-06-10 21:29:45 +02:00
Daniel Molkentin	1c6bc84d2d	Wizard: Always initialize all labels	2013-06-10 21:29:45 +02:00
Olivier Goffart	541239c17b	Make the message box more explicit when all files have been removed ... Also clean the db if the user wish to keep the files	2013-06-10 15:58:02 +02:00
Daniel Molkentin	74b4ade15a	Add missing return statement	2013-06-10 15:37:52 +02:00
Daniel Molkentin	54e4217216	Add Missing LGPL_EXCEPTION.txt ... Fixes #671	2013-06-10 07:38:35 +02:00
Olivier Goffart	d2579a7754	Warn if we detect that all fles are about to be removed.	2013-06-08 15:41:53 +02:00
Daniel Molkentin	76580840dd	Fix misleading confirmation message ... Fixes #459	2013-06-07 22:01:26 +02:00
Olivier Goffart	779e59156c	Added --logexpire to remove the log after some hours	2013-06-07 18:58:16 +02:00
Daniel Molkentin	b0f0d0b1cd	qDebug() ises local8bit, not utf-8. ... Fixes #651	2013-06-07 17:28:04 +02:00
Daniel Molkentin	858dcb53bd	Status dialog delegate: Use font from option	2013-06-06 22:12:18 +02:00
Daniel Molkentin	9d7db88fcb	status dialog: Use contrast color for highlights ... Fixes #440.	2013-06-06 22:11:36 +02:00
Daniel Molkentin	2099b7c6a0	ensureJournalGone: fix logic	2013-06-06 21:43:05 +02:00
Daniel Molkentin	4442564ad2	Clean up slotAddFolder ... Ensure folder sync scheduling is off in the meanwhile.	2013-06-06 21:27:15 +02:00
Daniel Molkentin	12148b5c9b	remove journal when adding a new sync on an existing folder	2013-06-06 17:59:50 +02:00
Daniel Molkentin	d7d77a49fc	Show help on Windows ... We have no console, so show a message box.	2013-06-06 16:00:51 +02:00
Daniel Molkentin	0c959e8661	Windows: Log change of power state	2013-06-05 16:14:20 +02:00
Daniel Molkentin	0090862313	wizard: show native separators on folder chooser button	2013-06-04 00:46:34 +02:00
Daniel Molkentin	a4a68c6622	Wizard: Better wording when renaming failes	2013-06-03 23:34:28 +02:00
Klaas Freitag	49b4c341ae	Really unload folders before reconfiguring.	2013-06-03 17:27:06 +02:00
Olivier Goffart	7c1f91abdd	Add the --logdir commandline option ... To log to a different file for every sync. This also changed a QueuedConnection to AutoConnection, that way we directly save the log from the main thread in the file without waiting for the event loop (so if it crashes before, the log has been writen)	2013-06-03 16:25:41 +02:00
Klaas Freitag	1f2ba7e254	Handle rename fails for backup reasons correctly.	2013-06-03 15:47:39 +02:00
Klaas Freitag	8014bcb7c4	Check for emptiness before backuping the entire dir.	2013-06-03 15:47:07 +02:00
Klaas Freitag	b1c8bf5954	Fix backup name generation.	2013-06-03 15:46:41 +02:00
Klaas Freitag	0eb6740bac	Added default argument to terminateSyncProcess	2013-06-03 15:46:11 +02:00
Klaas Freitag	96531b548a	Minor Cleanups.	2013-06-03 15:45:28 +02:00
Klaas Freitag	f3371360ed	Check the CredentialStore state before fetching creds again.	2013-06-03 15:44:58 +02:00
Olivier Goffart	5bb4c3be43	TMP threaded	2013-06-03 10:43:21 +02:00
Daniel Molkentin	b028ca0738	Merge pull request #650 from manolopm/master ... Fixes for windows client when setup server url customization	2013-05-31 07:25:09 -07:00
Daniel Molkentin	a9aab30d55	Display proxy errors	2013-05-31 16:16:56 +02:00
Daniel Molkentin	efbad3a3c8	Propagate proxy changes to csync at run time	2013-05-31 16:16:41 +02:00
Manuel Padron Martinez	b6ed959f98	Removes server url label if a custom url is defined ... Signed-off-by: Manuel Padron Martinez <manolopm@gmail.com>	2013-05-31 04:46:26 +01:00
Manuel Padron Martinez	477953f965	Put wizard url customization before connect signals ... Signed-off-by: Manuel Padron Martinez <manolopm@gmail.com>	2013-05-31 04:45:48 +01:00
Daniel Molkentin	aaf59cece5	Wizard: Normalize directory separators	2013-05-29 17:24:59 +02:00
Daniel Molkentin	e88b7e8ec2	Centralize User Agent string and use in UpdateDetector	2013-05-29 16:13:38 +02:00
Daniel Molkentin	078b09b5f4	Remove obsolete include	2013-05-29 16:12:42 +02:00
Daniel Molkentin	0d06fe764a	Status dialog: Use correct font metrics ... This avoids cutting charcters such as 'y'.	2013-05-29 14:46:02 +02:00
Daniel Molkentin	94f8c39a9e	Proxy settings: Also keep proxy user/pwd ... make sure not to use it when the user has asked us not to. Simplify setupProxy()	2013-05-29 12:56:23 +02:00
Daniel Molkentin	7d1bd9da86	Properly deal with SOCKS proxies ... Fixes #10	2013-05-29 02:14:40 +02:00
Daniel Molkentin	ed8cdf6910	Remember proxy settings even after switching type ... Fixes #649	2013-05-29 01:41:04 +02:00
Daniel Molkentin	7ee83847c8	Do not try to reset the wizard when visible	2013-05-29 01:30:00 +02:00
Daniel Molkentin	52eca1362f	Delete QWizard on destruction	2013-05-29 01:29:56 +02:00
Daniel Molkentin	eec1af09c4	Wizard: Fix rich text label layouting	2013-05-29 01:17:12 +02:00
Daniel Molkentin	c651c8cbf9	Wizard: Improve wording.	2013-05-29 01:16:52 +02:00
Daniel Molkentin	da6a398624	Wizard: Warn on re-setup with multiple folders	2013-05-28 20:25:31 +02:00
Daniel Molkentin	1418512a9f	More cheating on proxies: Add OS to User-Agent	2013-05-28 19:35:30 +02:00
Daniel Molkentin	dd2859880b	Set User-Agent to contain Mozilla/5.0 string ... A blatant lie for a blatant abuse of Firewall filters.	2013-05-28 15:44:41 +02:00
Daniel Molkentin	f38d8ba2e4	Improve wizard in edit mode	2013-05-28 14:51:49 +02:00
Daniel Molkentin	fdd52a2520	Kill non-boxed mode for now	2013-05-28 14:51:48 +02:00
Daniel Molkentin	e2c0792043	take local folder path from property ... This gets set by slotSelectFolder() and from the wizards caller.	2013-05-28 14:51:41 +02:00
Daniel Molkentin	e8889530b0	Fix owncloud theme icon	2013-05-28 14:42:41 +02:00
Klaas Freitag	23f67d950a	Handle password change correct, add "sync from scratch". ... The setup wizard now destinguishes if there was already a configuration or not. If yes, it's going to password-change mode. Also added a checkbox that allows to start a sync from a cleared local directory.	2013-05-26 14:04:11 +02:00
Klaas Freitag	0bd1f507ab	Added a checkbox "start sync from scratch".	2013-05-26 13:57:28 +02:00
Klaas Freitag	2bcfc143f6	Let the folderman create a new sync directory. ... If a sync directory exists its moved to a backup path and created new. That allows to start a sync "from scratch".	2013-05-26 13:56:51 +02:00
Klaas Freitag	9dc21bf8a3	Let the keychain return new creds during async save. ... The credentials are asynchronously saved. The credentialstore now returns the creds even if the saving has not yet finished but is running, for that the new state AsyncWriting was added. That makes the start of the sync after the password was changed more reliable.	2013-05-26 13:55:23 +02:00
Klaas Freitag	70f627ba06	Fix the folder setup wizard.	2013-05-24 09:54:48 +02:00
Daniel Molkentin	0683c26d41	Make setting custom folders work again ... Also, ensure that opening the local directory from the wizard will work on Windows.	2013-05-23 01:51:05 +02:00
Daniel Molkentin	dbc085d4d4	Fix systray class when built without FDO support	2013-05-22 17:39:49 +02:00
Daniel Molkentin	804eaa700e	Remove bogus debug output	2013-05-22 15:58:54 +02:00
Daniel Molkentin	62ad2f19e3	Setup Wizard: Make server/folder buttons work	2013-05-21 14:25:31 +02:00
Daniel Molkentin	14f55420f9	Remove obsolete connect statement	2013-05-21 14:20:56 +02:00
Daniel Molkentin	d4ea0ba6ba	Merge branch 'master' of git://github.com/gnumdk/mirall ... Conflicts: CMakeLists.txt As per PR 457	2013-05-20 16:54:49 +02:00
Daniel Molkentin	3a50eece9e	More theming refactoring	2013-05-17 20:56:17 +02:00
Daniel Molkentin	44f0fb0242	Fix broken include	2013-05-17 20:12:31 +02:00
Daniel Molkentin	c210e2b72f	Remove obsolete miralltheme	2013-05-17 20:11:16 +02:00
Daniel Molkentin	0f03b47a46	Make new connection wizard themable	2013-05-17 18:05:22 +02:00
Daniel Molkentin	c923e0803e	Add SyncResult::SyncPrepare case to FileItemDialog	2013-05-17 12:33:02 +02:00
Klaas Freitag	f334b6349b	Add a call to quit to make the thread ending the loop	2013-05-16 17:35:40 +02:00
Olivier Goffart	07ce6cfa79	don't use member variable of the propagator	2013-05-16 14:50:36 +02:00
Olivier Goffart	9ce47c9675	make the propagator asynchronous	2013-05-16 13:54:22 +02:00
Klaas Freitag	2ff9fcfa1d	Fix crash if _thread is not initialized before.	2013-05-16 13:26:05 +02:00
Olivier Goffart	40255d643c	propagator-ng: adapt to the merge of rename_folders branch	2013-05-15 15:22:20 +02:00
Olivier Goffart	b31200a6f2	propagator-ng: fix setting the mtime	2013-05-10 13:20:21 +02:00
Olivier Goffart	98cbb599b8	Fix handling of conflicting directories ... We can safely ignore them in the propagator	2013-05-10 12:35:10 +02:00
Daniel Molkentin	302fdeb1f9	Use UTF-8 for basic auth ... Slightly off-specs, and fails for non UTF-8 setups, but the ownCloud server itself expects UTF-8 encoding.	2013-05-09 22:01:39 +02:00
Daniel Molkentin	eea8542fc0	Quit app/abort sync gracefully.	2013-05-09 21:55:28 +02:00
Olivier Goffart	ecd314cef5	Give the tmp file a proper hidden and excluded name	2013-05-08 14:31:52 +02:00
Olivier Goffart	0b1ecd0ac6	propagator-ng: Abort on fatal error	2013-05-08 13:30:30 +02:00
Olivier Goffart	852e30ef07	owncloudcmd: don't abort on unknown argument	2013-05-08 12:11:23 +02:00
Olivier Goffart	2193da0ab5	Fix a few FIXME	2013-05-07 17:47:29 +02:00
Olivier Goffart	7cd12e7dc5	remove some FIXME	2013-05-07 17:16:11 +02:00
Olivier Goffart	685bf395be	propagator-ng: resume uploads ... Currently i think it corrupt the files	2013-05-06 18:41:56 +02:00
Olivier Goffart	0636ae6f28	propagator-ng: be able to resume download	2013-05-06 16:59:11 +02:00
Olivier Goffart	7f8eba3700	propagator-ng: set the modtime on downloaded files	2013-05-06 12:09:21 +02:00
Olivier Goffart	02957aba45	propagator-ng: Emit the fileReceived signal	2013-05-05 12:46:40 +02:00
Klaas Freitag	2e53e2e4e0	Really return true in case of error.	2013-05-05 12:34:38 +02:00
Klaas Freitag	721a8f79ab	Improve error handling, add error string to each individual file item.	2013-05-05 11:47:19 +02:00
Olivier Goffart	ecaf66db5d	style: use _ in front of member variable	2013-05-05 11:32:12 +02:00
Olivier Goffart	0c775aba6d	propagator-ng: get the etag also in the GET request	2013-05-05 11:32:12 +02:00
Olivier Goffart	71b238031f	Fix compilation after previous rebase	2013-05-05 11:32:12 +02:00
Olivier Goffart	662bd4e5fe	propagator-ng: handle conflict ... Always download the file from the server. And if they are equals, ignore the conflict	2013-05-05 11:17:42 +02:00
Olivier Goffart	5118054fa3	Enable the backup of conflicts files in owncloudcmd	2013-05-05 11:17:07 +02:00
Klaas Freitag	c956d11183	More error handling of propagator, some cleanups.	2013-05-04 17:14:47 +02:00
Klaas Freitag	7df23a1b19	Proper error reporting of propagator - WIP	2013-05-04 17:14:47 +02:00
Klaas Freitag	72580d7213	move command line client into bin dir	2013-05-04 17:14:47 +02:00
Daniel Molkentin	a36d79e993	Fix make install	2013-05-04 17:01:14 +02:00
Daniel Molkentin	be5c1b2072	Fix build	2013-05-04 16:38:39 +02:00
Olivier Goffart	264cc73806	Implement renaming on windows ... (Not actually tested)	2013-05-04 16:18:13 +02:00
Daniel Molkentin	f0bd1ea48e	Add connectionvalidator class	2013-05-04 16:01:45 +02:00
Daniel Molkentin	90d0460a42	Remove dummy artwork, dead switches	2013-05-04 15:55:04 +02:00
Olivier Goffart	c041076c95	Handle renames	2013-05-04 15:32:11 +02:00
Daniel Molkentin	c15ce2b20b	Remove last traces of localRun	2013-05-04 15:16:53 +02:00
Daniel Molkentin	b51f210bfa	Drop (broken) mirall binary ... This remove all non-ownCloud backends, as well as all obsolete wizard pages. CSync is now a mandatory dependency.	2013-05-04 14:03:51 +02:00
Olivier Goffart	f6ff189f35	Add owncloudcmd ... A simple commandline client like ocsync. The goal is to be used bu the t1.pl test	2013-05-04 13:52:35 +02:00
Olivier Goffart	e1e8842548	New owncloud propagator that skip the vio abstraction layer ... The vio abstraction layer within csync is inneficient for the owncloud use case because not all calls maps well to the POSIX interface. We can be much more efficient by doing exactly what we need. Also, this will allow us to scedule better the calls and possibly to use threads.	2013-05-04 11:02:30 +02:00
Daniel Molkentin	105c76c055	Fix sizing problems in the new wizard dialog.	2013-04-30 21:51:48 +02:00
Daniel Molkentin	6b15b7a58f	Update detector: make it possible to skip updates. ... Fixes issue #588.	2013-04-30 17:46:07 +02:00
Daniel Molkentin	fee0aae975	new wizard: Better separate folder names in strings.	2013-04-30 17:46:07 +02:00
Klaas Freitag	1e677a5f0f	Fixed default target dir to / and fixed logging text.	2013-04-30 13:53:13 +02:00
Klaas Freitag	3f3f6c0f39	Move setPlaceholderText to correct class.	2013-04-29 14:09:05 +02:00
Klaas Freitag	5dd53b48ef	Add missing lineedit method for ancient Qt versions	2013-04-29 11:08:37 +02:00
Klaas Freitag	a215e11b20	Merge development branch with new setup dialog.	2013-04-29 10:20:01 +02:00
Klaas Freitag	c848ff4bdb	New setup dialog, simplified version.	2013-04-27 22:24:32 +02:00
Klaas Freitag	5aa8f5bc01	Added own CookieJar to not return a Session Cookie, rem Auth Callback ... The auth callback is not needed as we send an Basic Auth header.	2013-04-27 22:22:20 +02:00
Klaas Freitag	6c5d5a543c	Simplified config file write method, removed don't store pwd.	2013-04-27 22:21:28 +02:00
Daniel Molkentin	238111be09	Find csync_version.h, local config.h	2013-04-26 10:48:02 +02:00
Klaas Freitag	6f0820a3ed	Add QProgressIndicator to source list	2013-04-26 10:47:17 +02:00
Daniel Molkentin	2789522948	Folder/ownCloudFolder: Clean up secondPath stuff	2013-04-25 16:06:31 +02:00
Daniel Molkentin	55a56cc275	Find csync_version.h, local config.h	2013-04-25 13:19:38 +02:00
Daniel Molkentin	311bd39100	Add simplified FancyLineEdit from Qt Creator to 3rdparty	2013-04-24 13:36:25 +02:00
Klaas Freitag	fab77a15f0	Fix build after merge	2013-04-24 13:33:26 +02:00
Klaas Freitag	09e7f5c618	Add qprogressindicator widget	2013-04-24 11:45:53 +02:00
Klaas Freitag	c5a674b1df	More work on new Connection dialog. First working version.	2013-04-24 11:40:29 +02:00
Klaas Freitag	7cc73ed46c	Merge feature branch that introduces non terminating csync.	2013-04-23 16:52:02 +02:00
Klaas Freitag	8928c87fc3	Removed silly configDir hack from thread.	2013-04-22 15:06:28 +02:00
Mario Enrico Ragucci	de99c0c7e7	Silently ignore "installed = true" string in JSON string returned by status.php	2013-04-21 00:46:37 +02:00
Klaas Freitag	9f0348979b	Simplify csyncthread with keeping csync ctx intact	2013-04-20 13:15:27 +03:00
Daniel Molkentin	ea85d68a26	Revert non-working hack	2013-04-19 16:20:30 +02:00
Daniel Molkentin	fb0a883f7b	Init member to 0, remove nonsensical if (foo) delete foo	2013-04-19 16:20:30 +02:00
Daniel Molkentin	1f361b7260	Make certificateChain() thread safe ... Fixes #487, #491, #454	2013-04-18 14:02:20 +02:00
Klaas Freitag	cd7d2a0778	Set path for configure_file of desktop file.	2013-04-17 16:21:05 +02:00
Klaas Freitag	a4be3f304d	Set log verbosity before calling csync_init.	2013-04-17 15:29:44 +02:00
Daniel Molkentin	844d8eba47	Fix tr plural usage	2013-04-17 01:21:15 +02:00
Daniel Molkentin	5e65945a53	filitemdialog: more wording changes	2013-04-16 17:28:03 +02:00
Daniel Molkentin	428040762f	fileitemdialog: GUI feedback for the copy action	2013-04-16 16:49:53 +02:00
Daniel Molkentin	30e0a13bc5	invalid password: Improve wording	2013-04-16 14:28:00 +02:00
Daniel Molkentin	275c2b1a6b	Fix misleading balloon titles ... Fixes #546	2013-04-16 11:24:07 +02:00
Daniel Molkentin	acdb624713	safer approach for detecting duplicate sync runs	2013-04-15 15:55:54 +02:00
Daniel Molkentin	3cae8e7124	Remove debugging code	2013-04-15 14:32:23 +02:00
Daniel Molkentin	fcde01fd4c	Clarify string in folder wizard	2013-04-11 10:57:19 +04:00
Klaas Freitag	aa6160ab62	Fixed some valgrind warnings.	2013-04-08 14:50:47 +02:00
Daniel Molkentin	f74aa1e9a6	terminate if more than one thread is being started.	2013-04-04 17:25:53 +02:00
Klaas Freitag	86525570aa	Fix default config storage path.	2013-04-04 15:19:45 +02:00
Klaas Freitag	be5a50a000	Merge branch 'confdir' of https://github.com/smessmer/mirall into smessmer-confdir	2013-04-03 14:42:13 +02:00
dragotin	7309a894bc	Merge pull request #477 from rominf/master ... Fix for bug with folders adding	2013-04-03 04:39:17 -07:00
Daniel Molkentin	d68c4b379f	Unbreak self-signed certificate handling	2013-04-02 15:22:27 +02:00
Klaas Freitag	bec2f7c9b9	Removed verbose logging on Win32.	2013-03-28 11:14:16 +01:00
Daniel Molkentin	0ad2bd4b91	Add favlink generation support for Nautilus	2013-03-25 18:00:58 +01:00
Markus Goetz	d7a93c74aa	OS X: Fix creation of Finder Favorite	2013-03-25 14:57:34 +01:00
rominf	a8f0e79046	Skipping folders with no absolute path.	2013-03-23 10:48:37 +04:00
Daniel Molkentin	1831a975eb	SSLErrorDialog: We cannot use the existing key chain ... ... use the one returned by the new server instead.	2013-03-22 14:59:22 +01:00
Cedric Bellegarde	8165b83a27	Check for service availability	2013-03-22 11:58:55 +01:00
Cedric Bellegarde	fa62c270e6	Merge git://github.com/owncloud/mirall	2013-03-22 11:40:58 +01:00
Cedric Bellegarde	c03199e78a	Re add space	2013-03-22 11:35:25 +01:00
Cedric Bellegarde	f346503534	Better fdo detection	2013-03-22 11:34:21 +01:00
Daniel Molkentin	337c6d3e4e	Try to avoid crash on Mac OS during setup ... ... by moving setupFavLink to a place only called if the folder to be referenced exists for sure.	2013-03-21 12:50:47 +01:00
Daniel Molkentin	c633302f31	Use the certificateChain() in the SSL error dialog ... This includes the self-signed certificate anyway, and the previous behavior led to funny side-effects.	2013-03-20 15:53:55 +01:00
Cedric Bellegarde	1315ca2a57	Move files to correct location	2013-03-20 10:19:55 +01:00
Cedric Bellegarde	2f0474a467	Add support for freedesktop notifications	2013-03-20 10:03:49 +01:00
Daniel Molkentin	284285d441	Do not follow symlinks when recursing ... We do not support symlinks anyway	2013-03-18 14:12:25 +01:00
Klaas Freitag	9d2c3ebad3	Move config.h out of header files.	2013-02-25 09:54:19 +01:00
Daniel Molkentin	ad063b0634	Make chinese translations work on OS X ... ... by mapping chinese script codes to country codes as used by Qt and Transifex.	2013-02-24 15:44:38 +01:00
Daniel Molkentin	8765538458	Be more permission when loading languages ... Accept languages when they only exist for mirall, but not for Qt and QtKeychain (Fixes #359). This is more permissive than before, but while fixing #359, it became evident that supporting "partial" translations might actually be beneficial.	2013-02-24 15:44:38 +01:00
Daniel Molkentin	e85291c4ba	en language is implied	2013-02-21 15:17:13 +01:00
Klaas Freitag	4ba85311da	Handle all cases in switches.	2013-02-21 13:36:51 +01:00
Daniel Molkentin	3cf7003101	Load UI languages instead of locales where possible ... Load Qt translations consistently along the way. This only has been verified on mac and needs adoption for win32.	2013-02-21 13:19:54 +01:00
Klaas Freitag	ae558a5889	Add a appNameGUI method to the theming.	2013-02-21 12:21:42 +01:00
Klaas Freitag	55a4fd752d	Fix commit fd83bf - add treewalk success check.	2013-02-20 17:26:07 +01:00
Klaas Freitag	136b699106	Make sure to restart sync after folder add.	2013-02-20 16:06:46 +01:00
Klaas Freitag	fd83bf2089	Remove unused variable doTreeWalk.	2013-02-20 10:06:45 +01:00
Klaas Freitag	817039ddf3	Simplify and fix startup: Steer starting of sync from folderman.	2013-02-19 17:24:10 +01:00
Klaas Freitag	6d6deaf6c4	Setup folders added after setup wizard ended.	2013-02-19 12:04:36 +01:00
Klaas Freitag	9c63b89bac	Removed useless warning.	2013-02-19 09:34:33 +01:00
Klaas Freitag	ec120cd64c	Make folderman load folders at start and update later.	2013-02-18 18:31:29 +02:00
Klaas Freitag	a9173b1aa1	Add setters for update check and max log lines	2013-02-18 17:17:03 +02:00
Klaas Freitag	89f7f75af2	If a new server is configured, take the proxy config to the new config ... file.	2013-02-18 17:16:10 +02:00
Daniel Molkentin	8809ac0c4a	remove unused connect	2013-02-18 14:56:50 +01:00
Daniel Molkentin	7a03164a9a	Handle server offline state on application start gracefully	2013-02-18 14:56:50 +01:00
Daniel Molkentin	38954c2193	Remove obsolete signal.	2013-02-15 19:29:38 +01:00
Daniel Molkentin	5954fb280c	Centralize error handling for csync steps ... ...as a preparation for offline handling. As a side-effect, removed the last instance of goto in mirall.	2013-02-15 19:29:27 +01:00
Daniel Molkentin	8e63652fb3	Send OEM string to update detector.	2013-02-15 18:39:25 +01:00
Daniel Molkentin	1c70fb3ba4	Set csync config dir in mirall properly ... Otherwise canceling the sync cannot remove the lock file	2013-02-14 17:36:11 +01:00
Daniel Molkentin	e5af8e87b3	Fix crash when pausing mirall.	2013-02-14 17:36:11 +01:00
Daniel Molkentin	bfbec24f43	Add more debug in case inotify fails ... We should probably make this at least a visible error, because it's a limitation set by the kernel/the distro and we would require root permissions to adjust the value. Right now all that happens is that syncing is not immediate, but only run every 30 secs (due to server polling).	2013-02-14 17:36:11 +01:00
Daniel Molkentin	8dd97a358a	Introduce SyncPrepare state ... SyncPrepare is when the folder class prepares the actual syncing, i.e. does treewalks and runs the reconceiler in case of mirall. The actual SyncRunning state will only be entered if there is actually anything to sync. Fixes #289	2013-02-14 17:36:11 +01:00
Daniel Molkentin	7290afc6fe	Minimize Sync notification notification ... Notifies only in the end of a complete sync run now Migitates/fixes #314	2013-02-14 17:36:11 +01:00
Daniel Molkentin	2ba20369ea	Remove unused gitfolder class for now	2013-02-14 17:36:11 +01:00
Daniel Molkentin	804aef6548	Remove stray code	2013-02-14 17:36:11 +01:00
Daniel Molkentin	85f49b6af4	Fix guard position	2013-02-14 17:36:11 +01:00
Daniel Molkentin	68afc6011d	proxy dialog: no extra heading	2013-02-14 17:36:11 +01:00
Daniel Molkentin	524ffcd0e1	owncloud setup: Fix label style	2013-02-14 17:36:11 +01:00
Klaas Freitag	6d984b505d	Handle not stored password correctly.	2013-02-11 14:21:53 +01:00
Klaas Freitag	8d9336f9f4	Removed obsolete scheduler start.	2013-02-11 14:21:21 +01:00
Klaas Freitag	2b5e694181	Set default argument to method.	2013-02-11 14:20:32 +01:00
Klaas Freitag	aa983e4966	Make user password dialog real async working.	2013-02-11 14:18:45 +01:00
Klaas Freitag	424b3a9dfc	cleanup comments and dupes.	2013-02-11 14:18:16 +01:00
Klaas Freitag	4501ec10dc	Make sure that journals are wiped if server changes + some utility ... functions.	2013-02-10 20:04:03 +01:00
Klaas Freitag	699ae176df	Revert "Allow setting of custom poll interval through status.php" ... This reverts commit 39a89e8fc7. Conflicts: src/mirall/folderman.cpp src/mirall/folderman.h	2013-02-10 14:57:57 +01:00
Klaas Freitag	cac5f81388	Clear pending network requests in setup wizard on back.	2013-02-10 14:03:09 +01:00
Klaas Freitag	28af8068e9	Always return QNetworkReply* on mkdir and also on checkInstall.	2013-02-10 14:01:38 +01:00
Sebastian Kügler	a1d64af7b1	API additions for the Plasma client ... This patch contains a few (source-compatible) API additions needed for the Plasma client. * return QNetworkReply* to caller for tracking status and error of requests such as mkdir, getWebDAVPath and getRequest * Add a setter for the QNetworkAccessManager. This allows us to route at least some of the network requests through KIO in the Plasma client * Add a setter for the remotePollInterval. This should be enough API to * make it possible to adapt the polling interval to the client's machine state, e.g. sync less often on battery, or somesuch	2013-02-10 13:10:53 +01:00
dragotin	edbb79b79c	Merge pull request #5 from sebasje/mkdirreply ... Return QNetworkReply from remote mkdir	2013-02-10 02:34:36 -08:00
dragotin	a000a7b52e	Merge pull request #4 from sebasje/requestreply ... Return QNetworkReply from getRequests	2013-02-10 02:34:14 -08:00
Klaas Freitag	0a427541d6	Added config file setter for poll interval. Thx for pull request.	2013-02-10 11:27:21 +01:00
Klaas Freitag	1c297c56a2	Stop authentication tries already after the first attempt without ... success.	2013-02-10 11:02:39 +01:00
Klaas Freitag	6f9bbc431d	Properly stop syncing when connection manager opens.	2013-02-10 11:02:39 +01:00
Klaas Freitag	f62626e3eb	Delete existing folders properly before adding new ones.	2013-02-10 11:02:38 +01:00
Klaas Freitag	39a89e8fc7	Allow setting of custom poll interval through status.php	2013-02-09 14:04:04 +01:00
Klaas Freitag	38a8096732	Fixed sorting of header entries, ie. public / protected / private.	2013-02-09 14:03:05 +01:00
Klaas Freitag	d358c839ce	Fixed typos.	2013-02-09 12:46:08 +01:00
Sandro Knauß	cfa777260c	removing version for mirallsync (it is'nt build anymore :)	2013-02-08 18:37:29 +01:00
Sandro Knauß	66fc273db6	merging with default	2013-02-08 18:36:26 +01:00
Klaas Freitag	dbb0cbaff8	Removed build of obsolete mirallsync lib which is equal to owncloudsync.	2013-02-08 19:18:36 +01:00
hefee	9c9e377cf4	adding soname version to libowncloudsync and libmirallsync	2013-02-08 18:21:59 +01:00
Klaas Freitag	07258deaaf	Fix build for mirall target.	2013-02-06 15:05:34 +01:00
Klaas Freitag	7b53e0f953	Fix return from non void function.	2013-02-06 14:58:31 +01:00
Klaas Freitag	2ac764bd1a	Fix compile without OWNCLOUD_CLIENT define, thx Jenkins	2013-02-06 11:58:14 +02:00
Klaas Freitag	82d2851a6b	Set username in connection dialog if there.	2013-02-06 11:42:36 +02:00
Klaas Freitag	7a3be71452	The user name is not really to be protected.	2013-02-06 11:41:47 +02:00
Klaas Freitag	977a513ee5	Always set the connect result to en/disable the Finish button.	2013-02-06 11:21:50 +02:00
Klaas Freitag	22cbebb7a7	Fix build on debian with ancient Qt, thanks Mr. Jenkins for notifying.	2013-02-06 10:41:25 +02:00
Klaas Freitag	72b2e6778a	Use new ownCloudInfo / CredentialStore interface.	2013-02-06 10:09:02 +02:00
Klaas Freitag	08babbf38d	Set credentials in ownCloudInfo after these have been fetched.	2013-02-06 10:09:02 +02:00
Klaas Freitag	2ae5ae6962	Change interface to not support customHandles.	2013-02-06 10:09:02 +02:00
Klaas Freitag	fa6331a40a	Removed use of CredentialStore from class and added setter for ... credentials. This makes handling of temporar credentials for the setup dialog easier and streamlines the code.	2013-02-06 10:09:02 +02:00
Klaas Freitag	cece465947	Link libdl explicitely.	2013-02-06 10:09:02 +02:00
Daniel Molkentin	0bcb65db29	Do not allow to press Finished if connection to the server fails ... This does not yet consider cases where the connection succeeds but webdav fails.	2013-02-05 15:40:59 +01:00
Daniel Molkentin	fd30d8b0d1	Typo	2013-02-03 13:39:34 +01:00
Daniel Molkentin	5944acf8a6	Hack: Do not leak FDs when neon is built with gnutls (Linux) ... Previously, this would cause Mirall to crash sooner or later. Fixes #154	2013-02-03 13:37:03 +01:00
Michael Kent	854852959c	Changes to handling of command line options. Fix a segmentation fault with owncloud --help. Add -h as help short. If a commandline argument isn't recognized, print that it isn't recognized, print help, and abort.	2013-01-28 22:19:14 -06:00
Daniel Molkentin	d681066dc2	Results bubble: _localPrefix might not end in a separator	2013-01-26 20:47:20 +01:00
Daniel Molkentin	11e06c33db	Fix compilation on win/mac	2013-01-25 15:46:23 +01:00
Daniel Molkentin	c0f2f5bcaa	Load Qt translations from app dir/bundle, too	2013-01-25 15:41:18 +01:00
Klaas Freitag	4fac62560e	Removed remove of list of configured sync folder on reconfiguration. ... The removal of the configured folders was needed as long as the csync journal was based in on the folder name of the sync folder. Now that every folder has its own sync journal its not longer needed.	2013-01-25 11:33:00 +01:00
Daniel Molkentin	aca965f111	Fix favlink generation on windows	2013-01-23 17:22:38 +03:00
Daniel Molkentin	5dbd987df3	Mirall != owncloud client. Move about dialog to theme.	2013-01-23 13:45:50 +01:00
Daniel Molkentin	e37fc8c6e5	tr: Don't hardcode app name in string	2013-01-23 13:45:50 +01:00
Klaas Freitag	7614776e10	Fixed isComplete() for credential setup dialog.	2013-01-23 10:57:45 +01:00
Daniel Molkentin	e0332deffc	SSL: Use better test. ... The other one was not working anyway.	2013-01-22 15:29:14 +01:00
Daniel Molkentin	afe6caf406	Remove stray object	2013-01-22 15:29:14 +01:00
Klaas Freitag	862a9d938c	Handle missed case in switch statement.	2013-01-22 15:08:04 +01:00
Klaas Freitag	80108727c4	Linux: Work around keychain shortcoming if chain does not contain ... a password entry.	2013-01-22 12:08:56 +01:00
Klaas Freitag	84e3d6278d	Check for empty user in keychain key.	2013-01-21 18:36:03 +01:00
Klaas Freitag	a1bf324f47	normilize url before writing, error checks.	2013-01-21 16:33:52 +01:00
Klaas Freitag	1b8f7059e3	Fix pre initialization of _state in fetchCredentials().	2013-01-21 15:23:44 +01:00
Daniel Molkentin	7794480da0	csync: Put up the QNAM key chain for comparison ... Comparing with the CA certs will not help with intermediates, and other cases.	2013-01-21 13:33:33 +01:00
Daniel Molkentin	0171b8b998	Make hash formatting static ... no need for class instanciation.	2013-01-21 13:33:33 +01:00
Klaas Freitag	915764cc52	If credentials are ok, do not fetch them again from store.	2013-01-21 13:32:52 +01:00
Klaas Freitag	76653fcedb	Minor: removed bogus stuff.	2013-01-21 11:43:39 +01:00
Daniel Molkentin	9af862b455	Fix make install, clean up	2013-01-18 22:15:08 +01:00
Daniel Molkentin	0f36dc03c4	FileItemDialog: Add copy to clipboard functionality	2013-01-17 10:35:08 +01:00
Daniel Molkentin	5e3f2cf25a	Remove legacy configuration options. ... They were not used anyway.	2013-01-16 18:03:40 +01:00
Daniel Molkentin	f678629734	Fix proxy auth ... - The port was not set correctly - The password was read base64 encoded, but not read stored as such	2013-01-16 17:50:26 +01:00
Daniel Molkentin	87df74e4d0	Fix: pause icon not visible	2013-01-16 14:41:12 +01:00
Daniel Molkentin	45c82a2746	Go offline when server is in maintenance.	2013-01-16 14:41:12 +01:00
Klaas Freitag	bc3938daa7	A new sync file protocol dialog.	2013-01-15 20:42:09 +01:00
Klaas Freitag	07034daffe	Take valid caList from QSslSocket::defaultCA.	2013-01-14 12:13:51 +01:00
Klaas Freitag	dca8ecb929	Remove bogus spaces.	2013-01-14 12:13:50 +01:00
Klaas Freitag	dd2eecec42	Remove bogus reset after creds were written.	2013-01-14 12:13:50 +01:00
Klaas Freitag	11dbacab60	Exclude desktop file handling for windows platform.	2013-01-14 12:13:50 +01:00
Sebastian Meßmer	4caca2ce1a	The configuration directory is a static attribute in mirallconfigfile class	2013-01-14 00:48:26 +01:00
Daniel Molkentin	280dd205d9	setup wizard: Improve wording and context	2013-01-11 17:10:31 +01:00
Daniel Molkentin	5c495265f4	Consolidate theming support. ... This implements out-of-repository-theming, and removes the old custom.ini theming that never worked on all platforms and had no straight deployment story. The new approach requires the CMAKE variable OEM_THEME_DIR to point to a directory that must at least contain an OEM.cmake file (check OWNCLOUD.cmake for possible options) as well as a themes.qrc and a themes/ directory that directly correspond to the ones in the source tree.	2013-01-10 17:16:59 +01:00
Daniel Molkentin	9cdf2d8150	Remove potentially dangerous processEvent calls	2013-01-10 17:16:58 +01:00
Sebastian Meßmer	e0645b4b63	Allow setting the configuration directory on command line	2013-01-02 19:08:14 +01:00
Daniel Molkentin	4ce55a44ba	Klaas > Danimo, I am rather unpolite... ... Also, fix whitespace errors	2012-12-21 01:16:54 +01:00
Klaas Freitag	f4019f5a5a	Show backend error messages to user.	2012-12-20 20:51:43 +01:00
Daniel Molkentin	e6b9c16d04	Update About dialog	2012-12-20 20:35:21 +01:00
Daniel Molkentin	488943aaa0	Correct inheritance in status dialog	2012-12-20 17:36:10 +01:00
Klaas Freitag	c3f6153f94	Fixed QString -> const char* conversions to handle UTF8 correctly.	2012-12-20 16:49:29 +01:00
Klaas Freitag	87aa3d7c60	More detailed error handling.	2012-12-20 16:49:29 +01:00
Klaas Freitag	144a2832b9	Loop over all certificates to match the approved one.	2012-12-20 16:49:29 +01:00
Daniel Molkentin	26c01cefa7	New icons for ownCloud client ... --monoicons shows platform-specific monochrome icons for now until we have a proper settings dialog.	2012-12-20 16:41:54 +01:00
Klaas Freitag	30494eee75	Added utility class with format fingerprint method. ... Removed other obsolete formatting method.	2012-12-13 21:36:44 +01:00
Klaas Freitag	eb0782ec90	Check certificate fingerprints reported back from neon.	2012-12-13 19:52:22 +01:00
Klaas Freitag	c6edde1365	Fix merging.	2012-12-13 19:52:07 +01:00
Daniel Molkentin	6e3b5e075a	Fix crash	2012-12-12 20:06:59 +01:00
Daniel Molkentin	8b8d78f456	Improved version of popup-notify	2012-12-12 19:30:37 +01:00
Daniel Molkentin	3cb2e74d12	Notify user about new files. ... Let's see if its too annoying, we can still add a timer later	2012-12-12 15:00:38 +01:00
Daniel Molkentin	41082c5e81	Fix proxy error ... This was caused by an incorrect translation to a string type.	2012-12-12 15:00:38 +01:00
Klaas Freitag	5da634ed70	Transparent fallback to the former password storage if keychain is not ... there.	2012-12-11 15:08:20 +01:00
Klaas Freitag	edfefabcf8	Use two step process to store credentials through config file.	2012-12-08 22:56:48 +01:00
Klaas Freitag	9c627782d4	Use a two step process to store credentials for setup dialog.	2012-12-08 22:55:46 +01:00
Daniel Molkentin	ba9f46ef49	Make Windows-version of Add to Favorites work ... I committed a WiP before...	2012-12-07 20:20:40 +01:00
Daniel Molkentin	5502087017	Fix windows build	2012-12-07 19:53:36 +01:00
Daniel Molkentin	5510135084	Fix formatting hashes	2012-12-07 19:51:11 +01:00
Daniel Molkentin	ddecca47fd	osx/win: add sync folders to favorite folders	2012-12-07 19:51:11 +01:00
Klaas Freitag	1eabdee253	Enable logging through new csync logging api	2012-12-07 09:03:24 +01:00
Klaas Freitag	029535bcea	Removed another scary thing: qstrdup for proxy type.	2012-12-06 19:05:25 +01:00
Daniel Molkentin	4ef89abac7	Compile on Mac	2012-12-06 18:48:36 +01:00
Klaas Freitag	8af257a4cd	Start fs watching with a delay of 2 seconds to don't catch the journal changes.	2012-12-06 18:38:45 +01:00
Klaas Freitag	a124dcd4e8	More cleanups that were possible by the new notify api.	2012-12-06 18:38:06 +01:00
Klaas Freitag	fbae2d7330	Further cleanups that were possible by new change notification.	2012-12-06 18:35:02 +01:00
Klaas Freitag	f296fad4bb	Set csync context as module parameter	2012-12-06 17:57:00 +01:00
Daniel Molkentin	e2d8105f0d	Remove debug	2012-12-06 17:54:44 +01:00
Daniel Molkentin	287c073f00	Remove code for local sync runs ... Rely entirely on folderwatcher. Local sync runs can be implemented in terms of a dummy folderwatcher if we want to support systems without fs monitoring again..	2012-12-06 17:53:04 +01:00
Daniel Molkentin	138a060df2	Fix Windows folder watcher	2012-12-06 17:53:04 +01:00
Daniel Molkentin	6678beadab	Hack: Sleep 2 secs after sync run ... This avoids that we get notified by the system about writing of the csync db (IO has latency).	2012-12-06 17:53:04 +01:00
Daniel Molkentin	cab503bb2b	CredentialStore: Fix off-by-one	2012-12-06 17:53:04 +01:00
Daniel Molkentin	f20db6bbc1	Implement folder watching for OS X using FSEvents	2012-12-06 17:53:04 +01:00
Daniel Molkentin	d50d4d1a6f	Add windows backend, require Inotify on Linux ... Dummy-backend yanked for now, no support for other Unixes...	2012-12-06 17:53:04 +01:00
Daniel Molkentin	b65fd11a36	Remove superfluous include	2012-12-05 16:46:27 +01:00
Daniel Molkentin	36c9a29a7b	Move Logger into its own file, move it to libsync. ... This fixes a linker error.	2012-12-05 16:45:28 +01:00
Klaas Freitag	6ba098d26d	Make use of the new csync_set_module_properties and remove stuff from ... before.	2012-12-05 12:30:28 +01:00
Daniel Molkentin	214261e764	pimpl folderwatcher	2012-12-04 18:24:25 +01:00
Klaas Freitag	b74cfcfec5	Add missing ifdef QTKEYCHAIN.	2012-12-04 18:11:24 +01:00
Daniel Molkentin	bc67756ff6	Fix typo	2012-12-04 17:48:14 +01:00
Daniel Molkentin	eccd12923b	factor inotify out of folderwatcher	2012-12-04 17:48:14 +01:00
Klaas Freitag	5d958a4c07	Make use of QKeyChain if its there.	2012-12-04 17:27:59 +01:00
Klaas Freitag	22128781be	Use new logging api of csync.	2012-12-04 17:24:46 +01:00
Klaas Freitag	34dcff4ce2	Add a ownCloudWizard finished slot.	2012-12-04 17:05:17 +01:00
Klaas Freitag	bcbdfdd7ab	Some cleanups to avoid build warnings under win32.	2012-12-04 17:05:17 +01:00
Dominik Schmidt	097be61c9f	Fix QT_STRICT_ITERATOR errors	2012-11-28 23:31:03 +01:00
Daniel Molkentin	b349caeab1	Build with ancient GCC (4.2 on Mac OS)	2012-11-28 12:03:36 +01:00
Klaas Freitag	593636f135	User feedback on wrong passwd from KeyStore.	2012-11-28 10:44:25 +01:00
Klaas Freitag	70ea325c75	Do not commit devel hardcoded to KeyChain	2012-11-28 10:44:25 +01:00
Klaas Freitag	1a9a9cb402	More QtKeyChain integration.	2012-11-28 10:44:25 +01:00
Dominik Schmidt	2b2eb853fc	Add qtkeychain to cmake - WIP read password from keychain. ... Conflicts: CMakeLists.txt	2012-11-27 19:28:03 +01:00
Klaas Freitag	f20bbe05bd	Allow alias setting in Settings group name.	2012-11-22 12:32:07 +01:00
Klaas Freitag	c560fc5959	Escape [ and ] in Folder alias and file name.	2012-11-22 12:32:06 +01:00
Klaas Freitag	ee9e814f41	Getter and Setter for the config file name.	2012-11-22 12:32:06 +01:00
Klaas Freitag	01ccf679bd	Fix Qt 46 build	2012-11-20 10:56:20 +01:00
dragotin	b55d6742fe	Merge pull request #94 from owncloud/qt46fixurl ... Fix url encoding in Qt46, Bug #93	2012-11-20 01:39:04 -08:00
Daniel Molkentin	be367eb94b	Do not prepopulate the user field, it's usually wrong ... Especially without LDAP, or in cases where the login is an email address. If we ever want this again, we need to make this cleverer.	2012-11-19 12:10:46 +01:00
Daniel Molkentin	aa577ce038	Remove placeholder texts for username and password ... User names might be misleading, since they might be email addresses, SMB logins including domain, etc.	2012-11-19 12:10:46 +01:00
Daniel Molkentin	53b0b96627	setup wizard: Remove subtitles	2012-11-19 12:10:46 +01:00
Daniel Molkentin	5173de5798	Theme: allow enforced locale	2012-11-19 12:10:46 +01:00
Klaas Freitag	afa48b0cc2	Fix url encoding in Qt46, Bug #93	2012-11-17 16:46:31 +01:00
Daniel Molkentin	8fc1b38359	dialog title == menu item title	2012-11-16 13:36:16 +01:00
Klaas Freitag	9e66de07f9	Better error message for propagate fail.	2012-11-16 12:32:07 +01:00
Daniel Molkentin	e4ae794bac	Remove and do not try to commit temp editor files	2012-11-15 12:50:52 +01:00
Klaas Freitag	01e8c9dbbe	Fix credentialstore on startup, promote credentials back on setup. ... This fixes https://github.com/owncloud/mirall/issues/81	2012-11-15 11:43:43 +01:00
Daniel Molkentin	c5739b4d53	Remove extraneous legalese.	2012-11-15 01:07:51 +01:00
Klaas Freitag	39dc4cb46c	Use CredentialStore also for Qt4.6 based builds.	2012-11-13 15:01:05 +01:00
Klaas Freitag	a8dbed989b	Use CredentialStore to manage user credentials. ... This fixes the bug that if the password is not stored in the cfg file the user could not cancel the auth dialog. Moreover it handles various credential backends better and gives a better user experience.	2012-11-13 11:19:34 +01:00
Daniel Molkentin	59969c3574	Qt is not C.	2012-11-05 11:44:22 +01:00
Klaas Freitag	5519bc7cbb	Try to create local dir if not existing.	2012-11-05 11:36:39 +01:00
Klaas Freitag	c31f0885a4	Remove bogus space	2012-11-05 11:36:38 +01:00
Klaas Freitag	2501cc57d5	Display error status in statusdialog.	2012-11-05 11:36:38 +01:00
Klaas Freitag	fbb46b64f9	Check if local folder is proper and set error stat accordingly.	2012-11-05 11:36:38 +01:00
Klaas Freitag	4d08605b5b	Also compute overall status for disabled folders.	2012-11-05 11:36:38 +01:00
Klaas Freitag	764c352c8f	Calculate overallSyncStartup on startup.	2012-11-05 11:36:38 +01:00
Daniel Molkentin	7cc3e7e392	Debug: fix typo	2012-11-02 16:32:26 +01:00
Daniel Molkentin	46a82b69c5	Show user name for connection in statusdialog ... Move server version purely to tooltip. Fixes issue #8.	2012-11-02 14:09:23 +01:00
Klaas Freitag	0224c3fbd6	Compare absolute path in fileStatus.	2012-10-29 14:35:02 +01:00
Klaas Freitag	78c1bc6b22	Cleanup of sync result treewalk, build up journal in owncloudfolder.	2012-10-29 12:24:20 +01:00
Klaas Freitag	993d33f779	Fix fileStatus API. ... Conflicts: src/mirall/owncloudfolder.cpp	2012-10-29 12:23:01 +01:00
Klaas Freitag	0aa403eca3	Clean merge problems.	2012-10-29 12:20:57 +01:00
Klaas Freitag	8d1c7ddb9f	Make sure that path() has a trailing slash.	2012-10-29 12:20:57 +01:00
Daniel Molkentin	6d4f712f83	Make SSL error dialog more intuitive	2012-10-27 17:05:01 +02:00
Daniel Molkentin	d2ebcd065e	Fix tab order in setup page	2012-10-27 17:04:49 +02:00
Daniel Molkentin	28e15f5420	Escape HTML tags in self-signed certs	2012-10-27 17:04:49 +02:00
Daniel Molkentin	a315a3b5c7	There always must be both kinds of hashes, simplify code	2012-10-27 17:04:49 +02:00
Bartek Przybylski	55c9c3bf12	remove compilation warning	2012-10-25 23:20:00 +02:00
Daniel Molkentin	efa8d7670c	Show hashes of unknown certs	2012-10-24 01:44:13 +02:00
Daniel Molkentin	2cbcd52f35	Do not allow the selection of a target in single folder mode	2012-10-22 11:32:53 +02:00
Daniel Molkentin	b0801d469c	If present, select first item in status dialog ... The old behavior is confusing and there is no real reason to not have an object that is default-selected.	2012-10-20 14:58:49 +02:00
Daniel Molkentin	8fbc0e7c46	Show wizard with intro when starting without account ... The message box was complicated and not even correct on some OSes. The intro page is omitted if the wizard gets called via the "Configure" menu item.	2012-10-20 13:58:37 +02:00
Daniel Molkentin	d8728a56bc	Pre-setup, disable irrelevant items in context menu	2012-10-20 13:58:37 +02:00
Daniel Molkentin	379da4ed0d	Proper workaround for bug in Ubuntu's Qt SNI bridge.	2012-10-17 23:16:59 +02:00
Klaas Freitag	cff0fcee16	Escape the folder alias as used in QSetting and as file name.	2012-10-17 16:33:19 +02:00
Daniel Molkentin	257896969a	Clean up argument handling ... - Allow to retrospectively open log window - Don't waste init time if only help is requested.	2012-10-16 19:06:23 +02:00
Klaas Freitag	fe665f234d	Use better default value instead of constant number.	2012-10-16 10:11:24 +02:00
Daniel Molkentin	bb76365a3a	Make sure SSL errors are always handled	2012-10-16 10:09:38 +02:00
Daniel Molkentin	b7433ccad6	Revert "Hide remove button in singleFolder mode" ... This reverts commit 8939e08ce1.	2012-10-12 14:44:21 +02:00
Daniel Molkentin	fee9616708	OS X: Remove "make install" requirment for csync	2012-10-10 16:05:17 +02:00
Daniel Molkentin	72f3b5457e	Use HTTPS for update check	2012-10-09 17:46:41 +02:00
Daniel Molkentin	e45dfdb3b2	Dirty qnam/proxy export is no longer required	2012-10-09 17:19:09 +02:00
Daniel Molkentin	19a4f8fc64	_accessManager is already initialized in the ctor	2012-10-09 17:15:46 +02:00
Daniel Molkentin	a8d6c083e3	Make code more readable.	2012-10-09 10:10:41 +02:00
Daniel Molkentin	861a66f8cb	Make PAC work on Windows	2012-10-09 03:08:39 +02:00
Daniel Molkentin	3db60b4fe7	Massive simplification of proxy support. ... Purposefully separated from last commit, but associated with it: No more need for special cases after libocsync got fixed do adhere properly.	2012-10-09 02:35:08 +02:00
Daniel Molkentin	c93721258e	Working PAC support ... This goes along with e0f02c in csync/dav.	2012-10-09 02:35:08 +02:00
Klaas Freitag	48d5261ba7	Use Max instead of Min of course	2012-10-08 20:43:16 +02:00
Klaas Freitag	23c598a907	Only replace the scheme at the beginning of string	2012-10-08 16:21:18 +02:00
Daniel Molkentin	d7b94c7f96	Use HttpProxy instead of Socks5Proxy.	2012-10-08 11:08:01 +02:00
Daniel Molkentin	34b8c39878	Quick hack: do not crash on windows when pausing sync	2012-10-05 22:53:42 +02:00
Daniel Molkentin	0ee938ac9b	Prepend slash to remote folder	2012-10-05 22:42:35 +02:00
Klaas Freitag	06b2e1f645	Simplify url string from textfield to avoid unwanted spaces.	2012-10-05 22:33:16 +02:00
Daniel Molkentin	06a1cfe642	Anther fix for sync pausing	2012-10-05 12:59:58 +02:00
Daniel Molkentin	ae93e2aa10	Fix OS X bundle generation	2012-10-05 11:59:50 +02:00
Daniel Molkentin	7d52884699	Fix cmake for windows wrt libocsync renaming	2012-10-05 12:10:33 +04:00
Daniel Molkentin	3a983b428f	Fix bug when trying to pause a running sync	2012-10-04 14:08:23 +02:00
Daniel Molkentin	c42f77cf23	Consistency fix: name ui and src alike	2012-10-03 00:45:54 +02:00
Daniel Molkentin	d169bc24bf	ownCloudInfo must not include sslErrorDialog	2012-10-03 00:43:43 +02:00
Klaas Freitag	4d11e41e97	Merge branch 'master' of github.com:owncloud/mirall	2012-10-02 17:42:56 +02:00
Klaas Freitag	0007579ab8	Initialize pointer before use.	2012-10-02 17:42:37 +02:00
Daniel Molkentin	1752c23002	Use themed app name in password dialog.	2012-10-02 16:54:46 +02:00
Klaas Freitag	fabb353158	Use Qt proxy setting in csync in case its "default proxy"	2012-10-02 13:24:10 +02:00
Klaas Freitag	9ce10e7fe7	removed wrong header from filelist.	2012-10-02 13:18:36 +02:00
Klaas Freitag	11706c4e3e	Fix header.	2012-10-02 13:17:37 +02:00
Klaas Freitag	de60d53a78	Merge branch 'sslerrordialog' of https://github.com/sebasje/mirall into sebasje-sslerrordialog ... Conflicts: src/mirall/application.cpp src/mirall/application.h src/mirall/owncloudinfo.cpp	2012-10-02 12:34:06 +02:00
Klaas Freitag	1c326029a3	More theming fixes.	2012-09-28 15:19:42 +02:00
Klaas Freitag	4ac85b0702	Removed more hardcoded program names and replaced by theme appName.	2012-09-28 14:22:43 +02:00
Klaas Freitag	8939e08ce1	Hide remove button in singleFolder mode	2012-09-28 13:47:43 +02:00
Klaas Freitag	7156e47355	Introduce defaultServerFolder and defaultClientFolder.	2012-09-28 13:42:22 +02:00
Klaas Freitag	94ceb95045	Remove unneeded settings-code for win32.	2012-09-28 11:36:39 +02:00
Klaas Freitag	b41d8c3c12	Removed app name from strings even more and replaced by theme string.	2012-09-27 17:22:08 +02:00
Klaas Freitag	9d3d789890	Rename ownCloudClient.ini to custom.ini and put it to /etc/ownCloud.	2012-09-27 15:28:49 +02:00
Klaas Freitag	d09693f191	Read sync-exclude.lst from /etc/ownCloud, renamed from exclude.lst.	2012-09-27 13:16:14 +02:00
Klaas Freitag	e4024015a4	Merge branch 'master' of github.com:owncloud/mirall	2012-09-27 12:30:27 +02:00
Klaas Freitag	180b99c02e	Change the csync config dir to the users app path, not longer .csync.	2012-09-27 12:27:40 +02:00
Daniel Molkentin	32579dd25a	Brown paper bag fix.	2012-09-27 12:22:27 +02:00
Daniel Molkentin	740370b106	Do not translate application name, it's a brand ... Another reason: File system and registry names depend on it	2012-09-27 11:52:58 +02:00
Daniel Molkentin	3d6a2a4966	Partial revert of 261731 ... An experimental change sneaked in.	2012-09-26 18:24:07 +02:00
Daniel Molkentin	6e1deab0ae	Supplemental: less hardcoded uses of "ownCloud"	2012-09-26 17:01:33 +02:00
Daniel Molkentin	5df5d55fa4	Make code more readable	2012-09-26 17:01:25 +02:00
Daniel Molkentin	991a04abc5	remove arguments from ownCloudInfo ctor ... its only caller is the singletons instance() method	2012-09-26 16:59:53 +02:00
Daniel Molkentin	261731c841	Consistency fixes for single folder mode	2012-09-26 16:59:47 +02:00
Daniel Molkentin	1b0744dac6	icon improvements ... - more sizes - rename state icons due to a cmake limitation (it globs owncloud-icon-* for mac and windows icons, which causes the state icons to appear as app icons) - adjust resourcefile and theme accordingly	2012-09-25 17:14:21 +02:00
Daniel Molkentin	bcf9bb8238	Reuse Theme singleton	2012-09-24 19:42:48 +02:00
Daniel Molkentin	bc08f81683	More use of appName() in tr()'s.	2012-09-24 19:21:55 +02:00
Daniel Molkentin	e3a9081181	Fix default implementation of Folder::nativeSecondPath().	2012-09-24 19:20:16 +02:00
Daniel Molkentin	2de9cc9590	Use the themes appName() instead of "ownCloud". ... This turns the Theme class into a singleton.	2012-09-24 17:57:20 +02:00
Daniel Molkentin	d0a66b70f4	Defer handling of pretty remote path to subclasses. ... The base class cannot reasonably assume anything about pretty printing. The subclasses know a lot better.	2012-09-21 18:33:11 +02:00
Daniel Molkentin	663a1886e9	CMake: Centralize all application-specific parameters.	2012-09-20 17:31:18 +02:00
Klaas Freitag	dd5d407198	Fix activation of list entries in status dialog (thanks kyle-f).	2012-09-20 18:14:22 +03:00
Daniel Molkentin	aa34331489	Remove unused declaration.	2012-09-20 11:12:52 +02:00
Daniel Molkentin	50166424c8	Fix crash on exit on X11.	2012-09-20 11:12:52 +02:00
Klaas Freitag	8f40b2a276	Use delete[] to free mem from qstrdup, thanks valgrind.	2012-09-19 13:51:27 +03:00
Klaas Freitag	d195ad3072	Fix ownCloud icon and a layout issue.	2012-09-19 13:31:42 +03:00
Klaas Freitag	75554a2ed6	Removed hackish beta version marker in status dialog.	2012-09-19 13:02:28 +03:00
Klaas Freitag	45d224e922	Handle the themed singleSyncFolder-mode correctly.	2012-09-19 12:58:34 +03:00
Klaas Freitag	09d8fb9483	Add a theme switch to only allow a single sync folder for the client.	2012-09-19 12:58:02 +03:00
Klaas Freitag	a526035273	Add a method to set the enabled status of the buttons correctly.	2012-09-19 12:57:12 +03:00
Klaas Freitag	090bdcab68	Use the THEME_CLASS macro in config file class.	2012-09-18 13:55:58 +03:00
Klaas Freitag	29f3a002c4	Merge branch 'master' of github.com:owncloud/mirall	2012-09-18 13:53:42 +03:00
Klaas Freitag	a9c7b9304e	Use a macro THEME_CLASS from CMakeLists.txt instead of ifdefs.	2012-09-18 13:52:52 +03:00
Daniel Molkentin	aab1c94e44	Simplify version display. ... Reduces amount of required helper macros.	2012-09-17 21:23:56 +02:00
Daniel Molkentin	6d13b1b2fb	Added a simple about dialog.	2012-09-17 21:06:20 +02:00
Daniel Molkentin	ff4a119c0c	Don't swallow ':' when entered. ... Treat entering 'http(s)://' gracefully by removing the substring and flipping the checkbox.	2012-09-17 19:23:53 +02:00
Kyle Fazzari	4dbd8ee016	Forgot to comform to ownCloud coding standards. Fixed.	2012-09-13 22:51:47 -04:00
Kyle Fazzari	2652a744d0	Damino requested that QUrl be used to parse the URL, along with toString(QUrl::RemoveScheme). QUrl::RemoveScheme doesn't remove the slashes, so extra code was thrown in to ensure they were removed if they were present.	2012-09-13 22:47:39 -04:00
Kyle Fazzari	7f6d39383e	Found a much slicker solution to the problem of the OC URL ... containing the protocol when the back button is used. Instead of moving to two separate URL fields, a slot was created and connected to the textChanged signal of the OCUrl LineEdit. This slot simply ensures the protocol is not present.	2012-09-11 18:56:32 -04:00
Sebastian Kügler	591b71cf18	Return QNetworkReply from remote mkdir ... This patch allows the client implementation to react to specific results of mkdir requests I need this patch to be able to catch errors from creating remote folders.	2012-09-11 05:26:07 +02:00
Sebastian Kügler	76e9687d6f	Return QNetworkReply from getRequests ... This patch allows the client implementation to react to specific getRequests, such as folder checks, etc. It allows to connect client-specific slots to requests, catch its errors and handle them separately. I need this patch to be able to check more than one remote folder on the server, and not mix up their job's signal handling.	2012-09-11 03:35:32 +02:00
Kyle Fazzari	a426c4ea37	* Fixed bug where the if one enters the owncloud URL on the setup page of the initial wizard, continued, and then hit the back button on the Install page, the protocol was included in the URL.	2012-09-10 20:50:51 -04:00
Sebastian Kügler	c24728b692	Move SslErrorDialog into Application ... This patch makes it possible to cut out a large piece from the lib. We want to avoid having GUI code in the daemon. For Mirall, this is now handled in Application. for other clients, they can do whatever they want with this signal, and implement their own SSL Error handling. The patch isn't exactly a beauty queen, since it involves some back-and-forth between application and owncloudinfo objects, but it seems the only way to properly separate and abstract the UI out of owncloudinfo, and cuts down a huge part of the dependency chain, especially QWidget-based classes. I haven't been able to properly test this, but if anyone can give me a login to a server that has wrong or untrusted SSL certificates, I'll happily do it. Merge? *puppy eyes*	2012-09-10 23:53:49 +02:00
Klaas Freitag	7701805dc4	Add a warning window for/against usage of old server versions.	2012-08-30 18:52:50 +03:00
Klaas Freitag	824bd1e087	Fix memory allocation for proxy struct in thread.	2012-08-30 18:50:42 +03:00
Klaas Freitag	f78f3e0869	Set beta tag to application version. Not a pretty solution.	2012-08-30 18:48:32 +03:00
Klaas Freitag	094d563dbb	Set sslCertsTrust to defined value at start.	2012-08-30 14:02:42 +03:00
Klaas Freitag	cb6b3e1d85	Setup connections to ocinfo when needed.	2012-08-30 14:02:15 +03:00
Klaas Freitag	72e14b3688	Use the remote.php/webdav url rather than files/webdav.php	2012-08-30 13:23:14 +03:00
Klaas Freitag	a723a968ba	allow custom media at relative path for windows.	2012-08-27 19:09:56 +03:00
Klaas Freitag	f4bb981ad4	add application path back to translation laoding.	2012-08-27 18:59:31 +03:00
Klaas Freitag	ced6f0ed96	Fix compile problem.	2012-08-26 16:10:17 +02:00
Klaas Freitag	fd7cb38c16	Use qthread more correct, see ... http://labs.qt.nokia.com/2006/12/04/threading-without-the-headache/	2012-08-26 11:47:45 +02:00
Klaas Freitag	a459f468a3	Use PlainTextEdit widget for more efficient log file display.	2012-08-26 11:46:59 +02:00
Klaas Freitag	5294f446a2	Merge branch 'master' of gitorious.org:owncloud/mirall ... Conflicts: src/mirall/owncloudinfo.cpp src/mirall/owncloudsetupwizard.cpp src/mirall/owncloudwizard.cpp	2012-08-24 11:16:58 +02:00
Klaas Freitag	d733aac0e8	Fix QLatin1String issues.	2012-08-17 18:13:17 +03:00
Klaas Freitag	a8296a6b6e	Removed unneeded win32 headers.	2012-08-17 18:00:03 +03:00
Klaas Freitag	094f791400	Removed unused file temporarydir.	2012-08-17 17:55:15 +03:00
Klaas Freitag	58d75e7bfe	Show pathes in platform specific notation	2012-08-15 18:16:44 +03:00
Klaas Freitag	1b7ad22e2e	Fix setup dialog: Use https if checkbox is activated.	2012-08-14 13:23:06 +03:00
Klaas Freitag	74c6c4e7c9	cleanups and improved error messaging on proxy problems.	2012-08-09 15:13:20 +03:00
Klaas Freitag	9e30fe4ea5	Do not stop syncing if local directories are write protected.	2012-08-09 12:12:54 +03:00
Klaas Freitag	d743f7f4b3	Fixed and cleaned redirect bug, make sync work again.	2012-08-08 23:11:07 +03:00
Klaas Freitag	8117b9802b	Connect ocInfo only if needed in ownCloud setup wizard.	2012-08-08 16:52:12 +03:00
Klaas Freitag	08d925a8fa	read proxy setting from cfg file rather than from Qt proxy object.	2012-08-08 16:48:21 +03:00
Klaas Freitag	58ca49c8bd	QLatin1String fix.	2012-08-08 16:47:56 +03:00
Klaas Freitag	aeb0499833	read proxy settings from config file rather than from Qt proxy obj.	2012-08-08 16:47:25 +03:00
Klaas Freitag	80f2699c80	handle proxy port correctly.	2012-08-06 17:44:23 +03:00
Klaas Freitag	70838442c9	Fixed error handling on remote dir create.	2012-08-06 17:43:24 +03:00
Klaas Freitag	d694525d8f	Simplify loading of the exclude file on various platforms.	2012-08-06 16:13:35 +03:00
Klaas Freitag	c916f5cbd9	connect owncloudinfo signals more selective.	2012-08-06 15:00:22 +03:00
Klaas Freitag	83bda2c8d5	handle HTTP status 301 -> redirect.	2012-08-06 14:59:59 +03:00
Klaas Freitag	a00086759e	connect the owncloudinfo signals more selective.	2012-08-06 14:59:18 +03:00
Klaas Freitag	4b869cfb10	do not write CA Certs on its own, use methods in mirallconfigfile.	2012-08-06 14:58:24 +03:00
Klaas Freitag	f5717348f8	QLatin1String fix	2012-08-06 14:58:11 +03:00
Klaas Freitag	4cad29331f	- set ownCloudUrl and known CA Certs.	2012-08-06 14:57:26 +03:00
Klaas Freitag	84a588ccf0	Fix signal connection and initialize the dialog pointer to zero.	2012-08-06 11:13:26 +03:00
Klaas Freitag	2c2fe38ad0	Fix app name back to "ownCloud" to load existing configs again.	2012-08-03 15:03:57 +03:00
Klaas Freitag	bdb35f508a	QLatin1String fixes all over.	2012-08-02 12:17:24 +03:00
Klaas Freitag	35e92030f8	Fix size of dialog.	2012-08-02 12:16:18 +03:00
Klaas Freitag	9fe003df78	Restructured the tray context menu.	2012-08-02 12:15:57 +03:00
Klaas Freitag	ba856bf2d4	Fix proper placeholding patches in oC connection wizard.	2012-08-02 12:11:02 +03:00
Klaas Freitag	d867cfacb4	Some translation changes.	2012-08-02 12:09:37 +03:00
Klaas Freitag	eecb444772	Replace some delete calls with QObject parenting.	2012-08-02 12:08:27 +03:00
Klaas Freitag	42283e4684	Some code cleanups for the proxy dialog.	2012-08-02 12:07:14 +03:00
Klaas Freitag	343f646660	Fix load self signed certs into NetworkManager (#oc-843)	2012-08-02 12:02:46 +03:00
Klaas Freitag	d3bb223898	Proceed proxy settings to csync thread.	2012-08-02 11:17:15 +03:00
Daniel Molkentin	62d1f281c3	Fix SSL support in ownCloud wizard ... - honor secure connect option - fix connects in ctor of singleton - don't crash	2012-08-01 18:33:19 +02:00
Thomas Mueller	eb2d93de38	read proxy settings from config on dialog startup	2012-07-31 11:03:52 +02:00
Thomas Mueller	e4da16b9d6	support Qt 4.6	2012-07-31 10:43:38 +02:00
Klaas Freitag	5bde3262d6	Merge branch 'master' of gitorious.org:owncloud/mirall	2012-07-31 11:18:43 +03:00
Klaas Freitag	bfb99d2078	Qt part of proxy support - contributed by Thomas Mueller.	2012-07-31 11:17:52 +03:00
Dominik Schmidt	8fef939a1a	Extend wizard raising hack to OS X.	2012-07-31 01:57:02 +02:00
Klaas Freitag	5275238f51	Added 3rdpart QtSingleApplication class. Fixed some overall-status ... issues.	2012-07-30 17:10:48 +03:00
Klaas Freitag	ae847e46e7	Added support method statusToString	2012-07-30 17:09:49 +03:00
Klaas Freitag	1ff94e86bd	Fix build with UNICODE under windows, fix USE_INOTIFY initialization.	2012-07-30 17:08:42 +03:00
Klaas Freitag	90c4e422d8	Merge commit 'refs/merge-requests/7' of git://gitorious.org/owncloud/mirall into merge-requests/7	2012-07-26 11:45:30 +03:00
Klaas Freitag	0112bb1e05	Merge branch 'master' of gitorious.org:owncloud/mirall	2012-07-26 11:40:06 +03:00
Klaas Freitag	b7993a43fd	Removed Log Window Button	2012-07-26 11:38:14 +03:00
Klaas Freitag	b2580b4b0e	Merge branch 'master' of gitorious.org:owncloud/mirall	2012-07-26 10:16:59 +02:00
Klaas Freitag	e3f83f4bda	converted ownCloudInfo to Singleton pattern to fix crashes.	2012-07-26 10:16:18 +02:00
Klaas Freitag	66d70c0835	More custom media for the connect dialog.	2012-07-26 11:01:43 +03:00
Klaas Freitag	0c89dd9555	Store GUI customizations at system place.	2012-07-25 18:47:31 +03:00
Klaas Freitag	64e83cb287	Added a new setup page in the ownCloud connection wizard. Also added ... the ability for custom images and text in the setup assistant.	2012-07-25 17:51:29 +03:00
Klaas Freitag	37359969e4	Fix for bug #oc-1318, crash through accessing zero pointer.	2012-07-25 16:00:18 +03:00
Klaas Freitag	4ef948bf3c	Use a better inotify implementation and use config.h. Fixes oCB #713.	2012-07-20 17:13:23 +02:00
Klaas Freitag	4b33997678	Check the system for inotify in cmake and use a config.h file.	2012-07-20 17:12:29 +02:00
Klaas Freitag	2433b35727	Merge branch 'mirall-kde'	2012-07-20 11:56:50 +02:00
Klaas Freitag	75835c45a3	emit folderChange after initial setup.	2012-07-20 11:37:54 +02:00
Klaas Freitag	d225dd124b	Fixed icon setup. Theme now really supports icons in various sizes.	2012-07-18 17:29:06 +02:00