6388 Commits

Author	SHA1	Message	Date
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
Klaas Freitag	3244a922e3	fixed overall sync state calculation for tray .	2012-07-18 17:28:30 +02:00
Dominik Schmidt	d7fb6fa749	Fix installation on all platforms + bundle on osx	2012-07-17 15:16:02 +02:00
Michael Georg Hansen	9c64b5e753	Add a clear button to the log window.	2012-07-16 21:11:19 +02:00
Klaas Freitag	c3c8e512c8	Fix library build for windows, un-QOBJECTed the theme class.	2012-07-12 14:33:58 +02:00
Klaas Freitag	973c2c1786	remove the push atomar method call for csync.	2012-07-10 16:21:51 +02:00
Klaas Freitag	324a9d2480	Isolate a library to add a dbus interface around.	2012-07-10 15:59:06 +02:00
Klaas Freitag	dd4f76c5c7	replace URL by Link in user string	2012-07-02 11:03:41 +02:00
Klaas Freitag	40a3b1e4e8	Use absolute path function for directory comparison	2012-06-26 12:27:50 +02:00
Klaas Freitag	c8ac719752	Remove csync db in case the local path gets removed.	2012-06-25 15:31:13 +02:00
Klaas Freitag	928ef731c9	Better protection against remote folder delete.	2012-06-25 14:18:13 +02:00
Klaas Freitag	0e418b2f68	Fix a missing delete.	2012-06-22 15:36:04 +02:00
Klaas Freitag	6ad89d98a9	- Add csync push atomar switch ... - Fix a wording if the directory does not exist.	2012-06-22 15:35:22 +02:00
Klaas Freitag	34cf97a827	Also clear error list in folders for the inotify case.	2012-06-20 12:52:21 +02:00
Klaas Freitag	bccb17ce41	Clear error list on start of non local sync.	2012-06-20 12:50:46 +02:00
Klaas Freitag	5e2729ddef	Fix a typo in ssl dialog	2012-06-18 18:27:06 +02:00
Klaas Freitag	5d0aada871	Fix translations loading under win32	2012-06-18 17:45:04 +02:00
Klaas Freitag	689ef1254b	MacOS: Move translations to the right place	2012-06-18 15:52:56 +02:00
Klaas Freitag	cb99ccf75d	Load translations correctly.	2012-06-18 15:50:17 +02:00
Klaas Freitag	5ca9d5b915	Install i18n files in MacOS installer	2012-06-18 15:18:08 +02:00
Klaas Freitag	8384fe477a	Simplified LogBrowser	2012-06-18 14:51:49 +02:00
Klaas Freitag	8fe20369af	Some more usefull debug output	2012-06-18 10:42:30 +02:00
Klaas Freitag	9901d3a736	Added --help option with output	2012-06-15 13:36:38 +02:00
Klaas Freitag	c90eb1cca6	Log to file added, with flush option	2012-06-15 13:04:23 +02:00
Klaas Freitag	4d1fed3d00	Rejecting the SSL dialog means untrusting.	2012-06-15 11:18:16 +02:00
Klaas Freitag	4807c355e5	Fixed wording in setup assistant	2012-06-15 10:58:15 +02:00
Klaas Freitag	ce50043524	Improved some grammar based on Matts proposals.	2012-06-15 10:51:51 +02:00
Klaas Freitag	36ad4fdc83	More encoding fixes to make win32 with special chars work.	2012-06-13 17:34:20 +02:00
Klaas Freitag	a39fb310e1	use UTF-8 encoding in the settings file.	2012-06-13 17:33:48 +02:00
Klaas Freitag	d5d0c472ed	store the custom config for each reply object.	2012-06-13 11:37:20 +02:00
Klaas Freitag	f0bae07a2c	make ssldialog aware of custom configs.	2012-06-13 11:36:56 +02:00
Klaas Freitag	5953d36297	Fixed removeAllFolders: Terminate running syncs before removal.	2012-06-13 11:30:26 +02:00
Klaas Freitag	2dcbb54095	Use UTF8 to read password and username rather than local8bit.	2012-06-13 11:29:38 +02:00
Klaas Freitag	6d8956f68a	Make setup wizard really cancel if user clicks cancel and accept ... only if the user finally accepts the dialog. Remove all sync folder definitions if a new oC connection was done.	2012-06-12 12:30:05 +02:00
Klaas Freitag	f219b0613c	Added method to drop all sync folder definitions.	2012-06-12 12:29:39 +02:00
Klaas Freitag	d55900561b	only restart folderman if the setup wizard was closed with accept.	2012-06-12 12:28:58 +02:00
Klaas Freitag	e82681c47f	Added ability to work with the custom config file.	2012-06-12 12:28:07 +02:00
Klaas Freitag	408b44913e	Added ability to work with a custom config file different from the ... master one to test temporar connections in the setup wizard.	2012-06-12 12:27:02 +02:00
Klaas Freitag	1af154fc96	Merge branch 'extlogging'	2012-06-11 10:14:52 +02:00
Klaas Freitag	06b3a50e84	Wipe the csync statedb after a sync definition is removed.	2012-06-11 10:10:07 +02:00
Georg Ehrke	469a7a997c	fix spelling of password	2012-06-10 21:27:31 +02:00
Klaas Freitag	8b38131b4b	Provide proper return value for getauth	2012-06-05 18:37:48 +02:00
Klaas Freitag	c0cf575ada	Fix csync log encoding	2012-06-05 16:30:55 +02:00
Klaas Freitag	9d0a8d35d8	- created setupLogBrowser method in application ... - removed unused config variable code	2012-06-05 15:49:53 +02:00
Klaas Freitag	926f7ce4a5	Added a window for log output. ... Added log handlers for both the cmake logging and the mirall logging. Push all logging to a log window with the ability to save to a file.	2012-06-05 15:11:29 +02:00
Klaas Freitag	59f821f728	Make krazy2 build target optional if krazy is installed.	2012-06-04 16:44:49 +02:00
Klaas Freitag	3052506d31	Read poll timer settings from config file.	2012-05-26 14:37:21 +02:00
Klaas Freitag	dc7c6d1913	Fix win32 build again.	2012-05-26 13:25:05 +02:00
Dominik Schmidt	b7b617ac28	Add krazy target	2012-05-21 18:12:25 +02:00
Klaas Freitag	6f7165f9f0	A lot of krazy2 (codechecker) fixes.	2012-05-21 16:48:49 +02:00
Klaas Freitag	6cf6e1dcba	fix exclude.lst reading on MacOSX	2012-05-16 15:13:51 +02:00
Klaas Freitag	be7a1ca111	Find exclude.lst under MacOS	2012-05-16 14:55:19 +02:00
Klaas Freitag	0fdc3cb205	Add system info to updatedetector on Linux.	2012-05-16 11:56:05 +02:00
Klaas Freitag	d2adecbaac	Fix QDesktopServices::openURL for Win32, Qt bug.	2012-05-16 11:54:14 +02:00
Klaas Freitag	bbef2ef30e	Fix open the local folder action on Win32, workarounded a Qt bug.	2012-05-16 11:42:47 +02:00
Klaas Freitag	f9b060fe82	Added open ownCloud action to tray menu	2012-05-15 18:29:12 +02:00
Klaas Freitag	8510d1fc32	Use pause and resume instead of enable and disable	2012-05-15 18:03:53 +02:00
Klaas Freitag	0527f997c0	Push status window to front if you click on tray icon.	2012-05-15 17:52:30 +02:00
Klaas Freitag	c475fb644b	Merge branch 'master' of gitorious.org:owncloud/mirall	2012-05-15 08:20:30 +02:00
Klaas Freitag	7690734052	Enhanced version parsing from status.php	2012-05-14 16:22:30 +02:00
Klaas Freitag	f2888274f9	simplified url assembly for folderman.	2012-05-14 16:18:08 +02:00
Klaas Freitag	5a443bde70	Fix tray tooltip again	2012-05-14 13:23:04 +02:00
Klaas Freitag	f913790f29	Fix try message for disabled folders.	2012-05-14 11:51:47 +02:00
Klaas Freitag	64e94708df	If a sync folder is removed, terminate if its currently running.	2012-05-14 11:09:01 +02:00
Klaas Freitag	f7e5f021c7	Fix icon install again, renaming.	2012-05-11 10:50:43 +02:00
Klaas Freitag	5bc6e080de	Fix icon install.	2012-05-11 10:30:35 +02:00
Klaas Freitag	d5ebf0477b	Install both application icons	2012-05-11 10:28:33 +02:00
Klaas Freitag	aa86561f31	write version set in VERSION.cmake to version.h	2012-05-11 10:19:15 +02:00
Klaas Freitag	9706d6e545	use QLatin1String rather than QString::from...	2012-05-11 10:10:23 +02:00
Klaas Freitag	3e99f25578	more useful debug output with network reply.	2012-05-11 10:09:57 +02:00
Klaas Freitag	f7fd9928b7	added a debug line without WIN32 marker.	2012-05-11 10:09:27 +02:00
Klaas Freitag	bacc70a299	Use the correct icon for sync ok	2012-05-02 17:12:45 +02:00
Klaas Freitag	cd6d3644b9	set owncloud compile flag for mac osx	2012-05-02 17:06:30 +02:00
Klaas Freitag	7fc409152f	Display a proper tray icon at app startup	2012-05-02 17:05:31 +02:00
Klaas Freitag	496572314d	Fix the app icon to be ownclouds	2012-05-02 16:33:07 +02:00
Klaas Freitag	8d33a470b1	Fixed theming: Made a mirall and a ownCloud icon theme working.	2012-05-02 15:50:01 +02:00
Klaas Freitag	125d2a4533	Make OWNCLOUD_CLIENT compile flag depending on the compile target.	2012-05-02 15:45:38 +02:00
Klaas Freitag	69e6096d14	Fixed encoding issue: Do not double encode.	2012-05-02 11:40:39 +02:00
Klaas Freitag	f8efb1fc99	- Added an open status entry into the tray menu ... - fixed some menu glitches on the mac os platform.	2012-04-30 16:38:00 +02:00
Klaas Freitag	9c4613e5d2	Allow to interrupt running sync task, incl. some cleanups.	2012-04-30 08:56:56 +02:00
Klaas Freitag	31b636a423	Add a win32 debug line to CMakeLists	2012-04-23 10:58:21 +02:00
Klaas Freitag	603151fe08	Add proper error message if the owncloud module could not be loaded.	2012-04-23 10:58:21 +02:00
Thomas Müller	527bece4a9	Backport to Qt 4.6 finished - test against a local installation of owncloud via http	2012-04-21 21:03:29 +02:00
Klaas Freitag	633e50e776	Removed unsused variable	2012-04-21 11:50:20 +02:00
Klaas Freitag	eb4fd865d5	Fix missing return values for bool functions.	2012-04-21 11:22:03 +02:00
Klaas Freitag	d8bb48bcee	Fix tray context menu after a folder has been added or removed.	2012-04-21 11:22:03 +02:00
Klaas Freitag	4c192d0960	initialize polltimercnt with one lower than exceed to start syncing ... quickly on program startup.	2012-04-21 11:22:03 +02:00
Klaas Freitag	fda234cfb8	initialize sync status correctly.	2012-04-21 11:22:03 +02:00
Klaas Freitag	a875d14671	Improved startup logging with version and lang	2012-04-21 11:22:03 +02:00
Thomas Müller	c52a3f290b	continue backport Qt 4.6: place holder text was introduced in Qt 4.7	2012-04-21 01:07:22 +02:00
Thomas Müller	8695b8fb3c	implement MKCOL with QHttp to make it work with Qt 4.6	2012-04-20 23:58:09 +02:00
Klaas Freitag	9e163a3c28	Fix QApp contructor singature	2012-04-20 13:17:48 +02:00
Klaas Freitag	a81ad4acdc	Translation and wording fixes.	2012-04-18 15:21:55 +02:00
Klaas Freitag	3f027cda73	Handle translation files correct.	2012-04-18 13:59:03 +02:00
Klaas Freitag	d4b264acbc	Log the system name used for translations	2012-04-18 12:10:14 +02:00
Klaas Freitag	2c90a368f9	minor fixes and changes.	2012-04-18 11:59:56 +02:00
Klaas Freitag	1cb23ecb26	fixed wording.	2012-04-17 17:03:46 +02:00
Klaas Freitag	5c07363335	fix status dialog status display and overall status display.	2012-04-17 15:02:18 +02:00
Klaas Freitag	61ddff840a	Fix display status dialog: Do not flicker on local runs if polling. ... handle syncresult object in folder consistent.	2012-04-17 13:18:14 +02:00
Klaas Freitag	3f379b5671	removed useless double include.	2012-04-17 13:18:14 +02:00
Klaas Freitag	3c3bdeec5b	added clearError and flag to indicate local run methods.	2012-04-17 13:18:14 +02:00
Klaas Freitag	e521d0f53c	fix check if INOTIFY flag was given on cmake command line.	2012-04-17 13:18:14 +02:00
Klaas Freitag	2f5a3b849c	- Restrict authentication to the configured ownCloud URL ... - catch wrong username error correctly and report to user.	2012-04-17 13:06:25 +02:00
Klaas Freitag	b92c22b6df	use thread save implementation of error codes in csync.	2012-04-17 12:34:19 +02:00
Dominik Schmidt	ccac3dcf95	Make it buildable as bundle on OSX	2012-04-16 13:03:20 +02:00
Florian Reinhard	508d05336b	cmake fix.	2012-04-15 18:30:31 +02:00
Klaas Freitag	77fff8e1bf	Caught additional error messages	2012-04-15 16:49:11 +02:00
Klaas Freitag	29a38b82ad	Replace USE_WATCHER with USE_INOTIFY	2012-04-15 14:47:43 +02:00
Klaas Freitag	4a89768d02	Removed obsolete QWebdav class from CMake	2012-04-15 14:43:50 +02:00
Klaas Freitag	8cec736fea	Fix mkdir in owncloudsetupwizard	2012-04-15 14:36:24 +02:00
Klaas Freitag	bf61aba351	Enable activation of status dialog entries on macos	2012-04-15 14:14:16 +02:00
Klaas Freitag	c71ad3072f	Removed mirallwebdav header	2012-04-15 14:07:00 +02:00
Klaas Freitag	ccd93036fb	Removed obsolete class MirallWebDav	2012-04-15 14:06:27 +02:00
Klaas Freitag	c04315805f	clearifications in ownCloudInfo	2012-04-15 13:54:16 +02:00
Klaas Freitag	7c6ec3de93	Created WebDAV MkCol request on ownCloudInfo, QWebDav-Lib ready to ... be deleted.	2012-04-14 19:08:53 +02:00
Klaas Freitag	28aa90444a	Fixed a missing return type.	2012-04-14 12:56:45 +02:00
Dominik Schmidt	b6472ce1af	Make USE_WATCHER configurable from CMake	2012-04-14 14:31:46 +02:00
Klaas Freitag	7acf400436	Removed path from csync include	2012-04-14 12:16:30 +02:00
Klaas Freitag	93b0f3e6ca	removed a compile warning non void return type.	2012-04-14 12:09:08 +02:00
Klaas Freitag	74abe2fa7a	explicitely enable the finish button.	2012-04-14 11:20:12 +02:00
Dominik Schmidt	f7c34ea652	Try some stuff with FindCsync.cmake	2012-04-14 04:19:52 +02:00
Klaas Freitag	590f563150	Pushed to version 1.0.1	2012-04-12 21:34:04 +02:00
Klaas Freitag	fe45804c37	Save password base64 encoded instead of plain text	2012-04-12 21:30:47 +02:00
Klaas Freitag	cb9fcb00bd	fixed password storage field when writing config.	2012-04-12 14:48:45 +02:00
Klaas Freitag	b8434a8d56	Support for password not stored locally.	2012-04-12 14:06:59 +02:00
Klaas Freitag	3fede657b9	SSL Connection Warning dialog working.	2012-04-12 11:37:48 +02:00
Klaas Freitag	0d0783ba5c	Fixed owncloudinfo to handle multiple connections, workarounded a ... few 'interesting' behaviours of QNetworkAccessManager.	2012-04-10 20:55:50 +02:00
Klaas Freitag	21a385ab4a	- passed whole NetworkReply object to not-found slots to give more ... descriptive error messages. - Improved error messages for users if ownCloud is unreachable. - Fixed a crash with ownCloudInfo getting deleted by Statusdialog.	2012-04-10 14:51:45 +02:00
Klaas Freitag	9fbc97503e	Fix build, early stage.	2012-04-06 09:00:15 +02:00
Klaas Freitag	5ac5d6ee5f	SSL Support WIP - not yet functionable.	2012-04-06 08:53:57 +02:00
Klaas Freitag	2e8c963d21	remove test setting of own version.	2012-04-02 20:19:01 +02:00
Klaas Freitag	663e352956	Added an update check that queries an oC server for new versions.	2012-04-02 20:10:29 +02:00
Klaas Freitag	6f49d20785	- enable WIN32 build ... - enable cpack changes.	2012-04-02 13:47:53 +02:00
Klaas Freitag	43a9d1dcd0	added app icon	2012-04-02 13:44:00 +02:00
Klaas Freitag	596e824b54	Fixed sync start after ownCloud initial configuration.	2012-04-02 13:21:13 +02:00
Klaas Freitag	eb1fd2d5f8	Set verion to 1.0.0	2012-04-02 13:15:53 +02:00
Klaas Freitag	225753b150	Win32: Open local urls in Explorer correctly.	2012-04-02 12:13:55 +02:00
Klaas Freitag	41cc1b9377	search alternative places for the global exclude list	2012-04-01 15:09:04 +02:00
Klaas Freitag	cd817940ae	- added a new icon to display the waiting-to-be-synced state ... - fixed the status display if the status dialog opens	2012-03-31 12:44:22 +02:00
Klaas Freitag	c196f77732	- Fixed the tray icon on all platforms. ... - Simplified the application icon method in the theme - Set a Window Icon	2012-03-31 11:31:28 +02:00
Klaas Freitag	ccd1623528	Added check on correct oC Credentials on startup.	2012-03-30 20:42:40 +02:00
Klaas Freitag	903c8ca220	Provide better error messages in owncloud for csync bugs.	2012-03-30 15:34:56 +02:00
Klaas Freitag	8e637bd8c7	- fixed local file change detection in win poller ... - fixed context menu at startup.	2012-03-30 13:57:02 +02:00
Klaas Freitag	3fb471edad	Changed the folder queue to use QString instead of folder ptrs. ... Delete folder after finished if its syncing at deletion time.	2012-03-29 10:13:19 +02:00
Klaas Freitag	d938c531c8	- added ocInfo check on startup to prevent folder syncing without ... valid ownCloud connection - fixed folder remove	2012-03-29 09:41:30 +02:00
Klaas Freitag	3d114f5b91	Use a large icon because QIcon does scale down but never up.	2012-03-28 17:28:50 +02:00
Klaas Freitag	bfc96b0783	Set Edit-Trigger to nothing. Do not let start editing by doubleclick.	2012-03-28 17:28:08 +02:00
Klaas Freitag	109bb10110	Initialise the resource code in the main function.	2012-03-28 17:27:28 +02:00
Klaas Freitag	3a36f54096	Added WIN32 switch to avoid the konsole window for production.	2012-03-28 17:26:54 +02:00
Klaas Freitag	ffc5895ba1	Poll folder watcher: compare to last seen file.	2012-03-28 15:13:08 +02:00
Klaas Freitag	84ffebe26c	Let folderwatcher use the exclude list file. ... simplified naming in mirallconfigfile class.	2012-03-28 12:23:34 +02:00
Klaas Freitag	47f5c51a87	Let csync load the exclude list file	2012-03-28 11:26:51 +02:00
Klaas Freitag	a89122d214	Fixed some mirall->ownCloud namings	2012-03-26 15:19:40 +02:00
Klaas Freitag	9dcc948b3b	Disabled some logging	2012-03-26 14:38:48 +02:00
Klaas Freitag	248a0cfed8	- removed the sitecopy files and last references ... - Fix status dialog: * display local and remote folder names * fixed status icon * fixed sizing when font size changes * fixed enable/disable buttons - moved second path to folder base class - added remote folder role to status dellegate	2012-03-26 13:20:15 +02:00
Klaas Freitag	b9a861c95c	added internationalization support in application object.	2012-03-26 11:02:01 +02:00
Klaas Freitag	3cee1275b9	Removed confusing open... button in status dialog, link added	2012-03-26 11:01:04 +02:00
Klaas Freitag	5259ae1565	added translations of the application.	2012-03-26 09:48:30 +02:00
Klaas Freitag	5f3d82288d	pushed version to 0.2.5 for next beta.	2012-03-26 09:34:46 +02:00
Klaas Freitag	5a4caef2db	Update folder list in status dialog without wiping selection.	2012-03-23 15:31:46 +01:00
Klaas Freitag	bdbb85f245	Big changes: queue sync requests of folders and do in one thread ... only to avoid thread clottering. Improve error reporting from the csync thread.	2012-03-22 16:22:08 +01:00
Klaas Freitag	c6a9fb02d0	A more secure csync thread implementation (part1)	2012-03-21 18:03:49 +01:00
Klaas Freitag	c5c3e2ecb1	prevent thread from crashing if len is less than zero.	2012-03-19 16:08:18 +01:00
Klaas Freitag	8f94ea9f6a	bumped version to next beta.	2012-03-17 13:48:29 +01:00
Klaas Freitag	91cab8f15f	allow 202 reply from server on mkcol request.	2012-03-16 15:20:50 +01:00
Klaas Freitag	08991a5177	fix memory leak in folderinfo	2012-03-16 15:16:45 +01:00
Klaas Freitag	cceb350582	Fix remote dir check by starting the timer in initialize of the page. ... Use showWarn everywhere.	2012-03-16 14:43:37 +01:00
Klaas Freitag	a074e4433e	Fix signal and slot arguments in Folder add wizard.	2012-03-16 12:54:56 +01:00
Klaas Freitag	838272240c	Fix detection of parent folders when adding a new folder.	2012-03-16 11:02:44 +01:00
Klaas Freitag	b7eae107ae	Fixed crash when removing folders. ... Simplified code to achieve that, removed a slot from status dia.	2012-03-16 10:39:20 +01:00
Klaas Freitag	16a9a73ea3	- removed constants.h as not longer needed because of themes. ... - tray icons from theme now.	2012-03-15 18:09:00 +01:00
Klaas Freitag	759e2fff9d	Added missing Q_OBJECTs	2012-03-14 11:57:08 +01:00
Klaas Freitag	ad6b3504ee	Added automatic creation of a sync after connect.	2012-03-14 11:26:00 +01:00
Klaas Freitag	e30ed86153	Add mirall version to user agent	2012-03-14 10:02:52 +01:00
Klaas Freitag	ac2df346ac	Handle empty oC-Url from setup correctly.	2012-03-14 09:56:47 +01:00
Klaas Freitag	3bbfeaee93	- do connection check to owncloud in the show event. ... - fix deletion of the check object	2012-03-14 09:52:18 +01:00
Klaas Freitag	cc25ee62cc	Set strict permission on cfg file.	2012-03-13 17:52:23 +01:00
Klaas Freitag	ba13437fce	Remove user and passwd from ownCloud url and implement a callback. ... Added static data to CSyncThread to hold user and passwd, which is asked for in the callback.	2012-03-13 17:37:43 +01:00
Klaas Freitag	4699093c06	Fix tray icon loading if no share is defined.	2012-03-13 16:30:37 +01:00
Klaas Freitag	1a20d42424	use portable QTimer to initialize the rand function.	2012-03-13 15:45:10 +01:00
Klaas Freitag	753be4d2bc	version to new internal beta 0.2.3	2012-03-13 15:39:50 +01:00
Klaas Freitag	2882b49676	More elegant status dialog update	2012-03-13 15:39:04 +01:00
Klaas Freitag	2ae1b5dc84	move the poll timer stop to the correct place just before starting ... to sync.	2012-03-12 17:37:18 +01:00
Klaas Freitag	c61c7962f7	introduce a proper model for the status dialog.	2012-03-08 13:40:55 +01:00
Klaas Freitag	5908cd9377	open a folder on double click in status dialog.	2012-03-08 12:08:53 +01:00
Klaas Freitag	949b33a6d1	Set a variable poll timer interval, useful for multiple folders. ... Start polltimer again after folder add.	2012-03-08 11:39:31 +01:00
Klaas Freitag	cf4130caf9	fix more include dirs and link commands for csync.	2012-03-08 11:37:36 +01:00
Klaas Freitag	98a3fff9b9	Removed an unused comment	2012-03-03 11:01:36 +01:00
Klaas Freitag	dbf02772c3	Fixed tray icon, use theme for this ... Fixed folder enable/disable.	2012-03-03 10:51:06 +01:00
Klaas Freitag	1f12f3d181	Next beta version 0.2.2	2012-03-03 10:18:47 +01:00
Klaas Freitag	f494492459	Refresh status dialog after removal of a folder	2012-03-03 10:18:03 +01:00
Klaas Freitag	660abb491d	Add install target for owncloud	2012-03-02 15:03:35 +01:00
Klaas Freitag	1fc60f8797	Set version to internal beta version 0.2.1	2012-03-02 11:49:01 +01:00
Klaas Freitag	afe6180a88	Fixed some glitches in CMakeLists.txt for Unix	2012-03-01 16:56:08 +01:00
Klaas Freitag	8c9e364eec	Removed moc includes as this is fixed in the build process.	2012-03-01 16:15:29 +01:00
Klaas Freitag	65f80c655c	Fixes for inotify includes on win ... removed moc include	2012-03-01 16:14:44 +01:00
Klaas Freitag	d1f0578bf8	some changes to get inotify out of win build. ... removed moc include.	2012-03-01 16:13:50 +01:00
Klaas Freitag	060b2ddfa5	Use undef instead of numeric define for USE_WATCHER	2012-03-01 16:12:44 +01:00
Klaas Freitag	dd1c947c38	added missing include stdint.h	2012-03-01 16:11:56 +01:00
Klaas Freitag	f892212acf	Changes to build for mingw32 properly.	2012-03-01 16:10:08 +01:00
Klaas Freitag	96ac39601c	Fixed ignore handling, do not allow hidden files to trigger sync.	2012-02-29 16:25:38 +01:00
Klaas Freitag	1fc19647e5	Added #ifdef USE_WATCHER to switch between INotify and Polling ... depending on the platform environment var set by Qt.	2012-02-29 15:25:16 +01:00
Klaas Freitag	f6846a2107	Added local polling to owncloud folder, based on csync.	2012-02-28 16:49:13 +01:00
Klaas Freitag	59b8af2aef	removed the INotify initialisation.	2012-02-28 15:14:35 +01:00
Klaas Freitag	e06867f155	disabled a log line	2012-02-28 15:13:59 +01:00
Klaas Freitag	c9597c8fb9	Added a splashscreen.	2012-02-23 11:44:44 +01:00
Klaas Freitag	94481a672a	button to add a new sync folder added to status dialog.	2012-02-21 13:26:39 +01:00
Klaas Freitag	267f444dd1	Hide some buttons in status dialog which are currently not needed, ... show ownCloud info on status dialog	2012-02-21 12:40:46 +01:00
Klaas Freitag	da482e742b	removed all GUI related stuff finally away from the folder class, ... last thing were the openActions, which went to the GUI class.	2012-02-21 11:50:19 +01:00
Klaas Freitag	5e08f15aca	more elaborated version macros, moved version to theme class	2012-02-21 10:48:18 +01:00
Klaas Freitag	4c655684a0	introduced theming in the status dialog, removed the syncState again ... and moved it to the SyncResult object to simplify code, removed icon code from folders (WIP), removed some unused code.	2012-02-20 16:45:27 +01:00
Klaas Freitag	34f28bb4ad	Display status "Sync running" in status dialog correctly.	2012-02-18 21:58:12 +01:00
Klaas Freitag	e63fcdc9f0	simplified the folder change notification to the GUI app: Reduced ... to one signal stateChanged(), provided an easy api to get the new state and last sync result by alias in folderman.	2012-02-18 21:21:58 +01:00
Klaas Freitag	b52f9f534d	removed ownCloudDirCheck class and enhanced ownCloudInfo class to take ... its functionality. Added defaultConnectionName() and AuthHeader to the config file class. Fixed folderwizard to create ownCloud folder again.	2012-02-18 17:02:10 +01:00
Klaas Freitag	0001b9088a	- WIP ownCloud connect wizard: added a test call to check if the ... connect really works, better error checking	2012-02-17 15:54:39 +01:00
Klaas Freitag	ddf062ee14	- set app name correctly in config file class ... - fix link to newly installed ownCloud	2012-02-17 12:16:48 +01:00
Klaas Freitag	d31877a448	- fix config file location ... - writing ownCloud config works again	2012-02-17 11:56:27 +01:00
Klaas Freitag	2c6c2625bf	WIP: ... - split up owncloudsetup class to have a wizard class and a class that delivers plain config data - renamed ownCloudSetup -> ownCloudSetupWizard - added new class MirallConfigFile - made mirall config file (which currently only contains the owncloud connection) multi-connection aware - removed some sitecopy code - removed fetch- and push slots - adopted readFolderConfigFromFile to new file format	2012-02-17 11:11:18 +01:00
Klaas Freitag	04841c940d	WIP: introduce folder manager to separate folder management from ... GUI and ease the Application object	2012-02-17 09:48:31 +01:00
Klaas Freitag	591054ed8f	introduced a theming class to build the traditional mirall client ... as well as an ownCloud client	2012-02-16 10:42:44 +01:00
Klaas Freitag	07cfc08823	Use a hash to store inotified pathes.	2012-02-15 22:36:52 +01:00
Klaas Freitag	d2f989566d	removed sitecopy code from application and fixed url setting bug	2012-02-15 21:45:11 +01:00
dragotin	9da08610ee	Merge pull request #3 from dschmidt/master ... fix static linking to libmirall/qwebdav	2012-02-15 05:48:13 -08:00
Klaas Freitag	c55f0201fc	remove accidentially added sync client and add owncloud folder	2012-02-15 14:44:09 +01:00
Klaas Freitag	0c46382b6b	moved CsyncThread class to its own file	2012-02-15 09:30:37 +01:00
Klaas Freitag	ad0be9f6ee	- Added info dialog with file listing ... - Added overall status display on the tray icon plus tooltip -> patches from Alvaro Soliverez	2012-01-23 22:10:01 +01:00
Klaas Freitag	128223553c	added a windows compatible implementation	2012-01-20 10:21:49 +01:00
Dominik Schmidt	7e988d2e08	win32: fix static linking to libmirall/qwebdav	2012-01-19 14:10:18 +01:00
Klaas Freitag	e168eeae46	more useful user feedback about sync state, patch provided by Alvaro Soliverez	2011-12-29 09:31:45 +01:00
Klaas Freitag	bb2baeb1d2	Two patches sent by Alvaro Soliverez <asoliverez@kde.org>: ... - fixed refresh of the folder list in the status dialog - show enabled status in the status dialog	2011-12-25 21:55:29 +01:00
Klaas Freitag	0c9c2962c2	Enable/Disable button, patch submitted by Alvaro Soliverez	2011-12-12 17:47:30 +01:00
Klaas Freitag	c23c96cdc6	- add exclude patterns to sitecopy config, Patch contributed by Alvaro ... Soliverez	2011-12-12 17:26:13 +01:00
Klaas Freitag	a3fa419f82	Bump version	2011-12-05 12:03:16 +01:00
Klaas Freitag	180c06b39e	Patch sent in by Alvaro Soliverez: Add a "upload" button to the ... Status dialog to solve conflict situations from local -> cloud	2011-12-05 12:01:39 +01:00
Klaas Freitag	bf40e0aafc	- added icon defaults for systems without icon theming bnc#730834 ... - fixed some bugs with ownCloud status check fails - bumped version to 0.1.2	2011-11-28 14:53:34 +01:00
Klaas Freitag	56a30af52d	virtual inheritance not supported, fix compile problem	2011-11-28 13:35:46 +01:00
Klaas Freitag	37d6fb6022	Version string added	2011-11-24 16:38:12 +01:00
Klaas Freitag	cb4c5e31b1	- fix ownCloud sourcepackage download from owncloud.org ... - fix installation output in setup dialog	2011-11-24 16:26:24 +01:00
Klaas Freitag	b9ce7d037f	- renamed icons to mirall instead of ownCloud ... - install of desktop file icon added	2011-11-22 18:31:44 +01:00
Klaas Freitag	782cda05dc	Merge branch 'master' of github.com:dragotin/mirall	2011-11-07 17:09:18 +01:00
Klaas Freitag	b7ca0ef36a	Added install target, thanks to Dominik Schmidt <dev@dominik-schmidt.de> for the patch	2011-11-07 17:09:02 +01:00
Klaas Freitag	cd4528324c	error handling: sitecopy not installed	2011-11-04 11:41:49 +01:00
Klaas Freitag	869152424c	Polished the ui, stop syncing during user actions.	2011-11-03 16:06:40 +01:00
Klaas Freitag	b7f5b8c2d8	Fix authentication loop if ownCloud does not accept the basic auth header	2011-11-02 15:07:34 +01:00
Klaas Freitag	e660fe25b1	Use the new owncloud-admin version	2011-11-02 14:44:53 +01:00
Klaas Freitag	aa8ba76e3c	deleted unused files	2011-10-26 14:00:28 +02:00
Klaas Freitag	4c002a127f	added webdav support utilizing qtwebdav-qnetworkmanager	2011-10-26 13:59:06 +02:00
Klaas Freitag	de8d7bb87c	Added open ownCloud button to status dialog	2011-10-20 11:48:41 +02:00
Klaas Freitag	267d74b381	More polish and bugfixing	2011-10-20 10:26:40 +02:00
Klaas Freitag	71873df369	Use icons depending on the backend	2011-10-19 13:10:43 +02:00
Klaas Freitag	9c27edc6b6	- polished the folder wizard ... - bugfixes - added user warnings if remote root dir is picked.	2011-10-19 11:53:12 +02:00
Klaas Freitag	9d3a0e8596	Implemented folder fetching.	2011-10-18 10:22:24 +02:00
Klaas Freitag	90f722e2da	- fix alias bug in folderwizard ... - call restart before showing folderwizard - ask for admin credentials for ftp install	2011-10-14 18:13:34 +02:00
Klaas Freitag	95eadf2cb9	some more smaller fixes	2011-10-14 16:39:53 +02:00
Klaas Freitag	4911a528c4	Error publishing in the status dialog	2011-10-13 16:41:24 +02:00
Klaas Freitag	a2c564306f	Enable secure connection via sitecopy	2011-10-13 13:58:46 +02:00
Klaas Freitag	cb359ba89d	removal of folders added	2011-10-13 13:55:52 +02:00
Klaas Freitag	ced69489a5	WIP status dialog	2011-10-12 16:58:54 +02:00
Klaas Freitag	c4b24ab952	Show warning on wrong remote folder	2011-10-12 15:14:39 +02:00
Klaas Freitag	91b12c7eb3	Show a warning text in folder wizard	2011-10-11 15:39:25 +02:00
Klaas Freitag	91bf272c9b	Don't allow to pick local directories or aliases twice.	2011-10-11 14:23:32 +02:00
Klaas Freitag	ecc3a9edd5	remote folder check for oC finished	2011-10-07 16:01:58 +02:00
Klaas Freitag	f4c5b9adbb	added check for the owncloud folder - WIP	2011-10-06 16:55:28 +02:00
Klaas Freitag	f3123b6c02	- simplified the folder wizard ... - live check of the ownCloud connect	2011-10-06 10:54:54 +02:00
Klaas Freitag	60c304667f	added online check	2011-10-05 17:49:03 +02:00
Klaas Freitag	2dec870eaa	Use nice empty icon	2011-10-05 15:56:56 +02:00
Klaas Freitag	f582c19c67	- fixed some Ownclouds -> ownCloud ... - start wizard if mirall config missing	2011-10-05 15:48:30 +02:00
Klaas Freitag	e0f8499484	Setup of local folder with initial sync	2011-10-05 12:11:10 +02:00
Klaas Freitag	5a42aa3028	Added some gpl headers to sourcefiles	2011-09-30 17:42:28 +02:00
Klaas Freitag	c9de9810e2	Fix url parameter, add http	2011-09-30 15:35:19 +02:00
Klaas Freitag	35aee0de00	Create the local sync folder successfully	2011-09-30 14:19:26 +02:00
Klaas Freitag	7452f1956e	Added owncloud credentials page	2011-09-30 12:51:56 +02:00
Klaas Freitag	3f860709bc	fix slash mixmax in url assembling for remote key in sitecopyrc	2011-09-30 12:04:17 +02:00
İsmail Dönmez	682325f977	Reparse configuration files when folders added/removed	2011-09-30 11:49:19 +02:00
İsmail Dönmez	37c6276197	Merge branch 'master' of git://github.com/dragotin/mirall	2011-09-30 11:46:56 +02:00
Klaas Freitag	96eaeb2c62	read oc url from config file.	2011-09-30 10:24:01 +02:00
Klaas Freitag	9043e69d27	- write mirall config file ... - check on valid parameters in owncloud wizard.	2011-09-29 19:05:49 +02:00
Klaas Freitag	b7c7b8a566	- handle empty password in .sitecopyrc. ... - check for the owncloud admin script and warn if its not there.	2011-09-29 17:17:50 +02:00
Klaas Freitag	e8dcfe4a3c	Installation of local computer and ftp based works.	2011-09-29 16:36:27 +02:00
Klaas Freitag	68b966256e	WIP: OC installation wizard integration	2011-09-28 18:14:48 +02:00
İsmail Dönmez	20bed61446	Fix typo	2011-09-28 12:14:14 +02:00
Klaas Freitag	292965c6a3	Wizard for owncloud configuration	2011-09-27 19:10:01 +02:00
Klaas Freitag	ace9e9d690	Error counting added	2011-09-27 08:15:30 +02:00
Klaas Freitag	defda477c4	status dialog work	2011-09-26 21:46:26 +02:00
Klaas Freitag	b3eecf54a5	improved error handling	2011-09-26 18:19:01 +02:00
Klaas Freitag	0000caa632	- various code cleanups ... - fix alias usage in sitecopy config file	2011-09-26 16:20:53 +02:00
Klaas Freitag	627a2691ad	Statusdialog added	2011-09-26 15:00:12 +02:00
Klaas Freitag	83613f4576	Add a sitecopy backend to mirall, some GUI cleanups	2011-09-26 13:12:00 +02:00
Duncan Mac-Vicar P	87ac6cae2b	add support for the conflict copy feature available on csync git	2011-09-13 14:18:47 +02:00
Duncan Mac-Vicar P	9569ff1dc6	link Qt to the static library	2011-04-08 12:03:09 +02:00
Duncan Mac-Vicar P	67b6e77979	handle errors to the UI	2011-04-08 11:36:53 +02:00
Duncan Mac-Vicar P	b0efc506cd	increase poll timer to 1 minute	2011-04-08 10:51:18 +02:00
Duncan Mac-Vicar P	d1ee08d442	add a mutex for the csync threads	2011-04-08 10:49:28 +02:00
Duncan Mac-Vicar P	0ba4fac32f	for csync, accept smb:// urls as well	2011-04-08 10:49:26 +02:00
Duncan Mac-Vicar P	58270990ed	force the initial sync even if the list is empty as this point	2011-04-08 10:48:22 +02:00
Duncan Mac-Vicar P	0aa5f51bb5	Use csync as default	2011-04-08 09:58:16 +02:00
Duncan Mac-Vicar P	3ce5932bbd	g ... Basic implementation of a CSyncFolder Still waiting for Jann's patches for conflictcopy to hit a stable release to make it the default.	2011-04-07 19:04:07 +02:00
Duncan Mac-Vicar P	83eeeb4216	Simplify how the event queue works. Now it is just a timer ... that gets restarted on every new event, and the processing starts when no events reset the timer for the event interval.	2011-04-06 22:35:08 +02:00
Duncan Mac-Vicar P	a4c5996f47	Make the folders network state aware	2011-04-06 15:57:18 +02:00
Duncan Mac-Vicar P	65c41b6368	add simple network location infrastructure	2011-04-06 15:22:40 +02:00
Duncan Mac-Vicar P	f882fe46e2	Use icons from theme. Qt already handles this in a nice way	2011-04-06 12:09:56 +02:00
Duncan Mac-Vicar P	2411b0c9b7	add proper licensing	2011-04-06 11:48:02 +02:00
Duncan Mac-Vicar P	493b6924c9	Setup the menu for new added folders	2011-04-06 10:56:20 +02:00
Duncan Mac-Vicar P	ab86052f8a	typo, it is path() not root()	2011-04-06 10:56:16 +02:00
Duncan Mac-Vicar P	79f28c7f10	stop poll timer when syncing, and add path to the debug messages	2011-04-06 10:40:15 +02:00
Duncan Mac-Vicar P	c19c9859e3	add alias to folder	2011-04-06 09:52:02 +02:00
Duncan Mac-Vicar P	c16fd94150	Fix crash at shutdown. ... Menu contains actions from the folders so we should first delete the tray and the folders later. Also change QHash in inotify watcher map to QMap as QHash gives weird crashes with the inotify thread.	2011-04-05 18:31:19 +02:00
Duncan Mac-Vicar P	f1d6352f27	working folder wizard, only actual creation of the folder pending	2011-04-05 18:31:14 +02:00
Duncan Mac-Vicar P	9055cdc60d	move polling system to Folder where it belongs	2011-04-05 12:16:24 +02:00
Duncan Mac-Vicar P	e721acd7e8	add folder wizard class	2011-04-05 11:10:44 +02:00
Duncan Mac-Vicar P	4e45cab2c1	- lot of stability improvements ... - the crash with threads goes away by using QMap - add a polling timer	2011-04-04 18:41:14 +02:00
Duncan Mac-Vicar P	389507d92f	Change icon when sync is running	2011-04-04 12:23:30 +02:00
Duncan Mac-Vicar P	5aa1e08558	unused member variable	2011-04-04 11:40:14 +02:00
Duncan Mac-Vicar P	8d5a760d91	implemented dynamic creation of folder configurations ... from INI files in user's home directory	2011-04-04 11:36:44 +02:00
Duncan Mac-Vicar P	3f32499c4e	If the first event happens before 5 secs after starting the ... program, it will always cause it to queue it to avoid event flood (5 secs). So don't init the QTime for last event, and then check if it is null.	2011-03-31 19:07:45 +02:00
Duncan Mac-Vicar P	7bac43c5c3	I missunderstood how mkdtemp worked. Allocate a buffer duplicating ... the template. Then free this buffer.	2011-03-31 19:06:30 +02:00
Duncan Mac-Vicar P	f917dbc2ad	- Use a full sync (without -path) the first time ... unison is invoked - disable -confirmbigdel	2011-03-31 08:19:04 +02:00
Duncan Mac-Vicar P	9d09b7ea5f	show only a summary of subdirectories	2011-03-29 22:23:42 +02:00
Duncan Mac-Vicar P	1b19507ca8	* Missing brackets changed all logic around an 'if' ... * Improve debug output	2011-03-28 11:54:10 +02:00
Duncan Mac-Vicar P	15579232f7	refactor the notification timer in a new method ... some debug messages cleanup	2011-03-27 23:29:45 +02:00
Duncan Mac-Vicar P	6b8589f4dc	When syncing, disable event notifier and start accumulating them ... until the sync is done. When they are enabled again, a forced event is scheduled to empty the queue.	2011-03-27 01:26:41 +01:00
Duncan Mac-Vicar P	64e4d531b3	sync process now runs, but no synchronization between sync processes	2011-03-25 18:25:56 +01:00
Duncan Mac-Vicar P	f31ddde36d	Merge branch 'fix_inotify' ... Conflicts: src/mirall/folder.cpp src/mirall/folder.h	2011-03-22 23:21:56 +01:00
Duncan Mac-Vicar P	d885fe39f8	Implement an event queue: ... - If FolderWatcher receives a inotify event in less than 5 seconds from the last one, then the paths are queued and a timer is setup for 5 seconds more. New events are queued if a timer is running. The next event after the time gap is due will process the full path list	2011-03-22 23:03:43 +01:00
Duncan Mac-Vicar P	f42169a8fc	The unison folder class. ... May be factor it out in a external process tool folder type later.	2011-03-21 00:58:53 +01:00
Duncan Mac-Vicar P	25685de4fd	move the subfolder list function to FileUtils	2011-03-20 22:43:03 +01:00
Duncan Mac-Vicar P	89361db55d	Only fire folderChanged if > 2 seconds since last event	2011-03-20 22:38:33 +01:00
Duncan Mac-Vicar P	d53490c67c	add accessor for root folder	2011-03-20 22:18:38 +01:00
Duncan Mac-Vicar P	3bb5869183	add some documentation	2011-03-20 22:17:23 +01:00
Duncan Mac-Vicar P	ad90a6c05e	Make the socket read loop more robust, and handle the EINVAL when ... the read buffer is too small.	2011-03-20 22:13:40 +01:00
Duncan Mac-Vicar P	8b5c371012	- listen to the right events ... - rename inotify signal - pass also the cookie	2011-03-19 21:18:43 +01:00
Duncan Mac-Vicar P	bd5effe78c	- fix inotify/folderwatcher so that it uses full paths ... - make the test pass using QSignalSpy	2011-03-18 13:54:32 +01:00
Duncan Mac-Vicar P	e6a135273d	- introduce a tmp dir class and rm-rf util function ... - start a testcase for the folder watcher part	2011-03-18 01:14:45 +01:00
Duncan Mac-Vicar P	03194d3aae	Make the inotify interface work with multiple paths	2011-03-17 07:13:30 +01:00
Duncan Mac-Vicar P	5294bee2bf	Infrastructure for inotify. To replace QFileSystemWatcher, which, due ... to a Qt bug, can't see modified files. See http://qt.gitorious.org/qt/qt/merge_requests/2301	2011-03-16 14:53:41 +01:00
Duncan Mac-Vicar P	e2638aa487	react to its own signals to set the icons	2011-02-17 15:10:06 +01:00
Duncan Mac-Vicar P	0af772f524	fix defines	2011-02-17 15:10:03 +01:00
Duncan Mac-Vicar P	cf88820069	rename action to openAction to add also forgetAction and others later	2011-02-17 11:27:05 +01:00
Duncan Mac-Vicar P	b7a3fc7ab8	first port to C++	2011-02-17 00:21:45 +01:00