3218 Commits

Author	SHA1	Message	Date
Klaas Freitag	743c1c2eda	SocketAPI: Send an UPDATE_VIEW to the shell plugin on connect. ... For each configured sync folder send an UPDATE_VIEW directly after the socket connect to make the shell integration updating the view.	2014-07-17 11:26:03 +02:00
Klaas Freitag	0e9a08cbbf	SocketAPI: rename slot to send UPDATE_VIEW.	2014-07-17 11:25:08 +02:00
Klaas Freitag	d2445ec72d	PropagatorQNAM: Never send if-match header for new files.	2014-07-17 11:23:11 +02:00
Klaas Freitag	fef713aaed	SocketAPI: Create the socket API instance in folderman.	2014-07-17 11:22:18 +02:00
Klaas Freitag	c4d73688a6	Folderman: Fix path detection in folderForPath().	2014-07-17 11:21:02 +02:00
Daniel Molkentin	56b721b2eb	propagator_qnam: fix warning	2014-07-17 11:05:16 +02:00
Klaas Freitag	e6c501de8e	FolderMan: More useful logging.	2014-07-16 16:59:20 +02:00
Klaas Freitag	71338000a4	SetupWizard: Keep initial local folder to compare later for changes. ... If the local folder changes, the sync has to be reinitialized as well. Until now we did not detect that, which led to the case that the sync folder was not reinitialized in case only the local folder changed in the setup dialog.	2014-07-16 11:37:46 +02:00
Olivier Goffart	2fdb3cfdfb	Merge branch 'il' ... Conflicts: src/mirall/folder.cpp src/mirall/propagator_qnam.cpp	2014-07-16 10:49:16 +02:00
Olivier Goffart	8961e61f60	Merge branch '1.6' into il ... Conflicts: VERSION.cmake src/mirall/syncengine.cpp src/mirall/syncengine.h	2014-07-16 09:57:40 +02:00
Olivier Goffart	d697969f36	Use another way to detect that the server was reconfigured ... Before, we would only detect it if all the files were removed, and no file where added or changed. This may not be enough because there might be a welcome.txt file. Now, we check that none of the file stays the same, and some files are removed. Relates issue #1948	2014-07-15 18:09:08 +02:00
Olivier Goffart	51e9c5fd96	propagator_qnam Fix signal slot connection ... Fix the signature so it can be connected This was hapenning if the derver does not support X-OC-MTime issue #1963	2014-07-15 18:08:26 +02:00
Klaas Freitag	997504c03c	FolderMan: Unload folder method added. ... unloadFolder now correctly removes a folder from all maps and signal mappers.	2014-07-15 16:07:23 +02:00
Markus Goetz	0202351a27	Propagator: Fix crash when logging out during upload ... Fixes #1957	2014-07-14 19:53:42 +02:00
Daniel Molkentin	28879712e9	Make krazy target work again	2014-07-14 12:19:32 +02:00
Daniel Molkentin	3c2e43d883	Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir	2014-07-14 10:50:53 +02:00
Daniel Molkentin	5041880854	Try to handle BUILD_LIBRARIES_ONLY correctly ... Also, try to fix OS X build	2014-07-11 12:36:01 +02:00
Klaas Freitag	a281b36d6f	SocketAPI: send the path with UPDATE_VIEW	2014-07-11 12:34:04 +02:00
Klaas Freitag	7772501cdf	Remove unused socketPath variable.	2014-07-11 12:33:43 +02:00
Daniel Molkentin	2c904afd04	OS X explicitly requires the neon include path to be set	2014-07-11 12:11:04 +02:00
Daniel Molkentin	2cc13fb74a	Fix includes in mac specific headers	2014-07-11 11:38:01 +02:00
Daniel Molkentin	df3c3bca02	Split into three separate projects: library, gui and cmd	2014-07-11 11:07:31 +02:00
Daniel Molkentin	d1b991e198	Fix windows compilation	2014-07-10 22:58:58 +02:00
Klaas Freitag	00f793a841	CMake: Remove accidentially added typo to fix build.	2014-07-10 17:20:40 +02:00
Klaas Freitag	bdb9598227	SocketAPI: Use QTcpSocket all over, rather than QLocalSocket.	2014-07-10 16:35:18 +02:00
Klaas Freitag	c6deb392fd	SocketAPI: Enhance SyncFileStatus to have share information. ... Added a new class SyncFileStatus to reflect that properly.	2014-07-10 16:28:40 +02:00
Olivier Goffart	3477ea0eeb	Fix build with TOKEN_ONLY_AUTH ... It was broken by commit 6ff38d8005	2014-07-10 15:26:55 +02:00
Olivier Goffart	73e35c66af	owncloudcmd: fix the --trust option ... We can't call csync_set_userdata in owncloudcmd because it is going to be overwritten later in the SyncEngine. So we had an object of type SyncEngine* that we cast to CmdOptions* and the trust flag was in the padding, so was some random data. Therefore we must use global variables in that case in order to know if we should ignore the certificate.	2014-07-10 11:19:23 +02:00
Olivier Goffart	846773efd3	Define Q_DECL_OVERRIDE for Qt4 ... That macro is new in Qt5, define it as well when compiling with Qt4 so we can use it in mirall Note: QNetworkCookieJar::deleteCookie was not existing in Qt4.	2014-07-09 23:31:56 +02:00
Olivier Goffart	bcfa34357b	Add Q_DECL_OVERRIDE for all function that are overriding something ... This was made automatically with clang-modernize -override-macros -add-override	2014-07-09 23:31:56 +02:00
Olivier Goffart	e0c2e8ed86	folder: remove TOKEN_AUTH_ONLY ... Folder is no longer in the libowncloudsync	2014-07-09 22:44:08 +02:00
Olivier Goffart	b80a3876ab	cleanup the CMakeLists.txt ... Headers need not to be added if they are not going to be installed The list was incomplete anyway, and most of the _HEADERS variables were even not used	2014-07-09 22:44:08 +02:00
Olivier Goffart	26e17f58ef	Engine: Do not reset the csync log callback in the engine ... It is already set in Folder and we don't want to use the Logger in command line clients	2014-07-09 22:44:08 +02:00
Olivier Goffart	45d1567057	Move Folder, FolderMan, and FolderWatcher outside of owncloudsync ... Those class are maintaining the folder for the mirall configuration They are not usefull in command line clients Also the FolderWatcher is only used by the folder and not used by the command line clients	2014-07-09 22:44:08 +02:00
Olivier Goffart	8aacb3f7ec	Remove undeeded include	2014-07-09 22:44:08 +02:00
Olivier Goffart	99ee81a489	Utility: Move showInFileManager in its own file ... And get rid of GUI in the Utility namespace	2014-07-09 22:44:08 +02:00
Olivier Goffart	517ffbd783	Utility: remove Utility::dataLocation ... It is used only from one location, so put the code there	2014-07-09 22:44:08 +02:00
Olivier Goffart	7dd926d4f1	Utility: move raiseDisalog to owncloudGui ... Reduce the GUI dependency in the Utility namespace used by libowncloudsync	2014-07-09 22:44:08 +02:00
Olivier Goffart	cbc7942a00	Added t8.pl that test case sensitivity issues ... Made some change in the .cpp code in order to be able to test the code when the file system is case sensitive	2014-07-09 22:44:08 +02:00
Olivier Goffart	63cd5ef563	ProtocolWidget: limit the number of items ... That should save memory instead of letting the number of items grow to infinity	2014-07-09 15:48:03 +02:00
Olivier Goffart	82c254fecf	propagator_qnam: Avoid using too much memory ... The idea here was that the buffer would be maximum 8KiB, not minimum.	2014-07-08 15:30:53 +02:00
Olivier Goffart	86bea9a9af	shibboleth: Fix the waiting curser that would not disapear ... Fix #1915	2014-07-07 14:08:13 +02:00
Klaas Freitag	88f26fb548	HTTP Creds: In case of Keychain error, open the interact password dialog ... But in case the user clicks cancel in the interactive dialog, invalidate the credentials. Emit fechted() also in error case.	2014-07-04 13:27:35 +02:00
Klaas Freitag	a9f1de84f0	HTTP Credentials: Read the password from the old location if not found. ... Earlier clients used QtKeychain without a QSettings object, which made QtKeychain to write the password encrypted into a settings default location, ie. the registry under windows. If we can not find a password at the new location it is tried to read the password from the old default location once. That makes people happy in migration scenarios.	2014-07-04 13:27:22 +02:00
Olivier Goffart	081b7d4aa9	Merge pull request #1913 from owncloud/typo-fix ... Typo fix	2014-07-01 20:39:30 +02:00
Olivier Goffart	9c3c4bac66	Merge remote-tracking branch 'origin/il'	2014-07-01 20:37:42 +02:00
Daniel Molkentin	ad2eabeb3b	SocketAPI: Try to make the folder selection work on windows	2014-07-01 16:24:14 +02:00
Daniel Molkentin	26c377d05b	Utility: export new functions	2014-06-30 14:13:45 +02:00
Volkan Gezer	3ad9356ca4	Typo fix	2014-06-29 14:14:44 +02:00
Volkan Gezer	dd5296f03c	Typo fix ... Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/)	2014-06-29 14:06:45 +02:00
Volkan Gezer	e673d76f22	Typo fix ... Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/)	2014-06-29 14:04:30 +02:00
Volkan Gezer	393eb7bb4d	Typo fix ... Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/)	2014-06-29 14:02:50 +02:00
Daniel Molkentin	f8b097669a	Merge remote-tracking branch 'origin/1.6' ... Conflicts: VERSION.cmake doc/building.rst	2014-06-27 15:34:20 +02:00
Olivier Goffart	2f284209d8	Permissions: When moving is not allowed, fallback to delete and upload ... We decided that we never want to rename a directory behind the back of the user as the user may be using files in the directory during the sync. If moving is not allowed, we just erase the inode form the database so the next sync will try to do an upload and delete and recover from there using normal resolution. This also add some code to update the inode back to the db when it is detected as changed.	2014-06-27 15:30:08 +02:00
Olivier Goffart	09881040a3	Permissions: fix restoring subdirectories ... The sync item vector must be sorted before we call checkForPermission	2014-06-27 13:34:15 +02:00
Klaas Freitag	e76386be4f	Revert "ownCloudcmd: Use Account object and ConnectionValidator." ... We decided that owncloudcmd should not share the config with mirall. This reverts commit 5f96de32bb.	2014-06-26 10:16:56 +02:00
Olivier Goffart	48864a6921	httpcredentials: Remove useless mutex ... The mutex is not shared with any thread, so it is totaly useless. Yes: there are possible races here. (with the account, but also with the user and password)	2014-06-25 12:15:30 +02:00
Olivier Goffart	92f07cb60f	Enable C++11 ... In order to avoid the warning warning: anonymous variadic macros were introduced in C99 Due to the use of variadic macro in the qDebug macro in Qt 5.3 C++11 requires a space between string literal and macro to avoid the ambiguity with user defined litteral	2014-06-25 12:01:27 +02:00
Klaas Freitag	e17243bc1f	AccountMigrator: Read path from QDir::fromNativeSeperators(), add debug.	2014-06-25 11:38:08 +02:00
Klaas Freitag	0e45dd7a3d	AccountMigrator: Do not inherit from QObject as it is not needed yet. ... As requested by Danimos review.	2014-06-25 11:38:08 +02:00
Klaas Freitag	65f313f1b4	Account: Added missing include statement.	2014-06-25 11:38:08 +02:00
Klaas Freitag	da4958c716	Account: Read settings from ownCloud config if no branded exists. ... If there is not yet a config for a branded client, but one for the "normal" client targetting the same URL, it will be migrated.	2014-06-25 11:38:08 +02:00
Klaas Freitag	653b8494f5	FolderMan: Migrate folderlist if no folder definitions can be found ... and the account indicates that it was migrated. In that case, read the folder definitions from the ownCloud config directory.	2014-06-25 11:38:08 +02:00
Klaas Freitag	6ed6f84f6e	Account: Add a wasMigrated flag. ... If an account in a branded client was migrated from a former ownCloud configuration, the method wasMigrated() will return true.	2014-06-25 11:38:08 +02:00
Klaas Freitag	ff0ba56bc3	ownCloud Theme: Implement appName() and appNameGUI().	2014-06-25 11:38:08 +02:00
Klaas Freitag	e795d04f30	cfg migration: Add a account migrator class.	2014-06-25 11:38:08 +02:00
Klaas Freitag	8d3806b080	folderman: make escapeAlias public as its now used in accountmigrator.	2014-06-25 11:38:08 +02:00
Klaas Freitag	5597ebe455	Account: Add a scoped pointer to the ownCloud theme.	2014-06-25 11:38:07 +02:00
Klaas Freitag	5f96de32bb	ownCloudcmd: Use Account object and ConnectionValidator. ... That reads the credentials from the mirall config file if it was not defined on the command line. Moreover, the connection is validated before, which sets up the credentials properly.	2014-06-24 15:33:42 +02:00
Klaas Freitag	d2436ce23d	Networkjobs: Check if reply body is empty before parsing. ... This avoids a false warning that the result is not valid JSON.	2014-06-24 15:17:33 +02:00
Olivier Goffart	fbadadc377	propagator: Fix folder duplication if the folder is renamed on the server while uploading ... While uploading a new folder, if the folder is renamed on the server when still uploading, the result will be that the files that are already uploaded will end up in the new filder name, but the file that were not still are in the old folder. After renaming, all the new uploads wil fail with an error on this sync because the parent directory don't exist. But they were uploaded with the old name in the next sync because the renaming was not detected because the file id was not in the DB Fix the problem by fetching the file id always when creating a new directory, on the next sync, and saving it in the database ummediatly https://github.com/owncloud/enterprise/issues/191	2014-06-24 12:00:13 +02:00
Olivier Goffart	9adc30ab9f	Shibboleth: keep the cookie from the wizard to the ShibolethCredentials ... Otherwise the user is asked twice for autentication on first sync. Fixes https://github.com/owncloud/enterprise/issues/193	2014-06-24 11:44:52 +02:00
Olivier Goffart	94ddf7e5d8	Merge remote-tracking branch 'origin/il'	2014-06-24 08:40:27 +02:00
Olivier Goffart	b735dc07d6	Permissions: Consider and empty remotePerms from csync as NULL ... Since remotePerm from csync is never NULL (as it is a buffer), we consider that if it is empty, there was no permission set (and therefore everything is allowed) csync will put a space in the permission if any permission was set	2014-06-23 15:05:48 +02:00
Olivier Goffart	68c902e60b	propagator: Fix restoring directory ... If the result of a restored directory is SoftError, this prevent to sync the rest of the directory Therefore, we introduced a new status Restored, which means that the job was a success, but is a restoration and therefore should be seen as a warning	2014-06-23 13:56:17 +02:00
Olivier Goffart	e19214c3c4	permissions: record them even if the instruction is NONE ... when the instruction is NONE, we may return from this function before having registered the permission in the SyncEngine::_remotePerms hash. Move the code a bit up.	2014-06-23 13:35:34 +02:00
Olivier Goffart	4759429702	Fix compilation after merge ... Some initializer were added in 1.6 for variable that are gone in master	2014-06-23 12:53:51 +02:00
Olivier Goffart	b626589c07	Merge branch 'il' ... Conflicts: src/mirall/folderstatusmodel.h	2014-06-23 12:52:03 +02:00
Olivier Goffart	02704cdf74	Merge remote-tracking branch 'origin/1.6' into il ... Conflicts: VERSION.cmake csync/src/csync_statedb.c src/mirall/syncengine.cpp src/mirall/syncfileitem.h	2014-06-23 12:48:34 +02:00
Daniel Molkentin	7a8a3855b8	Mac: Make <ESC> close the settings dialog again	2014-06-20 16:37:07 +02:00
Daniel Molkentin	603a238eb9	Disable minimize button for Preferences on Mac	2014-06-20 16:31:17 +02:00
Olivier Goffart	b7b6cf4b3f	Shibboleth: Always ask for the password if we are going to open the log window ... If we don't have the cookie in the keychain (e.g. the keychain is unavailable) but there is still session cookie in the cookie jar, showing the browser won't ask for authentication.	2014-06-20 16:25:35 +02:00
Daniel Molkentin	485a6926c5	FancyLineEdit: initialize all members ... This fixes Coverity CID 12912	2014-06-20 13:46:57 +02:00
Daniel Molkentin	f3de6f46db	Folder: Removed unused member _pathWatcher ... This fixes Coverity CID 12914	2014-06-20 13:42:26 +02:00
Daniel Molkentin	1309dc27d9	Remove previously unused member ... This fixes Coverity CID 12915	2014-06-20 13:40:55 +02:00
Daniel Molkentin	31469d6a3e	Folderwizard: Properly initialize all members ... This fixes coverity CID 12916	2014-06-20 13:38:36 +02:00
Daniel Molkentin	88776770f7	Legacy Propagator: Properly initialize members ... This fixes coverity CID 12919	2014-06-20 13:36:15 +02:00
Daniel Molkentin	bbf8b9f8dd	syncengine: properly initialize all members in ctor ... This fixes Coverity CID 12922	2014-06-20 13:28:52 +02:00
Daniel Molkentin	6ff38d8005	Cleanup member initialization in Theme ... This fixes coverity issue 12925	2014-06-20 13:28:52 +02:00
Daniel Molkentin	6d13b5cc43	wizard setuppage: Clean up and properly initialize members ... This fixes Coverity CID 12926	2014-06-20 13:28:52 +02:00
Daniel Molkentin	73ab2804c4	owncloudwizard: properly initialize _account memember ... This fixes Coverity CID 12927	2014-06-20 13:28:52 +02:00
Klaas Freitag	d995d1190f	SyncFileItem: Some more proper member initializations. ... This fixes a Coverity CID	2014-06-20 12:54:46 +02:00
Klaas Freitag	3217e42a0f	SyncJournalDB: Initialize size member properly with 0 ... This fixes Coverity CID 12924	2014-06-20 12:37:49 +02:00
Klaas Freitag	1dd58a537e	owncloudcmd: Fix structurally dead code. ... This fixes Coverity CID 12928	2014-06-20 12:34:15 +02:00
Olivier Goffart	3e916cfbb9	remove unused member ... CID 12915 CID 12926	2014-06-20 12:08:58 +02:00
Olivier Goffart	4a9ad14e11	Folder: remove unused variable ... CID 12914	2014-06-20 12:01:20 +02:00
Olivier Goffart	f80816d88f	SyncEngine: silence coverity issue 12885 ... It was complaining that we use the context later in the function but the csync context should never be null anyway	2014-06-20 11:53:22 +02:00
Olivier Goffart	61ad376bf4	accountsettings: silent coverity warning 12884 ... We use f anyway, so if we are going to test if it's null we can as well return	2014-06-20 11:51:07 +02:00
Olivier Goffart	1e788d3d60	folderwizard: fix possible use of null pointer ... Coverity issue 12907	2014-06-20 11:29:28 +02:00
Olivier Goffart	83171bf025	accountsettings: remove unused function ... It was moved into owncloudgui before And it was broken (bad use of QUrl and use of null pointer	2014-06-20 11:27:37 +02:00
Olivier Goffart	2e51721851	owncloudgui: Fix compilation	2014-06-20 11:26:41 +02:00
Olivier Goffart	4d4a0148e4	owncloudgui: use QUrl::fromLocalFile	2014-06-20 11:21:36 +02:00
Daniel Molkentin	6b041b0846	Fix use-after-free in QNAM propagator ... This fixes Coverity CID 12929	2014-06-20 10:58:03 +02:00
Olivier Goffart	458645101b	SocketApi: query the database for the Shared flag	2014-06-19 15:37:29 +02:00
Olivier Goffart	1e306012ec	SocketApi: Fix recursiveFolderStatus ... If only one file is EVAL or NEW, this mean the folder need to be sync	2014-06-19 15:25:30 +02:00
Olivier Goffart	db2c198feb	SocketAPI: Merge command_RETRIEVE_FOLDER_STATUS and command_RETRIEVE_FILE_STATUS ... They do the same thing because fileStatus calls recursiveFolderStatus for directories anyway	2014-06-19 15:02:27 +02:00
Markus Goetz	71a901a24e	TokenCredentials: Fix cookie behaviour ... parseCookies did not work as expected. Now we just hard-set the token credentials into the Cookie header for QNAM jobs. This is the same behaviour as for neon jobs. (cherry picked from commit 855a8c0a335f76b82b8e647a8c5a4ae692065d3b)	2014-06-19 14:41:47 +02:00
Olivier Goffart	f4ea34e63b	SyncJournalDb: use QByteArray for etag and fileid	2014-06-19 14:27:04 +02:00
Olivier Goffart	0d54b88ab2	Socket API: Make it work with Qt5's QUrl ... QUrl default constructor has a different behaviour in Qt5 One must not forget to call QUrl::fromLocalFile in Qt5	2014-06-19 14:22:03 +02:00
Olivier Goffart	da0bd14bf3	Socket API: move the code that gets the status out of the folder ... Move the code in socketapi.cpp where it belongs	2014-06-19 14:08:30 +02:00
Olivier Goffart	02355696ff	engine: When restoring the file, use the mtime and fileid from the server ... Important to switch the things around as we are going to write them in the DB	2014-06-18 16:15:14 +02:00
Olivier Goffart	646eafb05d	Legacy propagator jobs: Do not limit bandwidth when aborting ... When aborting, we want the last job to be as fast as possible as it blocks the UI. So don't limit the bandwidth in that case	2014-06-18 15:09:19 +02:00
Olivier Goffart	0880444e37	Syncengine: Wait for the neon thead to be finished before destroying the Propagator and calling csync_commit ... The legacy job might still need the neon session and the propagator. We need to make sure the thread exits before. This fixes crash when pausing a sync made with the legacy jobs (for example when there is network limitation) This should fix https://github.com/owncloud/enterprise/issues/200	2014-06-18 15:08:23 +02:00
Klaas Freitag	b71881d300	SyncEngine: Use QSet for the seenFiles rather than QHash. ... We can save some memory here as the seenFiles list can be long.	2014-06-17 16:30:11 +02:00
Daniel Molkentin	b91967f4d9	Fix regression over 1.5: Fix non-fba auth for Shib IdPs	2014-06-17 14:53:23 +02:00
Olivier Goffart	c759e8bb8f	permission: read them from the tree	2014-06-17 14:50:24 +02:00
Olivier Goffart	b83f6c0b3a	sync engine: try to respect permission ... This is still Work in progress	2014-06-17 14:44:58 +02:00
dark-eye	afea881d90	Merge pull request #1717 from dark-eye/master ... Issue-142 : added time estimation and bandwidth indicator to the systray	2014-06-17 08:16:52 +03:00
Olivier Goffart	21e22a50c5	Merge remote-tracking branch 'origin/il' into master	2014-06-16 16:43:48 +02:00
Olivier Goffart	2f361278d2	Merge remote-tracking branch 'origin/1.6' into 'il'	2014-06-16 16:41:48 +02:00
Klaas Freitag	2d234cd96f	Propagator: Handle file open error properly and log error message.	2014-06-16 13:35:50 +02:00
Klaas Freitag	1230e87330	Propagator: Give a more specific error message on file remove. ... If the file is removed during it is synced up, there is now a correct error message saying that, rather than "the file has changed during upload."	2014-06-16 13:34:59 +02:00
Daniel Molkentin	b2966fecc7	Shib: remove slotLoadFinished() from webview dtor ... This is a relict from when the webview was reused. It is now pointless, since it's now destruct-on-close.	2014-06-14 03:00:18 +02:00
Daniel Molkentin	4abe00ff6c	Shib: Ensure browser view gets closed before QNAM ... Otherwise, QWebPage tries to delete its QNetworkReplies, which have already been deleted by the QNAM destruction, who is their parent. Fixes #1840	2014-06-14 03:00:18 +02:00
Daniel Molkentin	8da97a7c6f	Merge remote-tracking branch 'origin/1.6'	2014-06-13 13:31:50 +02:00
Olivier Goffart	2caa69e0cb	blacklist: use the _ERROR instruction instead of _IGNORE ... When something is in the blacklist, still use the _ERROR instruction that way the applications can still report errors for blacklisted items	2014-06-13 11:19:31 +02:00
Klaas Freitag	c72c72a106	FolderWizard: Get folder map from FolderMan rather than store locally. ... If the Folder::Map object is kept locally in the wizard, changes to the map are not reflected there, as they happen when signing out. This fixes bug #1875	2014-06-12 23:17:13 +02:00
Daniel Molkentin	4a5ef8f173	Fix a possible crash caused by a dangling pointer	2014-06-12 10:29:17 +02:00
Klaas Freitag	ed26bcb3e7	Theme: Show the stringified app version rather than the major version. ... This was a regression, we changed that by accident in 1.6.0. (cherry picked from commit 760ecd71fc)	2014-06-10 17:05:15 +02:00
Klaas Freitag	760ecd71fc	Theme: Show the stringified app version rather than the major version. ... This was a regression, we changed that by accident in 1.6.0.	2014-06-10 13:48:27 +02:00
Olivier Goffart	18e9357aaf	network limits: Fix warning ... About the order of initialization	2014-06-07 12:20:54 +02:00
Olivier Goffart	46b8260693	network limits: Do not read them from the config file in the engine ... Do that from the folder, because the engine can be used in app where the MirallConfigFile is not accessible	2014-06-07 12:09:22 +02:00
Eran	3406fcdce4	Merge branch 'master' of https://github.com/owncloud/mirall into dark-eye-master ... Conflicts: src/mirall/progressdispatcher.h	2014-06-06 18:56:58 +03:00
Markus Goetz	8dbfcd782b	CSync: Fetch permissions from server for whole tree on server update	2014-06-06 17:10:07 +02:00
Olivier Goffart	abf0f90a13	SocketAPI: broadcast change when an item is done	2014-06-06 15:52:55 +02:00
Klaas Freitag	4d5c74c019	SocketAPI: Add another API call for stat of file and folder separately.	2014-06-06 15:38:20 +02:00
Markus Goetz	70ff928381	CSync & statedb: Parse 'perm' from server ... ownCloud 6 sends this.	2014-06-06 15:24:17 +02:00
Markus Goetz	b48ab79a92	CSync & statedb: Remove uid/gid ... Columns are still in the DB as we don't want to break any compatibility.	2014-06-06 13:41:16 +02:00
Markus Goetz	fd4642d827	Folder: Don't add ignored files on startup ... Before each sync is enough. (We could do it at startup only, but so far it is good to have it at each sync so we can easier see stuff in the log)	2014-06-05 17:50:18 +02:00
Daniel Molkentin	3934fa019e	SocketAPI: proper name for pipe on windows	2014-06-05 12:02:57 +02:00
Daniel Molkentin	7fcf6f9f79	Merge branch '1.6'	2014-06-05 12:01:50 +02:00
Olivier Goffart	7a7b0e8939	propagator: Ignore new directory inside removed directory. ... This fixes te bug if one create a tree of folders and subfolders and delete them while they are uploading. Some folder would reappears	2014-06-04 16:37:46 +02:00
Olivier Goffart	a4f6370774	propagator: do not update perent directory etag before sub directories are removed ... Direcotries are removed at the end, and we don't want to update parent directory etag before the delete is performed, or the next sync may read from db and think the files are not removed. Issue #1845	2014-06-04 12:31:30 +02:00
Markus Goetz	233450d850	CSync: Remove config dir setting	2014-06-04 10:56:56 +02:00
Olivier Goffart	582a8fe7fd	Merge branch '1.6'	2014-06-03 17:27:12 +02:00
Olivier Goffart	abafbef985	Optimize move ... Do not send the mtime for each file without a directory, because the server now keeps it	2014-06-03 17:27:06 +02:00
Olivier Goffart	6e10b8c5c4	Propagator: Recover from 'precondition failed' error ... When we detect a precondition failed, it is possible that it is because the etag in the database is wrong. We must therefore not read from the database on the next sync. In order to avoid that, we reset the etag of parent directories to invalid values Fixes #1767	2014-06-03 17:22:40 +02:00
Olivier Goffart	24616bead4	Fix syncing a folder with '#' in the name ... Or an url with '#' Fixes #1838 The problem is a bug fixed in Qt5 now breaks. In Qt4, QUrl::setPath() did not properly handle path with '#' in them and QUrl::toString would restitute the '#'. But csync will blindly do "uri + path" before passing the path to VIO. because csync_update has no idea that the VIO plugin need special encoding, the encoding cannot be done there. But csync_owncloud then encodes the full path. So if the uri contains '#', it must not be already encoded or there will be two encoding.	2014-06-03 15:45:10 +02:00
Markus Goetz	4d4eab8b1c	CSync & Propagator: Support a direct download URL ... This is for server file backends that support sending a direct URL.	2014-06-03 14:55:34 +02:00
Markus Goetz	b8e20b412c	CSync: We can access the context directly	2014-06-03 11:51:12 +02:00
Markus Goetz	5ee00a8df7	CSync: Simplify csync_owncloud stat/resource handling	2014-06-03 11:51:12 +02:00
Klaas Freitag	1af3d3f18b	More descriptive error message when querying the database without hit.	2014-06-03 09:50:09 +02:00
Klaas Freitag	f54248c0a7	Minor cleanups and changes	2014-06-03 09:50:09 +02:00
Klaas Freitag	2911c0e1c4	Add a recursiveFolderStatus method	2014-06-03 09:50:09 +02:00
Daniel Molkentin	746c15b4aa	Remove debug layout	2014-06-02 19:38:04 +02:00
Daniel Molkentin	7e65c9741e	[Shib] Ensure only one fetch job can open the browser	2014-06-02 17:41:49 +02:00
Markus Goetz	022a3fcd92	OS X: Fix localFileNameClash ... We need to compare the other way round and compare only the file name because our sync directory might be symlinked and then resolve to another canonical path (but we were only interested in the filename part anyway)	2014-05-30 15:47:53 +02:00
Olivier Goffart	0151682a53	Make sure that OwncloudPropgator::finished is only emit once ... When we abort, each job currently running may result in a call to finished(). It used to cause a crash because we would unlock the _syncMutex twice Fixes #1793	2014-05-29 12:15:13 +02:00
Olivier Goffart	864f2cdc7d	remove the _syncMutex and replace it by a simple bool	2014-05-29 11:35:13 +02:00
Eran	cd82a8585a	change the text to be a little more descriptive and use shorthand in the context menu	2014-05-29 00:09:02 +03:00
Daniel Molkentin	0c1ab533e6	Do not trim serial numbers ... This broke in a refactoring. The 'true' was interpreted as length of 1. Fixes part of #1436	2014-05-28 21:16:00 +02:00
Olivier Goffart	1dd7f736d0	Fix another crash at exit ... Fixes #1794	2014-05-28 19:59:35 +02:00
Olivier Goffart	571c199db8	remove broken connection ... Fixes #1822	2014-05-28 18:11:39 +02:00
Daniel Molkentin	3d2a2df86f	Allow to set a smaller timeout value in the config file ... Added to debug #1724	2014-05-28 16:28:22 +02:00
Daniel Molkentin	86a48b52e9	Shib: Show a notification whenever the shib session times out ... This is designed as a passive popup notification so that it will not surprise or annoy the users. Fixes Enterprise issue #179	2014-05-28 15:25:43 +02:00
Olivier Goffart	ebe1f986f1	Only remove session cookies ... This should disconnect without loosing long lived cookie	2014-05-28 15:24:14 +02:00
Eran	6927fc80c3	change the mapping to use short hand and also made the mapping logic a little losser	2014-05-28 13:09:30 +03:00
Olivier Goffart	dd1152dd4f	Clear all cookies when loging out	2014-05-28 11:41:06 +02:00
Olivier Goffart	ce9bfd319a	Fix the sib window re-appearing. ... When the windows is accepted, do not emit fetched which means the process is finished one must first check the username is valid	2014-05-28 10:18:57 +02:00
Daniel Molkentin	f591ac6549	CookieJar: Reduce debug noise	2014-05-28 10:05:32 +02:00
Daniel Molkentin	4fd368c992	ShibCredentials: Ensure that _stillValid is not reset while the browser window is open ... This will cause the browser window to open again after it has been told to close if a network job has run in the background while the browser window was visible. Fixes #1814	2014-05-28 10:05:32 +02:00
Eran	89a95d6445	fixed comment spelling	2014-05-28 08:28:03 +03:00
Klaas Freitag	e275ad3866	Emit the sync finished signal a bit delayed. ... This allows folder watcher events comnig in before the sync is marked finished. This avoids "endless syncing" as described in bug #1808	2014-05-27 11:35:07 +02:00
Olivier Goffart	5813f63df8	Do not runs the check connection timer when there is no configured account ... in order to avoid popup of the wizzard every 32 seconds Fixes #1812	2014-05-27 11:05:09 +02:00
Klaas Freitag	449c00f019	No need to check for case preserving filesystem here. ... That is done in the utility function instead.	2014-05-26 18:28:52 +02:00
Klaas Freitag	6017eb7ca6	Case clash check for local remove plus native separators.	2014-05-26 18:28:25 +02:00
Klaas Freitag	f1b2417967	Add check for case clash for legacy propagator download.	2014-05-26 18:28:25 +02:00
Klaas Freitag	181383e5f1	Check for case preserving file system in localCaseClash	2014-05-26 18:28:25 +02:00
Markus Goetz	c1b9d5c653	Propagator: Implement localFileNameClash for OS X	2014-05-26 17:36:52 +02:00
Klaas Freitag	964c3ac7bf	Check for local file name clash before local renaming. ... Return a proper error message in case.	2014-05-26 17:00:40 +02:00
Daniel Molkentin	6d8afabf41	Find export macro	2014-05-26 16:33:04 +02:00
Daniel Molkentin	0a7dbeb778	Export CookieJar	2014-05-26 16:29:26 +02:00
Daniel Molkentin	0582abe8dd	Shib: Wizard: Return to IdP selection when returning to creds page	2014-05-26 15:57:01 +02:00
Eran	f9192e27fa	added "/s" to the bandwidth	2014-05-26 16:25:33 +03:00
Olivier Goffart	81f410970f	ammend previous change	2014-05-26 15:01:26 +02:00
Olivier Goffart	e75c5236f2	Properly report errors when renaming a file ... That is especially usefull when renaming to an existing file with a different case	2014-05-26 14:51:53 +02:00
Olivier Goffart	8a671c40d1	Make FolderMan a member of the application ... The goal here is that it is going to be destroyed with the application It need to be destoyed so the folder are destroyed, which is required for properly finishing the sync while exiting. It must not be destroyed after the application because the QSQLite plugin may be already destroyed in that case. Since the constructor of FolderMan is called earlier, we can't call the config file too early fixes 1793	2014-05-26 14:37:15 +02:00
Olivier Goffart	50ce0f9681	Fix crash at exit when there is a log after the Logger has been destroyed ... Use a proper static Logger instead of allocating one, and cleanup the QTMessageLogger when it is destroyed	2014-05-26 14:37:14 +02:00
Daniel Molkentin	a60902b33d	Make sure the settings window is brought up when minimized ... Fixes #1804	2014-05-26 14:32:08 +02:00
Olivier Goffart	5220786cf2	do not blacklist fatal error	2014-05-26 12:27:16 +02:00
Olivier Goffart	99cead68f5	Fix crash when aborting ... When aborting, the slotFinished will destroy all the Jobs, but they need one more even loop to finish cleanups Fixes #1793	2014-05-26 12:23:25 +02:00
Olivier Goffart	7a209ba376	leak fix	2014-05-26 12:07:00 +02:00
Olivier Goffart	f9263da3de	Fix crash when the account config is gone and there are still folder ... In rare case (due to a bug in QSettings) the account config may disapear We should not crash in that case	2014-05-26 11:08:32 +02:00
Daniel Molkentin	3f724e1c6a	Fix Pref window for good ... This was forgotten in 18677dbc3f	2014-05-26 09:37:43 +02:00
Eran	ba5e955ccb	chaned the design a little	2014-05-25 22:43:41 +03:00
Volkan Gezer	9abffdb1a6	fix typo	2014-05-24 15:04:42 +02:00
Volkan Gezer	5b0307446a	fix spacing	2014-05-24 15:03:45 +02:00
Klaas Freitag	1b2875c20a	Use the moved implementation of the name clash detection method.	2014-05-23 18:58:21 +02:00
Klaas Freitag	bbdf7bf955	Check for case clash on downloads.	2014-05-23 18:58:21 +02:00
Klaas Freitag	57359968ed	Added method localFileNameClash ... Also reordered the implementations a bit.	2014-05-23 18:58:08 +02:00
Klaas Freitag	ea9f302b7a	Read the blacklist entries case insensitive in case the file ... system is only case preserving.	2014-05-23 16:13:35 +02:00
Klaas Freitag	ef0a3c212e	Add a utility function fsCasePreserving. ... Returns true if the underlying file system is case preserving instead of case sensitive. That is true for Mac and Windows currently. Only Linux has a case sensitive file system usually.	2014-05-23 16:13:35 +02:00
Daniel Molkentin	18677dbc3f	Fix on-top/below-others window problem ... - Don't give the settings window an always-on-top hint, or else sub dialogs will pop-under. Also, people seem to (ab-)use it as a status monitor... well - raiseWidget() can only really do one thing: remove the dialog status from dialogs without a parent due to a bug in Qt. The previous implementation never really worked. Tested on Mac and Gnome 3 so far. Fixes #1795 Fixes parts of #1775	2014-05-23 16:00:50 +02:00
Klaas Freitag	7e8b403116	More progress on the CI problem detection.	2014-05-22 17:12:59 +02:00
Klaas Freitag	1303379c9e	Remove useless global varialbe for auth callback.	2014-05-22 12:54:14 +02:00
Daniel Molkentin	b995cd318c	Fix/cleanup PropagateLocalMkDir::start()	2014-05-22 10:16:33 +02:00
Daniel Molkentin	ed19107161	Remove useless check. QFile::exists() is CI on CI filesystems ... Tested on OS X and Windows	2014-05-22 10:06:10 +02:00
Daniel Molkentin	5b298abba1	Revert "Set an "active" role for the menubar icon on Mac" ... Apart from a small mistake in this commit, there seems to be something else wrong. This reverts commit 97362cff32.	2014-05-21 13:00:20 +02:00
Daniel Molkentin	4edbeece49	Fix connection following the update of the QtSingleApplication classes	2014-05-21 12:31:44 +02:00
Daniel Molkentin	97362cff32	Set an "active" role for the menubar icon on Mac ... Fixes #1730	2014-05-21 11:19:38 +02:00
Daniel Molkentin	3db3c7b876	Update QtSingleApplication and QtLockedFile ... Fixes stale temp file issues, and is needed for blocking support.	2014-05-21 11:19:38 +02:00
Klaas Freitag	d0b9b002e4	Show the sync icon in case the status is not yet defined. ... This fixes the problem that on the first sync, no proper status icon is shown on a potential long update phase.	2014-05-21 11:09:01 +02:00
Eran	fae3e46a59	made the code a little cleaner	2014-05-20 16:56:39 +03:00
Olivier Goffart	bdba56f60b	Always wait on the thread before emiting finished ... This ensure that there would be no way to have two thread running Refactor all the location where finished is called in a single function	2014-05-20 12:32:06 +02:00
Daniel Molkentin	7ade4bb6e6	AccountSettings: Handle button states more correctly ... Fixes #1779	2014-05-19 15:46:23 +02:00
Daniel Molkentin	86117aed0d	autostart unix impl: use mkpath instead of mkdir ... Fixes TestUtility::testLaunchOnStartup(), if .config/ does not exist.	2014-05-19 12:42:04 +02:00
Klaas Freitag	43fe7b0d55	Detect directory case sensitivity clash on windows	2014-05-16 15:24:01 +02:00
Olivier Goffart	e1f8eb5aa5	Another way to force a sync when choosing 'Keep files'	2014-05-15 19:36:01 +02:00
Olivier Goffart	f40a054cb7	Revert "Re-sync immediatly after "Keep files" when all files were removed" ... This causes infinite sync loops This reverts commit 8b469d3992.	2014-05-15 19:29:40 +02:00
Eran	3777074e84	Remove extra space between the parenthesis when displaying estimation in the system tray	2014-05-15 17:46:25 +03:00
Daniel Molkentin	81c768099e	Folder: Correctly reflect paused state after restart	2014-05-15 15:04:48 +02:00
Daniel Molkentin	4bcaebb322	Decrease debug noise	2014-05-15 15:04:48 +02:00
Olivier Goffart	8b469d3992	Re-sync immediatly after "Keep files" when all files were removed ... Fixes #1710	2014-05-15 11:48:01 +02:00
Olivier Goffart	bb929db7e6	fix warning	2014-05-15 11:29:23 +02:00
Olivier Goffart	90ee274744	We need to call csync_commit in every error cases ... Else there will still be outdated tree in the memory and the further sync will be confused Relates to #1710	2014-05-15 11:18:06 +02:00
Daniel Molkentin	9f6e9f8e1b	Fix crash: if the credentials cannot be cast, don't deref, assume change	2014-05-15 11:12:18 +02:00
Klaas Freitag	f89bfce068	Enable core dumping if the env variable OWNCLOUD_CORE_DUMP is defined ... Set OWNCLOUD_CORE_DUMP to anything to get a core dump in case of crashing.	2014-05-15 11:01:21 +02:00
Klaas Freitag	ef44a59bed	Better debugability.	2014-05-15 09:45:50 +02:00
Klaas Freitag	d96139f698	Commented verbose logging.	2014-05-15 09:45:50 +02:00
Daniel Molkentin	de970eb0a5	Fix wizard flow with shibboleth	2014-05-15 09:43:26 +02:00
Eran	5310a3cc1d	better time prediction	2014-05-14 16:57:14 +03:00
Daniel Molkentin	17a2e224c4	Fix memleak	2014-05-14 12:53:12 +02:00
Daniel Molkentin	5ed4710d64	Merge pull request #1726 from owncloud/debian_bsd ... Make Debian GNU/kFreeBSD compile	2014-05-14 12:20:17 +02:00
Klaas Freitag	5493c22584	Do not dispatch invalid progress information to avoid "unknown" messages	2014-05-14 11:52:22 +02:00
Klaas Freitag	64f4d1b387	Removed block parameter from terminateSync. ... Do not pretend to immediately terminate the sync but let csync finish planfully and free the mutex.	2014-05-14 11:52:22 +02:00
Daniel Molkentin	cdd8c8165b	Add missing header to fix Qt5 compilation	2014-05-14 11:22:56 +02:00
Daniel Molkentin	ba959f7cf9	CookieJar refactoring required to overcome issues in Shibboleth support ... The shibboleth implementation no longer maintains its own QNAM. Instead, MirallAccessManager now holds a custom QNAM implementation which saves cookies to a file on disk. This patch also reduces some complexity wrt the browser window, which used to be deleted via a roundtrip to its callee, which is not longer required. Fixes #1764 and Enterprise bug #165 Going forward, AbstractCredentials::getQNAM() could maybe removed entirely.	2014-05-14 11:11:45 +02:00
Eran	1509c4ffba	made the time description more malleable ,added support for none size update estimation (ie.. deletion), made the estimation more responsive at start and less jittery after some time	2014-05-14 10:55:04 +03:00
hefee	07f57b1982	make Debian GNU/kFreeBSD compile	2014-05-13 16:51:42 +02:00
Olivier Goffart	574e030caf	Use a different key than "user" to store the shib user ... There is a HACK from commit fa0a2764a4 Which save the http user as a user for all credidentials, but that cannot work with shibboleth Fixes https://github.com/owncloud/enterprise/issues/175	2014-05-13 11:54:36 +02:00
Eran	71ea2b582c	changed the systray to display total size and estimated time when the syncronization actually has size changed the descriptive time logic to be more generic	2014-05-12 17:36:27 +03:00
Eran	219098c182	Changed the time estimate string to be more textual, also added lower limit to the estimate to prevents starting estimation jittering	2014-05-12 00:26:17 +03:00
Olivier Goffart	091e9bbd52	Fix crash when _engine is not available ... Fixes #1671 and #1675	2014-05-07 16:17:08 +02:00
Olivier Goffart	ce09e11011	Revert "Do not dereference the _engine member variable without check." ... bubbleUpSyncResult is only called from slotSyncFinished, so if _engine is invalid there, it is also invalid in slotSyncFinished This reverts commit aee7515d42.	2014-05-07 16:13:43 +02:00
Olivier Goffart	f034bcb9ae	only increment the progressbar for files when the file has been fully transfered	2014-05-07 12:35:02 +02:00
Klaas Freitag	a50c39cd0c	Maintain the original inode value for renamed files. ... In case two renames are done on the same file/folder very quickly we lost the information that the second operation was also a rename. That was because we tried to get the inode value from a stat on the file once the first rename was finished. But at that point, the file was already gone because of the second rename. Now the original inode is kept and written to db in case the file can not be stat'ed. This fixes bug #1737	2014-05-06 12:55:54 +02:00
Klaas Freitag	370dd99e47	Super useful source comment.	2014-05-06 09:30:50 +02:00
Olivier Goffart	1631cfdaf1	Fix not blacklisting error 5xx	2014-05-02 17:26:28 +02:00
Olivier Goffart	2e76fe87c2	Fix reporting the right error in a GET ... We always reported the lack of e-tag instead of the real error	2014-05-02 17:26:28 +02:00
Markus Goetz	6c44f53645	Set network timeout to 300 sec ... As per previously used values (see source and changelog)	2014-05-02 15:35:40 +02:00
Olivier Goffart	988c162d2f	Have only one place where we read the timeout	2014-05-02 13:04:53 +02:00
Olivier Goffart	88cb047197	Add a timeout when using the QNAM propagation	2014-04-30 18:17:49 +02:00
Klaas Freitag	7f7154ed40	Auto generate the Export header. ... This should fix oem builds.	2014-04-30 13:55:40 +02:00
Klaas Freitag	a8c1ffc2f4	Add a header file for owncloudcmd.cpp to avoid (auto)moc problems.	2014-04-30 13:55:40 +02:00
Klaas Freitag	df8b5b1ea6	Removed unused Q_OBJECT	2014-04-30 13:55:40 +02:00
Olivier Goffart	ce50cdecf1	Add one byte per files in the computation of the progress bar ... So it feels like the progress bar is moving when operating of file that are empty or when deleting or renaming files	2014-04-30 13:20:20 +02:00
Olivier Goffart	77c7439329	Don't include the directory size in the overall progress ... We don't include them in the total amout of files so it should not be included in the progress either. Also, for some reasons directories seems to be 16kB on windows	2014-04-30 12:57:30 +02:00
Markus Goetz	925c6485e6	Propagator: Dont show silly string for non-error	2014-04-30 11:36:57 +02:00
Olivier Goffart	d62deabf9b	Fix updating mtime ... Fixup commit 9193286fc1 Use the right URL for the PROPPATCH and HEAD, do not let other jobs start when we wait for the UpdateMTimeAndETagJob Update the etag and the fileid of the real item.	2014-04-30 10:24:17 +02:00
Markus Goetz	876de8fd69	Networkjobs: Remove stray include	2014-04-29 17:55:26 +02:00
Olivier Goffart	983f9c5dde	The job restore job need to be run with QMetaObject::invoke ... Because the job might be in a different thread.	2014-04-29 16:58:24 +02:00
Olivier Goffart	9193286fc1	Support old server which do not have the x-oc-mtime support ... Owncloud 4.5 Or owncloud 5 with chunking Fixes https://github.com/owncloud/core/issues/8392	2014-04-29 16:58:24 +02:00
Olivier Goffart	1b8d11182b	Add missing include ... This was required so the compiler sees the declaration of CredentialsFactory::create which should be exported	2014-04-29 16:04:24 +02:00
Olivier Goffart	dcc5c105eb	fix forward declaration of CredentialsFactory::create	2014-04-29 15:50:19 +02:00
Klaas Freitag	64b42333b0	Fix typo.	2014-04-29 15:36:13 +02:00
Olivier Goffart	3ee729bc4a	Add export macro to all classes that need to be exported	2014-04-29 15:31:14 +02:00
Daniel Molkentin	a268b03990	Try to not have windows stay-on-top	2014-04-29 15:31:03 +02:00
Olivier Goffart	9f0848ba15	Merge remote-tracking branch 'origin/libowncloudsync_noqtgui'	2014-04-29 12:23:15 +02:00
Olivier Goffart	f159b028b4	Add a compile option to not blacklist error code 5xx	2014-04-29 11:39:46 +02:00
Olivier Goffart	7e702778a1	Add missing line break	2014-04-29 11:27:31 +02:00
Eran	35b3ddd61f	Made the estimated time only appear in the systray when the sync has actual size.	2014-04-29 02:43:35 +03:00
Eran	a892b79dba	Seperated the systray estimation text to a seperate action, fixed an integer rounding bug	2014-04-29 02:31:27 +03:00
Eran	cd22a1846f	Fixed Indentation and multiple concurrent files syncing case ... ... ..Also increased the height of folder progress bar alittle in order to accommodate the added estimation data	2014-04-28 18:49:27 +03:00
Markus Goetz	4489a56c65	Csync: Set error at correct place	2014-04-28 17:25:18 +02:00
Markus Goetz	7f752c7e93	Csync: Plug code for csync_file_locked_or_open	2014-04-28 16:57:56 +02:00
Daniel Molkentin	2d3ea59755	Limit the mac workaround to the Mac OS X platform	2014-04-28 10:13:53 +02:00
Eran	eadcdab8e7	Issue-#142 : Added support for current file completion estimation. ... Changed the account settings estimation to display both current file and overwhole estimation. Decresed the progress font size to fit the added information	2014-04-27 00:48:12 +03:00
Olivier Goffart	9da261acd8	Do not read from the database when upgrading from 1.5 ... We need to make sure that the file id are updated (if the user had upgraded from owncloud 5 to owncloud 6 while using owncloud 1.5)	2014-04-25 13:31:44 +02:00
Eran	46ffd1c29a	Issue-142 : added time estimation and bandwidth indicator to the systry and active download	2014-04-25 01:08:25 +03:00
Olivier Goffart	642c16b09b	Missing EXPORT	2014-04-24 23:57:42 +02:00
Olivier Goffart	5c92c190f0	Add EXPORT macro to owncloudsync library ... Not all the class are exported currently, only the one that seems to be used by the command line tools	2014-04-24 23:45:20 +02:00
hefee	9b7a3d00ee	Using QFile::decodeName instead of QLatin1String	2014-04-23 18:59:40 +02:00
Sandro Knauß	1d862b77af	merged 1.5 into master	2014-04-23 18:54:49 +02:00
Olivier Goffart	f2519e9d87	Fix function signature: pass argument by const reference	2014-04-22 19:52:09 +02:00
Markus Goetz	197d180cb9	Propagator: Add support for CSYNC_CONFLICT_FILE_USERNAME	2014-04-22 16:17:49 +02:00
Markus Goetz	4be20db670	Propagator: Add makeConflictFileName function	2014-04-22 16:07:18 +02:00
Olivier Goffart	46d6191bc2	Also list folder for which the alias starts with '.' ... Fixes #1695	2014-04-22 14:26:08 +02:00
Olivier Goffart	ee22f377af	Start the folder watcher when new folder are added ... Before, we would only set up a file system watcher when we read the config at startup. But we also need to do it in the other case when the user configure new folder to watch	2014-04-22 14:15:43 +02:00
Olivier Goffart	44a04227f1	Update dynamically the error message in the account settings ... This let the error be shown when the conneciton is missing at startup And also remove the red background when there is no longer an error	2014-04-22 14:08:37 +02:00
Olivier Goffart	707c6fcc5d	An abort on the reply is not usually a password error. ... Copy the code from HTTPCredidentials	2014-04-22 12:52:13 +02:00
Olivier Goffart	edb1f61241	Fix compilation without the BUILD_ONLY_LIBRARIES mode	2014-04-22 12:44:01 +02:00
Olivier Goffart	3fac5f91c8	In case of error, report the right error instead of missing etag ... also, missing etag is not a fatal error	2014-04-22 12:43:38 +02:00
Olivier Goffart	1338c08622	Fix compilation on linux with BUILD_LIBRARIES_ONLY	2014-04-22 11:33:38 +02:00
Olivier Goffart	0cf8091705	Merge pull request #1700 from wakeup/master ... Fix non-closed p tag	2014-04-22 10:08:29 +02:00
Klaas Freitag	c24732f641	More debugable code.	2014-04-22 09:33:07 +02:00
Markus Goetz	77ac092975	WiP: Attempt to compile without UI	2014-04-21 19:57:15 +02:00
Volkan Gezer	78e5e4ab66	Fix non-closed p tag	2014-04-21 15:29:42 +02:00
Volkan Gezer	9b71643c1c	Space fix	2014-04-20 14:54:40 +02:00
Olivier Goffart	b08284e4cc	Fix the background check job for the connection ... We can't use the quota job for that as it needs the credidentials and therefore may re-enter the credidential code when we are currently trying to fetch the credentials. The quotainfo.cpp part of this patch is basically a revert of d836b80153	2014-04-19 09:49:52 +02:00
Olivier Goffart	fa38bf7029	Make sure the fileid are saved to the database when upgrading from owncloud5 to owncloud6 ... We fetch the id from the server, but don't save them in the database. I Could have used INSTRUCTION_UPDATED for that, but then i would need to update the reconcile algorithm to take in account the fact that UPDATED is possible there. Instead, use should_update_etag which means the db is going to be written again Remove reference to old instruction _UPDATED and _DELETED which does not make sens with the new propagator Improve the test to test this case, and that etags are properly writen to the DB when there is a fake conflict	2014-04-18 18:27:27 +02:00
Klaas Freitag	d143044f4a	Add missing cases to avoid "unknown action" under some circumstances. ... Most of the translations are not used because they translate pre propagation states. Fixes #1674	2014-04-15 16:54:49 +02:00
Klaas Freitag	aee7515d42	Do not dereference the _engine member variable without check. ... This can cause the crash because the _engine member is deleted in the sync finished slot. The solution is to store the stopWatch object before the engine is destroyed. Fixes bug #1675	2014-04-15 16:28:18 +02:00
Klaas Freitag	82ab5fdcb9	Fix condition if network limit change is logged or not.	2014-04-15 16:28:18 +02:00
Klaas Freitag	4c6e6f6302	Add initialisations for member variables. ... Avoids some valgrind warnings.	2014-04-15 16:28:18 +02:00
Klaas Freitag	0a2791270a	Add a reset method.	2014-04-15 16:28:18 +02:00
Klaas Freitag	c920f81562	Add braces.	2014-04-15 16:28:18 +02:00
Daniel Molkentin	d836b80153	Fix reconnect after server disconnect ... Fixes #1679 Fixes #1568 Fixes #1659	2014-04-14 17:51:57 +02:00
Daniel Molkentin	efc4ff4d88	Fix redirects in CheckServerJob	2014-04-14 15:12:38 +02:00
Daniel Molkentin	dc043b5765	Try scheme://host/owncloud if scheme://host/ did not work ... Fixes #1680	2014-04-14 15:10:08 +02:00
Daniel Molkentin	ef9a318cd9	AbstractNetworkJob Allow finished() to defer Job deletion ... This allows to reuse the Job	2014-04-14 15:08:43 +02:00
Volkan Gezer	8250fb81b3	Fix typo.	2014-04-11 15:10:47 +02:00
Klaas Freitag	30a14b9f45	Install ocsync library to private lib directory, use rpath to find it.	2014-04-11 13:28:11 +02:00
Klaas Freitag	09e05392bf	Ignore all sync log files in the sync dir.	2014-04-09 22:02:28 +02:00
Daniel Molkentin	d3d202de68	Fix dataLocation on Linux/BSD ... From the Qt 5 documentation: Note: when porting QDesktopServices::DataLocation(obsolete) to QStandardPaths::DataLocation, a different path will be returned. QDesktopServices::DataLocation was GenericDataLocation + "/data/organization/application", while QStandardPaths::DataLocation is GenericDataLocation + "/organization/application". We'll resort to the deprecated version, since we'll need to fix data locations to be XDG compliant sooner than later anyway (currently scheduled for 1.8)	2014-04-09 14:59:08 +02:00
Daniel Molkentin	87010fbe1a	SSL Button: Fix issues around printing Hash sums ... - Use SHA 265 instead of obsolete MD5 where possible (Qt5) - Remove <tt> formatting: that simply looked ugly - Wrap SHA 265 hash - Use spaces as separators As usual, the default needs to remain ':' separation, because it's needed to pass valid hashes to csync.	2014-04-09 14:30:51 +02:00
Klaas Freitag	7c40dc1a9a	Ignore changes on .owncloudsync.log in the linux filewatcher. ... Also remove some verbose and unused logging.	2014-04-08 13:06:34 +02:00
Daniel Molkentin	b34b4e37aa	Add Qt Keychain also when building with Qt5	2014-04-08 10:56:07 +02:00
Daniel Molkentin	69bdccfd2f	Include correct QtKeychain headers ... ..depending on Qt version	2014-04-07 17:46:06 +02:00
Daniel Molkentin	1d70426bb7	Build with BOTH Qt4 and 5	2014-04-07 17:25:25 +02:00
Daniel Molkentin	6a2fe6be67	Build fix: QAtomicInt has no implicit integer conversion in Qt5	2014-04-07 16:49:01 +02:00
Klaas Freitag	3d67d203fe	Fix content-length calculation for sizes multiple of the chunk size.	2014-04-07 16:29:06 +02:00
Klaas Freitag	fc06945b26	use the lowercase app name for icon in the desktop file. ... fixes #1642	2014-04-07 15:14:58 +02:00
Klaas Freitag	9cdcc925c1	Do not log useless stuff.	2014-04-07 15:10:55 +02:00
Markus Goetz	d35c0f3ade	Propagator: Fix chunking for real ... The reset() (using seek()) didn't work.	2014-04-05 14:26:24 +02:00
Markus Goetz	0f7d448058	Propagator: Fix chunking	2014-04-04 15:41:35 +02:00
Klaas Freitag	435e7e3eec	HACK to avoid continuation: See task #1448 ... We do not know the _modtime from the server, at this point, so just set the current one. (rather than the one locally)	2014-04-04 10:56:33 +02:00
Klaas Freitag	08dd9796d1	HACK to avoid continuation: See task #1448 ... We do not know the _modtime from the server, at this point, so just set the current one. (rather than the one locally)	2014-04-04 10:50:40 +02:00
Olivier Goffart	462ba7d942	Don't dead lock when all the files are removed ... SyncEngine is on the main thread, no need of the legacy BlockingConnection	2014-04-03 17:47:49 +02:00
Klaas Freitag	cf87fdff7f	Keep the updater data in the log struct for the synclog. ... Also, shorten the timestamp and add the sync direction.	2014-04-03 16:56:50 +02:00
Markus Goetz	565bb540d6	Propagator: Add debug message regarding legacy vs QNAM	2014-04-03 16:37:40 +02:00
Olivier Goffart	eaf5681f61	Put the sync log in the actual folder	2014-04-02 16:36:32 +02:00
Olivier Goffart	03ef2aadde	Remove undeeded includes ... And don't use 'using namespace' in headers	2014-04-02 16:23:57 +02:00
Olivier Goffart	f09076180d	don't add the list of field on the log for every sync	2014-04-02 16:21:07 +02:00
Olivier Goffart	d5d3c1a23a	Fix compilation with Qt5 ... We don't need QtWidgets, and we don't need Uility::escape	2014-04-02 16:21:06 +02:00
Markus Goetz	b18f1ad386	SyncEngine: Removed unused signal	2014-04-02 12:47:15 +02:00
Klaas Freitag	8625ec250b	Add a trust ssl certificate switch	2014-04-01 16:14:24 +02:00
Klaas Freitag	d731f4718d	Add an simple SSL error handler for owncloudcmd.	2014-04-01 16:14:24 +02:00
Olivier Goffart	607e48a68b	let configure the default count of the blacklist	2014-04-01 13:54:47 +02:00
Olivier Goffart	bfe6a50b19	Fix some error cases in the SyncEngine ... Always cleanup properly when we bail out. Also fix thread safety of the SyncJournalDB	2014-04-01 13:41:47 +02:00
Olivier Goffart	3acdfc0004	Make configurable the maximum amount of job in parallel ... Bia the environement variable OWNCLOUD_MAX_PARALLEL	2014-03-28 11:20:07 +01:00
Olivier Goffart	a1fc7f0a25	Make the chunk size configurable via an environement variable ... OWNCLOUD_CHUNK_SIZE	2014-03-28 11:11:02 +01:00
Olivier Goffart	8de9bec122	Remove progress info from csync ... csync doesn't do no propagation no more	2014-03-28 10:50:15 +01:00
Olivier Goffart	765a18b74a	Fix compilation with Qt4	2014-03-28 10:26:42 +01:00
Olivier Goffart	350283fe06	Remove obsolete code that removed the sync journal when the sync directory is deleted ... Since the journal is now in the same directory, we don't need this security anymore When the directory is removed, the sync will error out saying that the journal cannot be loaded or created	2014-03-28 10:23:09 +01:00
Olivier Goffart	2ba62b79b4	Make the size of the log maximum 1MiB	2014-03-28 10:13:35 +01:00
Olivier Goffart	e0b6395d18	Use sane datastructure in Utility::StopWatch ... We don't want to logging to be O(N^2) Also avoid usage of macro when possible	2014-03-28 09:50:13 +01:00
Olivier Goffart	ba896b0550	Avoid copies of the StopWatch	2014-03-28 09:39:50 +01:00
Olivier Goffart	36a2c861c2	Only build the static library when BUILD_LIBRARIES_ONLY is defined	2014-03-28 09:34:21 +01:00
Olivier Goffart	7f975e0b2f	Avoid macro when it can easily be done with a local variable	2014-03-28 09:27:05 +01:00
Olivier Goffart	69fcbd3b0d	Fix Qt4 compilation ... And a typo	2014-03-27 18:19:56 +01:00
Olivier Goffart	d6525a979d	Do not let user change it's login while using shibbolet ... Fixes #915	2014-03-27 17:59:50 +01:00
Markus Goetz	54313338cd	SyncEngine: new aboutToPropagate signal	2014-03-27 17:04:31 +01:00
Markus Goetz	09e6207ce9	SyncEngine: Fix typo	2014-03-27 15:19:02 +01:00
Denis Dzyubenko	000e0bb600	Fast forwarded qtmacgoodies	2014-03-27 10:39:56 +01:00
Olivier Goffart	de2335c1db	Show the folders when in the accountsettings in the first start	2014-03-26 19:31:37 +01:00
Olivier Goffart	332c6cf726	Fix invalid signal connection	2014-03-26 19:31:37 +01:00
Klaas Freitag	086dd07d69	Log the processed items to a logfile.	2014-03-26 18:16:27 +01:00
Klaas Freitag	dd6b71bad6	Use a stopwatch to meassure the time consumed.	2014-03-26 18:16:27 +01:00
Klaas Freitag	9af2339596	Store the request duration and timestamp to final item	2014-03-26 18:16:27 +01:00
Klaas Freitag	0fcef5f604	Add data to store interesting info from the sync run (other tree)	2014-03-26 18:16:27 +01:00
Klaas Freitag	c41935d49d	Add a class to write a machine readable sync log file.	2014-03-26 18:16:27 +01:00
Klaas Freitag	7b84defd56	Add a stopwatch utility class with lap times. ... Allows to meassure the duration of something that started at a point of time, with some small convenience methods.	2014-03-26 18:16:27 +01:00
Klaas Freitag	505429b582	Add a duration and the repsonse timestamp to the jobs.	2014-03-26 18:16:27 +01:00
Klaas Freitag	11bbad79e2	Use QTimer as object member rather than pointer based. ... Avoid crashes if timer is zero.	2014-03-26 18:16:27 +01:00
Klaas Freitag	6e6f647c63	Change data type for fileId to QByteArray.	2014-03-26 18:12:22 +01:00
Olivier Goffart	2ad7b0aae0	Fix crash on first run when no account are configured	2014-03-26 17:42:05 +01:00
Olivier Goffart	588633a0f2	Fix leak: don't leak the settings	2014-03-26 17:42:05 +01:00
Markus Goetz	d5659442b2	SyncEngine: Sanity bail out if DB does not exist suddenly ... The update/reconcile worked for me, but the Propagate step had an invalid DB path but still went on (and then messed things up)	2014-03-26 16:57:50 +01:00
Markus Goetz	c6e5f39f7f	SyncJournalDb: Verbose log on load failure	2014-03-26 16:40:00 +01:00
Olivier Goffart	38344589c4	Exxtract the exception message from reply to PUT ... Might be usefull to debug Internal Server Error Fixes #1366	2014-03-26 12:02:22 +01:00
Denis Dzyubenko	6c28151e0f	Fast forwarded qtmacgoodies submodule	2014-03-26 10:15:35 +01:00
Daniel Molkentin	1c4af687ea	Compile on Mac again	2014-03-26 07:20:24 +01:00
Daniel Molkentin	c3d37efa6c	Fix OS X compilation	2014-03-25 23:33:46 +01:00
Daniel Molkentin	3ac1849963	Don't moc twice	2014-03-25 20:55:04 +01:00
Olivier Goffart	b4f992b944	Merge pull request #1446 from owncloud/remove-tooltip ... remove superfluous tooltip from server address input field	2014-03-25 20:16:26 +01:00
Daniel Molkentin	45ec489f71	Merge branch 'master' of github.com:shadone/mirall into shadone-master ... Conflicts: cmake/modules/QtVersionAbstraction.cmake src/CMakeLists.txt src/mirall/owncloudgui.cpp	2014-03-25 19:56:45 +01:00
Daniel Molkentin	e2fe4972d9	Don't show ocsync version, it's part of mirall now	2014-03-25 19:04:05 +01:00
Mathieu Arnold	84b4872938	And make it runnable on FreeBSD too. ... Patch by: Tobias Berner	2014-03-25 17:23:11 +01:00
Mathieu Arnold	3f9bd1d72a	Fix build on FreeBSD. ... We use libinotify, so the linux folderwatcher works. Based on a patch by: Tobias Berner	2014-03-25 17:22:54 +01:00
Markus Goetz	91f416ffc7	Fix compile after changing Account::davPath()	2014-03-22 09:41:32 +01:00
Sandro Knauß	47274f1075	Merge remote-tracking branch 'respect-XDG_CONFIG_HOME' into 1.5	2014-03-21 17:20:15 +01:00
Markus Goetz	ff95cbd04b	Account: Don't hardcode WebDAV path	2014-03-21 17:14:04 +01:00
Markus Goetz	cc5fabdab0	Engine: Introduce jobCompleted() signal	2014-03-21 17:13:02 +01:00
Markus Goetz	ff95e233bc	Token Credentials: Support actual tokens	2014-03-21 17:12:26 +01:00
Markus Goetz	f72e1cc837	Log: Don't override level for csync ... The level shall be set from Folder or owncloudCmd only.	2014-03-21 13:52:35 +01:00
Olivier Goffart	8e6674e784	Merge branch '1.5' ... Conflicts: src/owncloudcmd/owncloudcmd.cpp	2014-03-21 10:06:45 +01:00
Olivier Goffart	8aace3284f	owncloudcmd: Fix an error during update phase would not terminate ... the QApplication::quit() would be run before the exec() and would be a noop, and then exec would just wait forever.	2014-03-21 10:03:11 +01:00
Olivier Goffart	bb9d6b34c7	Remove FIXME and TODO ... They are outdated	2014-03-20 16:42:43 +01:00
Olivier Goffart	07025c7432	Remove a FIXME ... The commit message say that this line should be necessary to show the information when the setting dialog is open, but this is working now via the signals	2014-03-20 16:42:43 +01:00
Olivier Goffart	b65601aaa4	Remove FIXME ... This has been refactored since the comment was added and is no longer a hack	2014-03-20 16:42:43 +01:00
Olivier Goffart	756e1c4a12	Prefer the use of _isDirectory over item._type == SyncFileItem::Directory	2014-03-20 16:42:42 +01:00
Olivier Goffart	c5f8a2555d	Rename _dir to _direction ... (to avoid confusion with directory)	2014-03-20 16:42:42 +01:00
Olivier Goffart	a1ab9c84c7	Remove FIXME in syncengine	2014-03-20 16:42:42 +01:00
Olivier Goffart	23f3a6b319	restore the last change menu ... It was not yet implemented after the progress refactoring	2014-03-20 14:43:10 +01:00
Olivier Goffart	ebeb668a62	QNAM jobs: Make sure there is an etag is proper and not changed when one resume ... Those tests are existing on the legacy jobs. We check there is an etag so we make sure a proxy is not in between. (We have seen user complaining because their proxy is replacing the pages with one that says they need to enter their login and password) Also it is important to check that the etag has not changed if we resume (this may happen if the file is changed on the server between the update phase and the propagate phase, and that we resume this file)	2014-03-20 13:31:42 +01:00
Klaas Freitag	ca536f467a	Proper initialization to avoid build warnings.	2014-03-20 12:35:16 +01:00
Olivier Goffart	05d3273591	Detect the error that may happen when downloading a file	2014-03-20 11:35:30 +01:00
Daniel Molkentin	eef57032f8	OCUpdater: Compare to the current version ... Fixes #1548	2014-03-18 00:28:26 +01:00
Olivier Goffart	6377dca4b0	Add the file and line number of the debug in the debug view	2014-03-17 12:15:45 +01:00
Olivier Goffart	f05320c32c	Clean the debug a bit	2014-03-17 12:15:16 +01:00
Olivier Goffart	b0f8a24c20	CSyncThread was renamed, give proper names in Folder ... take in account that the object live in the same thread	2014-03-17 11:47:23 +01:00
Olivier Goffart	c841b9c0c4	Remove unused libsync_HEADERS ... This was unused and is redudent with owncloudsync_HEADERS	2014-03-17 11:36:53 +01:00
Olivier Goffart	7b482c0e96	Rename CSyncThread to SyncEngine ... CSyncThread has not been a thread for a long time now	2014-03-17 11:34:51 +01:00
Olivier Goffart	bf5091d862	Merge branch '1.5'	2014-03-17 11:26:28 +01:00
Olivier Goffart	5c45ede4a5	Read the quota as double ... The server is sending floating point number when the amount of storage is set to a custom number (say 1.2GB) This should fix #1374	2014-03-17 10:37:06 +01:00
Olivier Goffart	cabcdd890e	Only run the CheckQuota job if the account is connected ... We use another job to check the connection. And this may cause wrong password failure as we are still in the wizzard Fixes #1567	2014-03-17 10:35:43 +01:00
Olivier Goffart	0a5e691ba3	Remove debug output that might cause a crash ... The account may not be finilized when this is called while the wizzard is still running on first connection	2014-03-17 10:22:14 +01:00
Olivier Goffart	ba300c2fc1	Fix memory leak: Don't use raw pointers	2014-03-17 10:04:42 +01:00
Olivier Goffart	62e95e540b	Remove Progress::Kind ... It's not really used, one need to look at the instruction of the items being processed to see what happens	2014-03-14 18:43:23 +01:00
Olivier Goffart	d744b5e481	Fix the file count in the progress ... And clear the ignored files between syncs	2014-03-14 18:29:23 +01:00
Olivier Goffart	f9b82d852c	Do not destroy the settings dialog when it is hidden. ... That way the protocol widget stay filled. And the state is kept	2014-03-14 17:39:20 +01:00
Olivier Goffart	33289bde29	Merge remote-tracking branch 'origin/1.5' ... Conflicts: CMakeLists.txt VERSION.cmake src/CMakeLists.txt	2014-03-14 17:27:50 +01:00
Olivier Goffart	9053662fe8	remove Progress::SyncProblem and the problem slots ... They are merged into normal progress	2014-03-14 17:18:26 +01:00
Markus Goetz	07904e078a	CSyncThread: Emit a signal for each file before propagate ... This can be used to display info before the sync is happening	2014-03-14 14:08:32 +01:00
Olivier Goffart	aacc278583	Refactor the progress ... Consider that there might be several files processed at the same time	2014-03-14 13:32:32 +01:00
Daniel Molkentin	87f3755b1f	Deploy with Qt5	2014-03-13 00:52:01 +01:00
Markus Goetz	a2467b5dea	CMake: Do options one directory above ... This fixes linking when keychain was not desired.	2014-03-12 14:20:38 +01:00
Denis Dzyubenko	aee4c06b8d	Renamed a member variable to have underscore prefix for consistency	2014-03-11 20:34:00 +01:00
Denis Dzyubenko	89a4833cae	Fixed a memory leak in FSEvents folderwatcher backend	2014-03-11 20:34:00 +01:00
Denis Dzyubenko	255d255217	Fixed ignored paths matching on OS X. ... We now listen to changes to files and when an event is received we first match the file name to the "ignored paths list" and only if the the file that was changed didn't match figure out which directory needs to be synced.	2014-03-11 20:34:00 +01:00
Denis Dzyubenko	902de2dc93	Fixed a memory leak in FSEvents file system watcher	2014-03-11 20:34:00 +01:00
Denis Dzyubenko	f7c075099b	Removed bogus commented out line	2014-03-11 20:34:00 +01:00
Markus Goetz	0bbcee7354	CMake: Fix else	2014-03-11 17:56:29 +01:00
Markus Goetz	8a18cf811e	CMake: Fix warning	2014-03-11 17:33:45 +01:00
Markus Goetz	4e7e25c569	Improve libowncloudsync ... * Introduce TokenCredentials * Introduce static compiling * Have compile flags for smaller compile	2014-03-11 17:05:44 +01:00
Klaas Freitag	bc41e6bc99	Allow proper translation for sync activity through GuiLog. ... This fixes bug #1550	2014-03-11 10:55:20 +01:00
Klaas Freitag	c8a8eb35fa	Disable the folder if it is going to be removed.	2014-03-10 12:22:06 +01:00
Klaas Freitag	8bf2c54b56	Install include dirs app name aware.	2014-03-07 13:05:17 +01:00
Olivier Goffart	7cab77e879	Call the start method assyncroniously ... That was my intention, which is why i did not do a direct call to start. This should fix issue #1536	2014-03-06 21:01:08 +01:00
Olivier Goffart	feb49b2768	Saner defaults	2014-03-06 20:34:11 +01:00
Olivier Goffart	4e25595520	Better error classification	2014-03-06 20:33:17 +01:00
Olivier Goffart	4aaa256b11	Do not beleive that the credidential are wrong when the job is cancelled ... Otherwise, aborting the sync will make the client beleive the credidentials are wrong.	2014-03-06 20:31:48 +01:00
Markus Goetz	630f61142a	Proxy: Try to fix issue ... See eb7074e9f0 for discussion	2014-03-06 17:48:18 +01:00
Olivier Goffart	ac393c6374	Do not sent more chunk and cancel the upload when the file change while uploading chunks	2014-03-06 16:04:32 +01:00
Olivier Goffart	5e012366ab	Keep string translatable ... (In french, one may want to add a space before the colon. Other languages may want to change the order) Also use the two argument version of arg() to avoid issues if the first string contains a '%1' sign	2014-03-06 15:01:34 +01:00
Olivier Goffart	ed1294d668	Avoid double delete	2014-03-06 14:28:58 +01:00
Olivier Goffart	ed2316a53f	Add missing line break ... (silent warning)	2014-03-06 14:10:42 +01:00
Olivier Goffart	e5a8cd4521	Merge branch '1.5' ... Conflicts: VERSION.cmake	2014-03-06 14:10:08 +01:00
Jan-Christoph Borchardt	5ce4763868	move percent indicator of space usage to correct location	2014-03-05 12:55:32 +01:00
Jan-Christoph Borchardt	bafc90cfd8	clarify which space is used, fix #1517	2014-03-05 12:54:47 +01:00
Klaas Freitag	66b152ac69	Remove left over member variables.	2014-03-03 18:12:12 +01:00
Olivier Goffart	6df00ad08c	Only removes the password from the credidentials if it has been fetched before ... Also only run the propfind job if the credidentials are readon, and fetch them otherwise	2014-03-03 17:55:15 +01:00
Olivier Goffart	76b24ff00d	Revert "Do not wipe the credentials from config for reconnect." ... This reverts commit 9eb3452a71. We need that or wrong password can never be changed	2014-03-03 17:21:20 +01:00
Olivier Goffart	60a1d50ec9	Keep the rentrency flag when asking the user for the password	2014-03-03 17:16:57 +01:00
Klaas Freitag	9eb3452a71	Do not wipe the credentials from config for reconnect. ... This should fix bug #1491	2014-03-03 16:39:38 +01:00
Klaas Freitag	228de7eede	Make the CheckServerJob ignoring credential fails.	2014-03-03 16:37:29 +01:00
Klaas Freitag	2164f5d9b7	Remove a superflous MessageBox. User is asked for Password instead.	2014-03-03 16:36:59 +01:00
Klaas Freitag	4240010046	Add method clearCookieJar which wipes QNAMs cookies.	2014-03-03 16:36:30 +01:00
Klaas Freitag	1eb0875518	Use the mirall config file for all Keychain jobs. ... Also set the job as parent to get proper deletion of the settings object.	2014-03-03 16:35:57 +01:00
Klaas Freitag	b8e52304bd	Do proper initialization of _fetchJobInProgress. ... That confused win32, since this flag was true very often.	2014-03-03 16:33:59 +01:00
Olivier Goffart	0658802048	Fix layout of the network tab ... Fixes #1491	2014-02-28 13:17:04 +01:00
Olivier Goffart	eeb68919bf	Do not erase the username and password from the config if we never connected ... If we never fetched the credidentials, the _user and _password will be empty, we should therefore not try to save them because it would just erase them. Version 1.5.2 always try to fetch the creds at startup. But now we only do it if we detect an internet connection	2014-02-28 12:51:06 +01:00
Olivier Goffart	9a60732542	Do not erase the full account config if an old version of the client stored the password	2014-02-28 12:51:06 +01:00
Daniel Molkentin	36cd9d9ced	Shibboleth: Move browser window to the offset of the setup wizard	2014-02-27 17:07:59 +01:00
Daniel Molkentin	9c70ee68d2	Mask password lineedit	2014-02-27 17:07:59 +01:00
Olivier Goffart	e809a59049	Remove spurious error message. ... Sometimes 'success' is false without apparent reason. Just remove the message	2014-02-27 17:03:42 +01:00
Olivier Goffart	96c535d712	Make the parrallel uploaded also check for problem in Shared	2014-02-27 14:13:22 +01:00
Markus Goetz	a652fec5a0	csync: Remove more unused stuff	2014-02-27 13:33:22 +01:00
Daniel Molkentin	33ae2eb19f	Try to handle auth requests by a Shibboleth IdP	2014-02-27 13:18:53 +01:00
Olivier Goffart	d4fa955950	Don't fetch credidentials from application.cpp ... They will be fetched by the connection validator after doing the status.php check	2014-02-27 13:06:29 +01:00
Olivier Goffart	869793592d	Merge branch '1.5' ... Conflicts: VERSION.cmake src/mirall/owncloudpropagator.cpp src/mirall/owncloudpropagator.h	2014-02-27 11:40:34 +01:00
Daniel Molkentin	d4dd5afbe7	Revert "Make "Sign Out" forget the cookies" ... This reverts commit 8607300195. This approach is too dangerous for 1.5.2.	2014-02-26 15:05:15 +01:00
Olivier Goffart	8607300195	Make "Sign Out" forget the cookies ... If we keep the cookies, next time we sign in, the entered password does not matter as the server still think our session is logged in.	2014-02-26 13:23:52 +01:00
Olivier Goffart	e468ea2d68	Avoid re-entrency in HTTPCredidential::fetch ... It is likely to re-enter if there is two jobs that asks for a password. Example: 1. log out 2. restart the application 3. enter a wrong password 4. enter a wrong password again a few times 5. enter the correct password 6. it should must not prompt for the password again. Because of the re-entrency, it was still prompting for the password several times after the right password had been entered	2014-02-26 13:10:11 +01:00
Daniel Molkentin	05a1f7b1bb	Another fix for the reconnect-logic	2014-02-26 11:26:50 +01:00
Markus Goetz	c7e70533a0	Shibboleth: Detect also QNAM redirects ... If a QNAM job (e.g. Quota or ETag job) gets redirected, we'll invalidate and then prompt to re-fetch the credentials from the user. (The keychain credentials will be wrong so they get deleted)	2014-02-25 14:22:55 +01:00
Markus Goetz	065690c2ce	Shibboleth: Have proper invalidation if timeout during sync	2014-02-25 09:33:28 +01:00
Markus Goetz	b56843ead2	Account: Fix Metatype registratition	2014-02-24 15:31:11 +01:00
Markus Goetz	51b5f3c9b2	Propfind Job: Print redirect URL in log	2014-02-24 15:20:49 +01:00
Daniel Molkentin	7f508c0718	Account needs qRegisterMetaType	2014-02-24 14:56:57 +01:00
Daniel Molkentin	45a7d4ff4c	Fix Wizard when returning from later steps ... We need to reset the credential type when returning to the first page from later steps. Otherwise, unfinished credential instances and their NAM will try to fetch data, which will fail with weird symptoms.	2014-02-24 14:56:57 +01:00
Daniel Molkentin	995e8938ad	SSLButton: Fix certificate display	2014-02-24 14:56:56 +01:00
Daniel Molkentin	5c1d612761	Account settings: Set correct state icon right away	2014-02-21 21:02:35 +01:00
Olivier Goffart	cd13144415	Fix adding a file in a Shared readonly directory ... It should not create a conflict in that case. Also when editing a file, create a conflict using the normal way, after downloading the file and checking it is not the same	2014-02-21 10:53:09 +01:00
Daniel Molkentin	8e7290b450	Fix online state handling ... Before this commit, parts of mirall were aware of the state, but not all. Also, the state was not set back to Connected again in all cases. This commit introduces the following changes: - Make QuotaInfo a member of Account - QuotaInfo and Folder (EtagJob) can put the client in disconnected mode - FolderMan now disables etag-polling when offline Fixes #1459 Fixes #1441	2014-02-20 23:24:03 +01:00
Daniel Molkentin	30d0e2fee8	Remove stray debug	2014-02-20 23:23:46 +01:00
dragotin	c38c3ce6e2	Merge pull request #1450 from owncloud/remove-file-string ... remove 'File' word from notification	2014-02-20 17:31:57 +01:00
Klaas Freitag	04647b0d61	Handle empty passwords returning from the keychain read procedure. ... This is needed if the keychain does not have the an QSettings based fallback any more.	2014-02-20 16:53:38 +01:00
Klaas Freitag	e991bcd112	Do not store the password in the config file. Erase it if it is there. ... This fixes bug #1458	2014-02-20 14:35:02 +01:00
Markus Goetz	6a55324261	OwncloudCmd: Struct needs to be zeroed ... Else the --silent was always true on Windows where memory did not get zeroed.	2014-02-19 17:50:15 +01:00
Klaas Freitag	82afb3b613	If a file in a read only share was edited, restore and create conflict. ... This fixes bug #1448	2014-02-19 17:21:43 +01:00
Olivier Goffart	f5e16540a1	Merge branch '1.5' ... Conflicts: src/mirall/owncloudpropagator.cpp	2014-02-19 15:38:03 +01:00
Daniel Molkentin	726b41b0c7	Shib: Close browser window after login	2014-02-19 15:34:43 +01:00
Olivier Goffart	e74f0f2854	Better support when user remove or rename the Shared directory	2014-02-19 15:23:36 +01:00
Markus Goetz	65ffe53c20	Register metatype at better place	2014-02-19 14:53:31 +01:00
Markus Goetz	06f2989ac8	Fix build on Qt4 ... Unfortunately I had to remove the 'static'	2014-02-19 13:29:00 +01:00
Olivier Goffart	a51f050a08	More fix for moving shared directories ... Abort a directory job if the first job fails Also make sure the jobs are in the directory job of their destination paths	2014-02-19 13:08:35 +01:00
Markus Goetz	399b08ad40	OwncloudCmd: Register a meta type	2014-02-19 12:00:38 +01:00
Olivier Goffart	5b561e4462	Use AUTOMOC ... This should also fix the compilation of owncloudcmd.cpp Since we have a Q_OBJECT in a .cpp file and qt_wrap_cpp would not generate the moc file.	2014-02-19 11:55:08 +01:00
Olivier Goffart	1be322579c	Merge remote-tracking branch 'origin/master' ... Conflicts: src/owncloudcmd/owncloudcmd.cpp	2014-02-19 11:19:56 +01:00
Markus Goetz	b7c7c9f3eb	Accountsettings: Fix warning	2014-02-19 10:59:57 +01:00
Markus Goetz	9237293cc0	OwncloudCmd: Fixup URL ... Allow users to specify owncloud(s) or http(s)	2014-02-19 10:57:29 +01:00
Markus Goetz	63083a558b	OwncloudCmd: Print update phase duration values	2014-02-19 10:51:04 +01:00
Olivier Goffart	d4bd327fef	Merge branch 'parallel_upload' ... Conflicts: src/mirall/csyncthread.cpp	2014-02-19 10:24:34 +01:00
Olivier Goffart	2de288c5f3	Merge remote-tracking branch 'origin/1.5' ... Conflicts: VERSION.cmake	2014-02-19 10:21:23 +01:00
Markus Goetz	fcc0e89044	Update phase: Allow benchmarking / progress update	2014-02-18 21:41:20 +01:00
Jan-Christoph Borchardt	8267b9e590	remove 'File' word from notification	2014-02-18 18:42:49 +01:00
Jan-Christoph Borchardt	5a68e5f58d	remove superfluous tooltip from server address input field	2014-02-18 17:21:25 +01:00
Klaas Freitag	e4965ab06b	Mac FS watcher: ignore events from the same process	2014-02-18 16:28:25 +01:00
Olivier Goffart	496d900fee	Refactor the renameReplace in its own function ... Share a bit more code between legacy and qnam download job	2014-02-18 14:05:52 +01:00
Olivier Goffart	58bda69f8b	PropagateRemoteRename is not a legacy job ... move it back to propagatorjobs.cpp	2014-02-18 13:52:40 +01:00
Olivier Goffart	89b5ddec56	Fix the logs in the update phase ... Since csync use a thread local variable for the logs, we need to reset it when we enter the update thread	2014-02-18 13:48:13 +01:00
Olivier Goffart	f7419094f3	move the file system helpers in their own file	2014-02-18 12:54:40 +01:00
Olivier Goffart	432f377750	Use the legacy jobs when using bandwidth limiting ... Or if a environement variable is set	2014-02-18 12:24:35 +01:00
Olivier Goffart	c32beb957d	Move the jobs around between files ... Renamed owncloudpropagator_qnam to propagator_qnam Move the jobs in propagatorjobs.cpp Move the neon jobs that have a qnam equivalent into propagator_legacy.cpp and rename the jobs accordingly	2014-02-18 12:21:05 +01:00
Denis Dzyubenko	a51cb0982b	Added Mac-specific settings dialog that looks more native	2014-02-18 02:22:16 +01:00
hefee	1b03dc759b	fixing typo ... GNU Public License-> GNU General Public License	2014-02-17 22:42:51 +01:00
Olivier Goffart	a39caa1cda	Make owncloudcmd work with the parallel upload/download ... Also make it work when there syncing a remote subfolder	2014-02-17 17:31:03 +01:00
Olivier Goffart	a4ee8d6f6f	Remove unused function	2014-02-17 15:25:47 +01:00
Olivier Goffart	b35e38f80f	Parallel download	2014-02-17 13:48:56 +01:00
Klaas Freitag	e134ae22ac	Disable explorer.exe integration on WinXP	2014-02-13 17:21:30 +01:00
Daniel Molkentin	e66757335b	Theme: Update general disclaimer.	2014-02-13 17:04:52 +01:00
Markus Goetz	372f8b3426	OS X: Document how to disable the auto updater	2014-02-13 14:11:04 +01:00
Olivier Goffart	7b6269b4bf	Fix chunking ... - Do not start them in parallel, start them in sequence instead, as they are quite and there are already other jobs running in parallel normaly - Do not load the fill into memory - Support resuming	2014-02-13 14:02:05 +01:00
Markus Goetz	8b9cd432b5	OS X: Read system-wide plist in /Library ... Needed for http://doc.owncloud.org/desktop/1.5/autoupdate.html#preventing-auto-updates	2014-02-13 12:52:57 +01:00
Daniel Molkentin	beb9752f09	Merge remote-tracking branch 'origin/1.5'	2014-02-12 21:17:06 +01:00
Daniel Molkentin	fd40a25030	Use the appName (which is the short name) instead of the full length name ... The full length name is allowed to change (or should be)	2014-02-12 18:06:01 +01:00
Daniel Molkentin	05ae467cd5	Remove debug	2014-02-12 18:05:28 +01:00
Daniel Molkentin	958253bb2b	Respect skipUpdate policy from global config files and windows policy.	2014-02-12 17:55:05 +01:00
Daniel Molkentin	bcf73cfc40	SSLButton: Omit arrow on Windows which can't display it	2014-02-12 17:55:05 +01:00
Daniel Molkentin	f79ecfe001	more verbose ssl error logging	2014-02-12 17:54:45 +01:00
Olivier Goffart	a4442ebb40	Merge branch 'master' into parallel_upload ... Conflicts: src/mirall/owncloudpropagator.cpp src/mirall/owncloudpropagator.h	2014-02-12 16:50:45 +01:00
Olivier Goffart	93f31fa9d7	Merge branch '1.5'	2014-02-12 16:44:24 +01:00
Olivier Goffart	f35b1f8a2b	Only starts 6 jobs in parallel	2014-02-12 16:33:55 +01:00
Olivier Goffart	6db8daabf7	Make abort work even when there are parallel uploads	2014-02-12 16:33:55 +01:00
Olivier Goffart	a677f97b7f	Fix removing and renaming directories from the Shared directory	2014-02-12 13:44:55 +01:00
Olivier Goffart	01c0a3c099	use Utility::sleep	2014-02-12 11:16:27 +01:00
Markus Goetz	153aa31da2	OS X: Workaround Qt5 QNAM bug ... This made the sign out/sign in handling not work. (cherry picked from commit 104cf680a6)	2014-02-12 11:14:43 +01:00
Markus Goetz	8c9a65635f	Propagator: Fix compilation ... It is still protected on Qt4	2014-02-10 15:46:09 +01:00
Markus Goetz	104cf680a6	OS X: Workaround Qt5 QNAM bug ... This made the sign out/sign in handling not work.	2014-02-10 15:42:46 +01:00
Markus Goetz	79d14f0760	Propagator: Use cross platform sleep function	2014-02-10 14:34:48 +01:00
Klaas Freitag	6387777c18	Added chunking for the new uploading.	2014-02-10 13:00:22 +01:00
Klaas Freitag	41a4f1fc37	Only wait half a second before the next folder sync is started.	2014-02-07 11:53:58 +01:00
Daniel Molkentin	5a6a8b504c	Mac OS: Build fix	2014-02-06 22:32:17 +01:00
Daniel Molkentin	97345447ab	Updater: Unify Sparkle&non-Sparkle URLs ... ...now that we have the support on the server-side.	2014-02-06 18:56:33 +01:00
Olivier Goffart	bb378902ae	Also force an update of the etag in case of renames ... Imagine we have a file: foo/bar/moo if we do mv 'foo' 'foo2' and that we issue a MOVE on the server and will update the entry 'foo' in the database with the new etag If we write the etag of foo but not the etag of the sub item, when we read from db on the next sync, we will miss them and beleive they have been removed on the server	2014-02-06 17:56:27 +01:00
Olivier Goffart	8f1494f8f2	Report an error if fetching the etag fails ... Very important in case of renames, else, if the server did not perform the rename, we may end up deleting the files	2014-02-06 17:56:27 +01:00
Daniel Molkentin	4ae66b8b20	ShibbolethCredetials: Try to avoid re-auth ... ...by storing the shib cookie in key chain	2014-02-06 13:02:01 +01:00
Daniel Molkentin	ccb45bfea6	Move code from HTTPCredentials to more generic locations ... This is a preparation to make them usable from the Shibboleth credentials class.	2014-02-06 13:02:01 +01:00
Daniel Molkentin	bee5940c42	Credentials: Remove unused fetchFromUser methods	2014-02-06 13:02:01 +01:00
Olivier Goffart	f67d2e6418	Start all the jobs in parallel	2014-02-06 12:11:45 +01:00
Olivier Goffart	9a6275a5e3	use QNAM for the PUT ... Not yet supported: - chunking - if the file changes while uploading - aborting - owncloudcmd (because of the dependency to the account and the credidentials)	2014-02-06 11:50:16 +01:00
Olivier Goffart	2d9c0b6c31	Move CSyncThread in the main thread, and just do the neon jobs in a thread ... It is important because then we can do assynchronious job that needs QNAM in the main thread	2014-02-05 20:18:03 +01:00
Olivier Goffart	49562ca3b6	Remove unused members	2014-02-05 16:40:56 +01:00
Daniel Molkentin	33ab854922	SslErrorDialog: Ensure to run into a timeout while showing the dialog	2014-02-05 14:18:31 +01:00
Markus Goetz	1471e15674	Sparkle: Add more delegate methods	2014-02-04 18:43:49 +01:00
Markus Goetz	e001e70816	Sparkle: Get it working	2014-02-04 17:37:01 +01:00
Olivier Goffart	4ade023b96	Find another way to ignore the csync journal from the file watcher	2014-02-04 16:46:14 +01:00
Olivier Goffart	ec266054be	Don't use QFileInfo to get the last modified time. ... We can use the _modtime, since normaly we just set the the modtime of the file to this time. The problem is that Qt does follow symlinks (FILE_FLAG_OPEN_REPARSE_POINT) And therefore was causing problem with symbolic links. Fixes #1307	2014-02-04 16:17:58 +01:00
Olivier Goffart	324214d072	fix the 'Sign In' menu entry	2014-02-04 15:06:17 +01:00
Klaas Freitag	ae5c9a29f6	Detect renames and removes in read only Shared directory, restore files. ... This fixes bug #1386	2014-02-04 15:03:06 +01:00
Klaas Freitag	72a6b00919	Add some usage hints.	2014-02-04 15:03:06 +01:00
Olivier Goffart	e06cfe06fe	FolderWatcher: ignore the csync journal	2014-02-04 14:57:25 +01:00
Olivier Goffart	d2a41342e1	Better error message when the write permission are missing in the local directory ... Fixes #1394	2014-02-04 11:10:22 +01:00
Markus Goetz	6f960d406e	Qt5: Use same path for config as Qt4	2014-02-04 10:02:28 +01:00
Daniel Molkentin	c19978bdc4	Fix Qt5 jenkins build failure	2014-02-04 08:50:45 +01:00
Markus Goetz	fdc8050e3d	Folder Wizard: Re-evaluate after local folder changed	2014-02-03 18:19:25 +01:00
Markus Goetz	62f5b0ebac	Folder Wizard: Make it more clear that we mean a remote folder	2014-02-03 17:27:54 +01:00
Markus Goetz	11c368f0bc	Sparkle: Fix compilation if not found	2014-02-03 16:31:24 +01:00
Daniel Molkentin	19e7c4f66f	NSISUpdater: Fix logic to invoke updater on non-explicit start	2014-02-03 13:46:20 +01:00
Klaas Freitag	971caca5e8	Implement change of the network throttling during a running sync run.	2014-02-02 12:51:19 +01:00
Daniel Molkentin	c2f3cfa4b5	Amendment to last commit	2014-01-31 14:53:20 +01:00
Daniel Molkentin	52971c27cf	Updater: More refinements	2014-01-31 14:49:10 +01:00
Daniel Molkentin	b3683976ca	Updater: Fix corner cases related to failed auto-updates ... - Don't re-download updates whom's auto-install has clearly failed before - Don't signal newly available auto-upgrade if it has failed once - Remove downloaded update after (un)successful auto-update - Remove as many temporary keys after an (un)successful auto-update	2014-01-31 12:42:00 +01:00
Daniel Molkentin	4c6e0b5c07	SSL Button fixes ... - Use OU as display name if CN is empty (often true for CA/interm. certs) - Handle trust anchors in intermediate chain gracefully	2014-01-31 10:35:35 +01:00
Daniel Molkentin	4e0cf7c822	Fix win32 build	2014-01-31 09:35:43 +01:00
Daniel Molkentin	528d434c1f	Amendment to last commit	2014-01-30 13:07:32 +01:00
Daniel Molkentin	2f81999d6c	Fix OS X build	2014-01-30 12:16:09 +01:00
Klaas Freitag	225123951d	Make compile under MacOSX	2014-01-30 11:17:14 +01:00
Daniel Molkentin	dfa1dfaa7d	AutoRaise SSLButton	2014-01-30 09:53:00 +01:00
Daniel Molkentin	74db151427	SSLButton: remove superflous extra argument	2014-01-30 09:53:00 +01:00
Daniel Molkentin	cb8131c382	Remove cmake message	2014-01-29 12:16:21 +01:00
Olivier Goffart	6540f54512	Don't use QDateTime::toTime_t or QDateTime::fromTime_t ... They only take an uint, and time_t is 64bit. This breaks when date are before 1970 Fixes #1380	2014-01-29 11:47:13 +01:00
Daniel Molkentin	1aa050bea9	Add Tests, make Updater classes into a static lib	2014-01-29 10:43:21 +01:00
Daniel Molkentin	ca5f96e1bb	Updater: More refactoring towards testability	2014-01-29 10:43:21 +01:00
Daniel Molkentin	d361bda922	Fix wording	2014-01-28 16:23:39 +01:00
Daniel Molkentin	62f4e813ee	Settings: Allow opening links in updater label	2014-01-28 16:23:24 +01:00
Daniel Molkentin	505e0e9632	Fix build on Win32 ... regression introduced by ec9efd78	2014-01-28 15:49:19 +01:00
Olivier Goffart	50aa31d192	winEventFilter does not exist on Qt5	2014-01-28 15:30:58 +01:00
Daniel Molkentin	c8006f1163	Compile fix	2014-01-28 13:42:09 +01:00
Daniel Molkentin	637565cca1	Updater: Don't overwrite unannouned (newer) versions	2014-01-28 13:36:16 +01:00
Daniel Molkentin	a22884d164	Show message if the updater times out	2014-01-28 13:36:16 +01:00
Daniel Molkentin	58fd57fdcd	Make update URL a compile time option	2014-01-28 13:36:16 +01:00
Daniel Molkentin	2bee51c101	Updater: Logic fix	2014-01-28 13:36:16 +01:00
Olivier Goffart	2ed5dd178a	Fix fetching the user name in the wizzard	2014-01-28 13:18:21 +01:00
Olivier Goffart	803cb5d015	fix signal slot connection	2014-01-28 12:45:41 +01:00
Olivier Goffart	e31000d759	Handle the fact that the user might cancel the password dialog ... Add a new state of the account in which the credidentials are invalid, but we are still trying to get the user enter his password. Make sure that fetched() is ALWAYS emitted after we call fetch on the credidentials, so we can know that the user pressed cancel. In that case, go in the SignedOut state. Fixes #1353	2014-01-28 11:49:09 +01:00
Daniel Molkentin	f408593d27	more build fixes	2014-01-28 11:01:05 +01:00
Daniel Molkentin	6d21058ca1	build fixes	2014-01-28 10:34:56 +01:00
Daniel Molkentin	1da94e5e2b	Updater: More refactoring ... - Renamed GenericUpdater -> OCUpdater - Make more API Private - Split up in classes to reduce complexity: - PassiveUpdateNotifier subclass for Linux - NSISUpdater for Windows	2014-01-28 10:01:23 +01:00
Olivier Goffart	397763ba61	Fix HttpCredentials::invalidateToken to invalidate the password in the config file	2014-01-27 16:57:10 +01:00
Daniel Molkentin	72ae44b8b1	Updater: relaunch Client after update	2014-01-27 13:04:27 +01:00
Olivier Goffart	e6be6fc695	Remove dead code	2014-01-27 12:44:46 +01:00
Olivier Goffart	18966bf061	Add missing include	2014-01-27 12:36:52 +01:00
Olivier Goffart	bf95509dbe	Do not include "private" header from "public" header	2014-01-27 12:31:54 +01:00
Olivier Goffart	50b9a7b191	remove unused include from header file	2014-01-27 11:58:50 +01:00
Olivier Goffart	08c03d19b9	Only one quote should be enough ... Should fix #1295	2014-01-24 20:28:17 +01:00
Daniel Molkentin	42f5aa072d	Link against Sparkle if available	2014-01-24 11:58:11 +01:00
Klaas Freitag	688d394576	Check for INotify if compiling for Linuxe and friends	2014-01-23 16:05:35 +01:00
Klaas Freitag	5841cf4020	Add and remove watches for folders independent from sync dir. ... Before it was just in case of download.	2014-01-23 13:23:27 +01:00
Klaas Freitag	e9e132c06c	Make use of the new linux folder watcher.	2014-01-23 13:23:27 +01:00
Klaas Freitag	e3723fcfc2	Add a new folder watcher implementation for Linux.	2014-01-23 13:23:27 +01:00
Daniel Molkentin	8485a7fd30	Fix typo	2014-01-22 16:09:22 +01:00
Daniel Molkentin	129aef5beb	Revert "Formatting hashes with : seems to be out of fashion" ... This reverts commit c52e3a0732.	2014-01-22 00:00:34 +01:00
Daniel Molkentin	54c0c4057b	Improve SSL detail display	2014-01-21 15:54:06 +01:00
Daniel Molkentin	c52e3a0732	Formatting hashes with : seems to be out of fashion	2014-01-21 15:25:51 +01:00
Klaas Freitag	699f6a62f8	Do not set sync-state to Prepare in setSyncEnabled(). ... This method is also called if the sync was disabled due to network problems and such, ie. from the ETag change check. In that case, we do not want to go to the Prepare state as we not neccessarily want to have the folder synced now. This fixes the problem that the folders were resynced way to often which we had in master for a couple of days now.	2014-01-21 15:25:05 +01:00
Olivier Goffart	61f3b839ab	Fix compilation in Qt5 ... Some Qt SSL function used to return QString now return a QStringList. By having QStringList(...).join(':') the code will compile both if the ... is a QString or a QStringList. So the code will still compile in Qt4.	2014-01-21 15:09:12 +01:00
Olivier Goffart	29590fa00b	Revert "Commented opening of files from the activity view as it does not work." ... This reverts commit c50b0a995b. This was only broken on windows and probabyl fixed by commit 23f52bcd	2014-01-21 13:01:05 +01:00
Olivier Goffart	0c33fc6e8a	Do not block while launching the explorer on linux ... Fixes #1338	2014-01-21 13:01:05 +01:00
Daniel Molkentin	c4c36d641b	Remove garbage include	2014-01-21 12:34:51 +01:00
Klaas Freitag	4d8e65cfd0	Hide useless logging that indicates an error.	2014-01-21 12:10:49 +01:00
Daniel Molkentin	2370060ac5	Implement Certificate Information Widget ... Currently used in status window. Before, there was no way to know about the current certificate situation. Fixes #44	2014-01-21 09:21:33 +01:00
Daniel Molkentin	d4bb0e44cd	Wizard: Gracefully fall back to HTTP if HTTPS connection fails ... If the connection fails, the user is now being asked if he does agree to a new attempt via an unencrypted connection. If he complies, the connection will be reattempted using plain HTTP. Fixes #1356	2014-01-20 19:46:09 +01:00
Daniel Molkentin	9b9b62d4e3	Wizard: Prepend 'https://' if no scheme is set ... First part of fix for #1356	2014-01-20 17:53:46 +01:00
Daniel Molkentin	2780dae569	Setup Wizard: Fix http(s) label size	2014-01-20 17:41:57 +01:00
Daniel Molkentin	562513d5a5	Propagator: Don't pass arbitrary strings as formating string ... Not a security issue since this code was never in any release.	2014-01-20 17:22:29 +01:00
Daniel Molkentin	a2e9353296	Fix copy & paste problem in Ignore List Editor ... Fixes #1355	2014-01-20 17:08:30 +01:00
Olivier Goffart	7f76fcff5e	Do not account the size of deleted or renamed file in the progress ... Fixes #1360	2014-01-20 17:00:28 +01:00
Olivier Goffart	0afbb264e0	cleanup mutex usage in CSyncThread ... The only method which is used from another thread is abort(). So the only thing that needs protection is that function, and the function which may race with. Which are csync_request_abort which should not race with csync_resume	2014-01-20 17:00:28 +01:00
Klaas Freitag	7bb7b1d73b	Remove wipeAllJournals after rebase mistake.	2014-01-20 16:19:30 +01:00
Klaas Freitag	0eebc0e5be	Add folder to schedule queue in setupFolders method. ... This fixes bug #1352	2014-01-20 16:19:30 +01:00
Klaas Freitag	a6b0ccfa12	Remove explicit logging.	2014-01-20 16:19:30 +01:00
Klaas Freitag	ce077f97c6	Checks if the folder from map is still defined. ... I saw a crash were a folder which was deleted was dereferenced later in the Quota check slot. There the folder pointer returned from folder map was zero.	2014-01-20 16:19:29 +01:00
Klaas Freitag	c705a6360d	Rather removeFolder than addFolder to watcher (typo fix).	2014-01-20 16:19:29 +01:00
Olivier Goffart	be874e36da	remove unused variable and functions	2014-01-20 15:10:53 +01:00
Olivier Goffart	3a9c485515	Fix crashwhile removing a folder ... in a QMap, Accessing an entry that does not exists create the null entry We should not use operator[] if we are not sure the folder indeed exists	2014-01-20 14:59:35 +01:00
Olivier Goffart	4df1d7d893	Remove unused variables	2014-01-20 14:59:23 +01:00
Olivier Goffart	bbf3a64c02	Fix crash. ... toUtf8() returns a temporary QByteArray wuich is only valid until the end of the statement (the next ';'). QByteArray::data() returns a pointer to the QByteArray's data which is only valid if the QByteArray is valid. Keeping the char* is therefore wrong.	2014-01-20 14:24:20 +01:00
Olivier Goffart	316aade340	Merge branch 'csync_merge' ... Conflicts: src/CMakeLists.txt	2014-01-20 13:27:33 +01:00
Klaas Freitag	45c75f722c	Show an indicator if the url is encrypted or not in connection wizard. ... Fixes bug #1350	2014-01-16 17:40:46 +01:00
Olivier Goffart	6257ed6605	Make sure that the jobs have the Q_OBJECT macro. ... so tr() works there	2014-01-16 14:06:17 +01:00
Klaas Freitag	0455d96462	Fix untranslated error messages.	2014-01-16 13:04:57 +01:00
Klaas Freitag	d2e8043a4a	Use ClientProxy that reads the client config in commandline client. ... Fixes mirall#1347	2014-01-16 12:52:11 +01:00
Klaas Freitag	98689d48f1	Check if configuration actually exists. ... If not, set System Proxy as default.	2014-01-16 12:52:11 +01:00
Klaas Freitag	ec9efd7894	Make use of the new Proxy handling class.	2014-01-16 12:52:11 +01:00
Klaas Freitag	671100ce5c	Add a class ClientProxy that handles proxy setting for Qt and csync.	2014-01-16 12:52:11 +01:00
Daniel Molkentin	96633307c0	Move owncloudcmd into Bundle on OS X ... Fixes #1300	2014-01-15 18:14:37 +01:00
Daniel Molkentin	2009fbc886	Deploy all of Sparkle manually	2014-01-15 17:52:19 +01:00
Daniel Molkentin	4caa038de6	More sparkle fixes	2014-01-15 16:01:35 +01:00
Daniel Molkentin	f5dc2b3127	Compile on OS X	2014-01-15 12:45:43 +01:00
Olivier Goffart	c7227297af	Make it compile with the merge of csync mirall	2014-01-15 12:20:03 +01:00
Daniel Molkentin	dc9f145a24	New Updater for Windows, passive notification on Linux, Sparkle on Mac	2014-01-15 11:09:31 +01:00
Klaas Freitag	55da857e59	A bit of refactoring, add useful names and set the alias properly. ... The alias field is now set from the last component of the picked local dir. Also some tooltips were added.	2014-01-14 17:40:42 +01:00
Klaas Freitag	aba1252e60	Remove inotify from cmake files.	2014-01-14 15:06:06 +01:00
Klaas Freitag	561f32cede	License header cleanups.	2014-01-13 16:16:19 +01:00
Klaas Freitag	e0d8d93b50	Removed obsolete inotify class of folderwatcher.	2014-01-13 16:07:52 +01:00
Klaas Freitag	3d8505d7f4	Adopt mac folderwatcher to the new folderwatcher.	2014-01-13 16:00:41 +01:00
Klaas Freitag	18171862ac	Unify folderwatcher private constructor.	2014-01-13 15:29:05 +01:00
Klaas Freitag	0e5858b1aa	Add a pathIsIgnored method to the folderwatcher.	2014-01-13 15:29:05 +01:00
Klaas Freitag	5482ad1fd3	Remove event buffering from watcher, other refactoring.	2014-01-13 15:28:56 +01:00
Klaas Freitag	f9080c59ab	Remove FolderWatcher from Folder and move to FolderMan.	2014-01-13 11:30:27 +01:00
Klaas Freitag	a12288ff21	Use folderwatcher based on Qt for Linux.	2014-01-13 11:30:27 +01:00
Klaas Freitag	d5b8d24f91	Add NoSymLink tag to the filter specification. ... Should finally fix bug #1331	2014-01-10 09:09:22 +01:00
Klaas Freitag	9da06f10f6	Removed unused event interval getter/setter.	2014-01-10 09:09:22 +01:00
Olivier Goffart	ebee52ea8a	Merge branch '1.5'	2014-01-09 12:32:08 +01:00
Klaas Freitag	e5804b5d12	Use a more Qt'ish folder recursing method, remove unused class. ... Added unit test.	2014-01-08 14:36:42 +01:00
Klaas Freitag	e5d43c2b9c	Add a utility function to write a random file.	2014-01-08 14:36:42 +01:00
Klaas Freitag	a522cebf0c	Add missing switch case.	2014-01-08 14:36:42 +01:00
Olivier Goffart	1bc4089d95	Fix hiding temporary files on windows ... tmpFileName is a relative path, and we need an absolute path to pass to the function that hides the files	2014-01-08 13:33:16 +01:00
Olivier Goffart	b7b06a8795	Preserve the permission of the file we download ... Related to issue #820	2014-01-08 13:17:35 +01:00
Olivier Goffart	4006e490f3	Do not write the removed folder on the DB ... Should fix #1329	2014-01-08 12:51:42 +01:00
Klaas Freitag	273463daf4	Fix progress for the case that the source file changes during upload. ... If the source file changes, the overall transmission size is not longer correct. Fixed that by pushing the change over the previously calculated size to csyncthread. Also set the mtime and size in the item object in propagator to avoid doublicate uploading.	2014-01-07 15:42:21 +01:00
Klaas Freitag	7da84dbe44	Check on timer member is zero.	2014-01-07 10:30:41 +01:00
hefee	4e0496f74d	respect XDG_CONFIG_HOME for getting user config dir. ... Under linux the XDG Base Directory Specification define different enviroment variables where to store what.	2013-12-31 02:10:44 +01:00
Sven Strickroth	8743be6f11	Close dialog if button was clicked not just pressed ... Signed-off-by: Sven Strickroth <email@cs-ware.de>	2013-12-21 03:36:43 +01:00
Klaas Freitag	38cc564aed	Show proper sync status in tray, incl. Pause status.	2013-12-20 15:16:52 +01:00
Klaas Freitag	72b479c1e0	Added proxy support to owncloudcmd.	2013-12-19 16:48:10 +01:00
Klaas Freitag	d17be6f1ff	Do the neon ssl initialization. ... This fixes bug #1298 and also probably #1297. More tests needed.	2013-12-19 13:33:31 +01:00
Klaas Freitag	c50b0a995b	Commented opening of files from the activity view as it does not work. ... See https://github.com/owncloud/mirall/issues/1295	2013-12-17 14:16:25 +01:00
Klaas Freitag	66c0a3b448	Read password from old settings if exist.	2013-12-17 12:56:01 +01:00
Klaas Freitag	23f52bcd56	Fix open the explorer code.	2013-12-17 10:16:25 +01:00
Stefan Profanter	a93b9ee33a	Fixed parent folder detection if sibling directory starts with same name ... Since `cleanPath` removes all the trailing slashes (84bfbd4cb0:src/corelib/io/qdir.cpp#L2118) the check at line 138 wrongly assumed that `D:\Test` is a parent folder of `D:\TestFoo`.	2013-12-15 16:22:53 +01:00
Daniel Molkentin	bef180a7bc	Remove UTF-8 BOM, confuses old GCCs	2013-12-13 20:27:08 +01:00
Daniel Molkentin	9010e1015e	Better fix for override urls	2013-12-12 17:17:07 +01:00
Klaas Freitag	9bf15178f9	Fix button states in account widget	2013-12-12 16:38:45 +01:00
Daniel Molkentin	5b2c734fe5	Respect the override URL properly	2013-12-12 16:20:01 +01:00
Klaas Freitag	bc5f7d899a	Save and restore activity view state. ... Fixes bug #1256	2013-12-12 15:16:43 +01:00
Klaas Freitag	ec77ecfd0f	Show error reason for blacklisted files in sync activity.	2013-12-12 12:21:24 +01:00
Klaas Freitag	09745c7f75	Fix: Allow to retry sync also for fatal err conditions. ... Otherwise there would not have been a chance to resync for example data that was Forbidden because of a read only share. Also removed some commented code.	2013-12-12 11:39:05 +01:00
Daniel Molkentin	9ffb33293c	QuotaInfo: Keep polling quota if a previous request fails	2013-12-12 10:53:51 +01:00
Klaas Freitag	aa213eeafb	Do not check for the ETag in case the HTTP request connected.	2013-12-11 13:51:38 +01:00
Daniel Molkentin	76a60e889c	Start timer only after the last quota request was answered	2013-12-11 13:48:31 +01:00
Olivier Goffart	fa195eb1e8	Logger: Initialize all variables ... To avoid valgrind warnings in owncloudcmd	2013-12-11 13:23:42 +01:00
Klaas Freitag	b68e721f05	Do not error out on ETag if the status klass is != 2.	2013-12-11 12:59:11 +01:00
Klaas Freitag	bbfb2f2a60	Do not force resync if status is SyncResult::Problem.	2013-12-11 12:59:11 +01:00
Olivier Goffart	bf309f83f4	Don't keep the temporary file if the transfer fails because of a wrong etag ... The downloaded file is corrupted, remove it.	2013-12-11 12:48:11 +01:00
Daniel Molkentin	80d202c630	Fix build on Win32	2013-12-10 17:19:36 +01:00
Olivier Goffart	47308cdc01	define NE_LFS from cmake	2013-12-10 16:20:49 +01:00
Daniel Molkentin	03e9a06c7d	Fix build	2013-12-10 16:07:49 +01:00
Thomas Müller	370cf45357	fixing add button behavior in single folder mode	2013-12-10 15:59:59 +01:00
Thomas Müller	638b62a3ae	prevent crash on 'add folder'	2013-12-10 15:59:59 +01:00
Klaas Freitag	6707e93f31	Add NE_LFS define for correct size of ne_off_t	2013-12-10 15:28:02 +01:00
Olivier Goffart	0360babe02	usleep is not working on windows, use QThread::usleep ... Shoud fix #1082	2013-12-10 14:03:01 +01:00
Klaas Freitag	a743f804f5	Ignore another sqlite journal tmp name that shows up on win32.	2013-12-10 13:19:57 +01:00
Olivier Goffart	b6e4575dea	Do not initialize all the application if another instance is running ... This fixes a crash becasue we were constructing the systemtray and then destroying it too early before the systemtray could initilize itself. (This work around a bug in QSystemTray which crashes if it is destroyed before it is registered to the X11 server)	2013-12-10 12:48:59 +01:00
Daniel Molkentin	2cf7ba91c1	Don't install headers on OS X	2013-12-09 20:39:55 +01:00
hefee	f8478ac27b	Fixing typos	2013-12-09 20:17:56 +01:00
Olivier Goffart	bb2f221edf	Fix broken slot connection ... The slot was renamed.	2013-12-09 19:19:49 +01:00
Daniel Molkentin	1291ffaf02	Small adjustments to the last commit	2013-12-09 17:16:42 +01:00
Olivier Goffart	89d1e2d924	When reconfiguring, we need to clear the _currentSyncFolder ... Else, if we reconfigure when the folder is syncing, it may be impossible to sync again. This happens for example when changing the password when the folder is syncing	2013-12-09 17:16:04 +01:00
Klaas Freitag	857ef33056	Use proper email in license header.	2013-12-09 17:02:17 +01:00
Daniel Molkentin	f5e8efd435	Add build number into versioning scheme ... This is an enabler to improve update experience	2013-12-09 16:39:13 +01:00
Olivier Goffart	e5edb8e2c7	Fix opening the explorer with a selected file on windows. ... Should Fix #1249	2013-12-09 16:13:48 +01:00
Klaas Freitag	5f31d13236	Install headers for owncloudsync	2013-12-08 08:55:18 +01:00
Klaas Freitag	fc986b0ab8	If item is a directory, remove its contents from the database as well. ... Fixes bug #1257	2013-12-06 16:38:43 +01:00
Klaas Freitag	c5e435f9bd	Let recursive removal also remove the top dir.	2013-12-06 16:37:30 +01:00
Klaas Freitag	599451d250	Unchanged files still count as files.	2013-12-06 16:37:01 +01:00
Klaas Freitag	af78f1996c	Set action string as tooltip	2013-12-06 15:50:14 +01:00
Klaas Freitag	41d5445980	Display rename-target in sync protocol action column.	2013-12-06 15:07:25 +01:00
Klaas Freitag	e5afd8b901	Maintain the file type correctly.	2013-12-06 14:11:51 +01:00
Klaas Freitag	6fad20d5fc	Show local MOVE operations only for top level directory instead for all ... files. This fixes bug mirall#1240	2013-12-06 12:32:26 +01:00
Daniel Molkentin	dff17ec08e	A different user constitutes a different account ... Fixes #1231	2013-12-05 19:03:40 +01:00
Daniel Molkentin	df5a72eb38	Resize wizard if advanced options are required ... Fixes #1130	2013-12-05 17:43:57 +01:00
Olivier Goffart	fa9d9c9909	Maybe we need to destroy the decompress context before the request. ... Possibly fix the issue #1229	2013-12-05 16:51:39 +01:00
Daniel Molkentin	a0d1dc8807	Avoid horizontal scrollbar ... ...by intproducing more tooltips and set eliding to center elide You can still force a scrollbar, but it's not there by default and the center eliding makes pathes more meaningful Fixes #1213	2013-12-05 16:42:07 +01:00
Klaas Freitag	9e2f6c0258	Close the sync journal if a folder gets removed. ... This fixes bug #1252	2013-12-05 16:06:46 +01:00
Daniel Molkentin	ee2efbb071	Fix for c3dc84c58f. ... This resulted in the wizard not coming up the second time around because it wasn't destructed properly. Also fix a comment.	2013-12-05 16:00:32 +01:00
Daniel Molkentin	c3dc84c58f	Don't close setup wizard when the initial sync run is started ... Fixes regression over 1.4.2	2013-12-04 20:26:18 +01:00
Daniel Molkentin	72b0f4e573	Add man page for owncloudcmd ... Fixes #1234	2013-12-04 20:07:05 +01:00
Klaas Freitag	861de89e9c	Add translatable error messages for individual file errors. ... The error messages coming out of the csync updater and were string based before which could not be translated.	2013-12-04 12:19:38 +01:00
Klaas Freitag	a6dfc0a83e	Refactoring, pick proper method name.	2013-12-04 11:36:24 +01:00
Klaas Freitag	859f776440	Set proper enable state of blacklist button after the dialog was opened. ... Also set proper tooltips.	2013-12-04 11:32:46 +01:00
Klaas Freitag	4b7f75059a	Fixed check for SQL command successs.	2013-12-04 10:31:05 +01:00
Klaas Freitag	b3620e320b	Avoid a comparison warning on win32	2013-12-03 17:09:57 +01:00
Klaas Freitag	883576cb95	Fix Win32 move file operation.	2013-12-03 17:07:42 +01:00
Daniel Molkentin	62ec7aa9c5	Add file forgotten in last commit	2013-12-03 16:24:17 +01:00
Daniel Molkentin	99fc570267	Replace Q_OS_WIN32 by Q_OS_WIN ... Fixes #1238	2013-12-03 16:23:49 +01:00
Olivier Goffart	1f5c4bde14	Fix windows rename of temporary files	2013-12-03 16:10:44 +01:00
Klaas Freitag	046d180d2f	Rather count the blacklist items in the database. ... Use database functions to count the entries rather than trying to compute it from the progress items the widget got.	2013-12-03 14:48:49 +01:00
Klaas Freitag	278e76b774	Add blackListEntryCount method.	2013-12-03 14:48:49 +01:00
Olivier Goffart	09d850bfaa	When the temporary file is the same size as the file we would download, just keep it ... Don't download the file if the temporary file is complete. else, we get error from server: Requested Range not satisfiable	2013-12-03 14:44:04 +01:00
Klaas Freitag	f0a6047ecf	Add a button to acitivity view to clean the blacklist.	2013-12-03 14:04:01 +01:00
Klaas Freitag	e8ffb17b3b	Add a slot to wipe the folder's blacklist.	2013-12-03 14:04:01 +01:00
Klaas Freitag	09d4fa2127	Fixed wording, do not expose the term blacklist to users.	2013-12-03 14:04:01 +01:00
Daniel Molkentin	f521301c51	Add plugins in install_qt4_executable to ensure the lib paths get fixed up ... Fixes #1228	2013-12-03 13:33:50 +01:00
Olivier Goffart	de5161137f	remove unneeded file	2013-12-03 13:11:41 +01:00
Klaas Freitag	1abfd4ba44	Fixed wording, removed the term "problem".	2013-12-03 12:31:28 +01:00
Klaas Freitag	ecf45856e1	Add missing call to CloseHandle on the win32 platform. ... This fixes bug mirall#1236 and also mirall#1237 Also some minor cleanups.	2013-12-03 10:08:17 +01:00
Klaas Freitag	c03b2bbc87	Make unblacklisting depending on Up or Download ... Compare modtime in case of uploading and ETag in case of downloading as they are the correct indicators.	2013-11-29 16:16:04 +01:00
Klaas Freitag	2f708c0877	Move checkAccountExists out of gui class.	2013-11-29 16:16:04 +01:00
Olivier Goffart	58eb000163	Make the "details" manu entry work ... Fix #1214	2013-11-29 11:18:59 +01:00
Olivier Goffart	f5f56e45c0	Fix pausing one of the folder pauses all foder after it while restarting.	2013-11-29 10:57:34 +01:00
Klaas Freitag	951ac79a68	Destinguish between rename and move in wording.	2013-11-28 10:58:04 +01:00
Olivier Goffart	ef8fe11f5a	Do not write the directory etag in the database in case of soft error ... Else we won't retry next time as we think nothing has changed.	2013-11-28 10:01:30 +01:00
Olivier Goffart	30db533cea	Stop iterating files when aborting.	2013-11-28 10:01:30 +01:00
Olivier Goffart	99eeaa0db5	no need to set twice the error string ... done() is already taking care of that	2013-11-28 10:01:30 +01:00
Klaas Freitag	80a01ecff3	Use the activity icon in settings dialog.	2013-11-28 09:47:49 +01:00
Klaas Freitag	0d85810c23	Change tab name in settingsdialog to Activity rather than Status.	2013-11-28 09:44:09 +01:00
Klaas Freitag	23007613a9	Fix progress bar in new propagator.	2013-11-27 16:48:16 +01:00
Daniel Molkentin	0fc51704f5	Enable accessibility on OS X ... Fixes #736	2013-11-27 15:43:47 +01:00
Daniel Molkentin	46a403eb02	Report connection errors explicitly on explicit sign in attempts ... Implicit connection attempts fail silently. This is roughly what users expect from e.g. mail clients. Fixes #1205.	2013-11-27 14:15:56 +01:00
Daniel Molkentin	e719e80409	ConnectionValidator: Account::setState no longer takes a bool ... This makes the client come up with the correct state when the initial connect fails.	2013-11-27 14:12:30 +01:00
Daniel Molkentin	310278f580	Account: Swap connected and disconnected state ... Also, avoid full integer enumeration	2013-11-27 14:11:10 +01:00
Klaas Freitag	59072a81f1	Put detailed sync status widget into ButtonGroup for common style.	2013-11-26 14:27:32 +01:00
Klaas Freitag	d55bffb319	Removed not longer needed Info button. ... The detailed sync status is now in the same dialog in another tab.	2013-11-26 14:15:37 +01:00
Klaas Freitag	232cbc45b5	Simplify progress and error signals again. ... Now handle everything through the progress signal and let the errors be progressed in the done slot. Remove unused code, fix sorting of the list, more efficiency. This fixes #916	2013-11-26 14:02:11 +01:00
Klaas Freitag	a88d45bff4	Comment some unused code.	2013-11-26 14:02:11 +01:00
Klaas Freitag	090e474d70	Add a couple of missing progress signals.	2013-11-26 14:02:11 +01:00
Klaas Freitag	4f7546768b	Do not blacklist Softerrors.	2013-11-26 14:02:11 +01:00
Klaas Freitag	7a3c086be2	Display a proper error message for missing sync directory on server. ... this fixes bug mirall#1149	2013-11-26 14:02:11 +01:00
Olivier Goffart	5c8b6ed902	Fix Remove -gzip from etag ... Remove it from both "foo"-gzip and "foo-gzip" See issue #1195	2013-11-26 12:10:52 +01:00
pascalBokBok	489cc8aa29	Remove spammy "sync starting" notification on every program start.	2013-11-26 10:01:36 +01:00
Daniel Molkentin	0d85dcdd9e	Toggle Settings window when clicking on the icon ... This restores the old behavior for every DE but OS X and Ubuntu Unity (which respond to all clicks by opening the menu). Discussed in #896	2013-11-26 03:15:03 +01:00
Daniel Molkentin	7eddff39e7	Wizard: Allow /index.php or /remote.php/webdav in URLs. ... We will strip those. Also works on paste. Fixes #349	2013-11-26 02:32:04 +01:00
Daniel Molkentin	81e47b0896	Folder wizard: sanitize error detection ... * Wrap text properly * Format multiple warnings as bullet points * Use 'Folder' instead of 'Directory' everywhere * Fix false positives when checking if one directory contains another * Fix logic errors in target folder warning detection Fixes #1201	2013-11-26 02:03:00 +01:00
Daniel Molkentin	ef0c7348ad	Account Settings: Fix label	2013-11-26 00:04:50 +01:00
Daniel Molkentin	050bb55f1e	Wizard: Do not start from scratch if the initial folder is non-default ... Before, the folder was initialized to "ownCloud" in any case, which lead the wizard to conclude it had to sync everything anew, because the location moved -- even if the folder location was manually corrected. Fixes parts of #1172	2013-11-26 00:04:33 +01:00
Markus Goetz	fa715ce135	Propagator: Open download file as Unbuffered	2013-11-25 19:25:19 +01:00
Markus Goetz	911e0bdd6e	Propagator: Check write errors when downloading	2013-11-25 19:25:19 +01:00
Olivier Goffart	fa0f773fcb	Separate the case of file changing durng upload in the chunk or non chunk case. ... If the file is changed between chunk, it is easy and we can just retry as the file has not been changed on the server. But if the file is changed after it has been updated on the server, we must still update the database with the etag. (and possibly delete the partial file) Relates to issue #1002	2013-11-25 19:16:54 +01:00
Markus Goetz	ac8296fb94	Propagator: Check E-Tag when resuming ... Should fix #756	2013-11-25 19:01:04 +01:00
Daniel Molkentin	f47ce2fea6	Account Settings: Set initial button state correctly ... Fixes #1185	2013-11-25 17:56:09 +01:00
Klaas Freitag	33ff6b3934	Even if problems occured show the Ok-Icon in the setup dialog. ... Fixes bug #942.	2013-11-25 17:49:59 +01:00
Olivier Goffart	ca3d8ab193	Add one case of missing -gzip removal	2013-11-25 17:48:57 +01:00
Daniel Molkentin	d85009a2e9	Account Settings: fix connect error ... Fixes #1198	2013-11-25 17:34:40 +01:00
Markus Goetz	72d2ac09e3	Propagator: Don't ignore error if no HTTP error code	2013-11-25 16:37:48 +01:00
Olivier Goffart	6b7da798b8	Remove -gzip from Etag ... Fix #1195	2013-11-25 16:30:13 +01:00
Klaas Freitag	2e4043b498	Show proper error message and icon according to error class.	2013-11-25 16:18:07 +01:00
Klaas Freitag	dc29046d61	Add new progressProblem signal and slots. ... Now the sync problems are handled differently than the sync progress to ease error message handling and stuff.	2013-11-25 16:18:07 +01:00
Klaas Freitag	0c6dca25c4	Register meta type for SyncProblem	2013-11-25 16:18:07 +01:00
Klaas Freitag	1a3f246c46	Add new Error Types to progress: Soft, Normal, Fatal.	2013-11-25 16:18:07 +01:00
Daniel Molkentin	ad6c42b031	Wizard: let us handle/ignore credential failures	2013-11-25 15:50:19 +01:00
Daniel Molkentin	9ddedf81ac	Cleanup: "Use QMutexLocker"	2013-11-25 15:34:17 +01:00
Daniel Molkentin	685c13dead	Distiguish "Signed out" from "Disconnected"	2013-11-25 15:34:17 +01:00
Daniel Molkentin	2a17a2a102	Remove credential-exposing debug output	2013-11-25 15:34:16 +01:00
Daniel Molkentin	4e22fff427	Introduce online/offline state, accessible via GUI	2013-11-25 15:34:16 +01:00
Daniel Molkentin	6165c38289	Fix indentation	2013-11-25 15:34:16 +01:00
Daniel Molkentin	f554cca3d6	Fix initial state of quota info class.	2013-11-25 15:34:16 +01:00
Daniel Molkentin	67132326d2	Prefix tooltips with app name	2013-11-25 15:34:16 +01:00
Daniel Molkentin	ea2b5fb29c	Query credentials when needed. Put the account offline if user aborts. ... This is only implemented for HTTP auth. Shibboleth still does its own thing.	2013-11-25 15:34:16 +01:00
Daniel Molkentin	0a2861a731	Disable quota polling when default account does not exist or is offline	2013-11-25 15:34:16 +01:00
Olivier Goffart	6f17131e3c	Fix mutex usage in the journal ... All public function must lock the mutex. And therefore none of the journal function may call public function because the mutex is already locked. So have a public commit that lock the mutex, and a private commitInternal that assume the mutex is locked	2013-11-25 15:11:37 +01:00
Olivier Goffart	ca3885de2a	Fix some SQL error and warning ... Such as: Error opening the db: "Driver not loaded Driver not loaded" or QSqlDatabasePrivate::removeDatabase: connection '...' is still in use, all queries will cease to wor We need to clear the QSqlDatabase _db handle before calling removeDatabase. And we also need to give a different name to different folder database, just to be sure	2013-11-25 15:07:58 +01:00
Daniel Molkentin	37d6f6eeab	Build on OS X	2013-11-25 10:54:18 +01:00
Klaas Freitag	fd1552f7a0	Handle SoftError and show blacklisted files.	2013-11-24 22:27:11 +01:00
Klaas Freitag	055a8d7e74	Do not display error messages if user aborts the sync run.	2013-11-24 22:26:50 +01:00
Klaas Freitag	1964e60eb0	Do not show an error message if user aborted. Also CSYNC_STATUS fixes.	2013-11-24 22:21:29 +01:00
Klaas Freitag	11acfde55a	Refresh the Protocol widget when the dialog is raised.	2013-11-24 22:20:43 +01:00
Klaas Freitag	ecb2444923	Handle changing source file in upload correctly. ... Delete the file on the server if the source file is new, but the source did not arrive completely within a timespan.	2013-11-22 19:45:26 +01:00
Klaas Freitag	65bd4be16e	Make sure all queries are initialized on our database object. ... Since we use a database with the non default name, we need to do that, otherwise the query is initialized on the default db which is not open in our case.	2013-11-22 15:37:35 +01:00
Klaas Freitag	8d2950f66c	Enable the overall file count in progress again.	2013-11-21 11:37:47 +01:00
Klaas Freitag	55e82ee4c1	Made transaction management a bit more transparent. Some fixes.	2013-11-21 11:13:58 +01:00
Klaas Freitag	aa17be40cc	Some database code cleanups.	2013-11-20 18:19:14 +01:00
Klaas Freitag	97c661c909	Cleanups	2013-11-20 14:59:58 +01:00
Klaas Freitag	2767e7084a	Minor cleanups.	2013-11-20 14:27:44 +01:00
Klaas Freitag	5900b1ad25	Add blacklisting for files with error conditions.	2013-11-20 14:27:44 +01:00
Klaas Freitag	20b9ae757d	Add a http status code varialbe to the sync item object.	2013-11-20 14:27:44 +01:00
Klaas Freitag	aff2dd9f44	The IGNORE statement is handled further down the code.	2013-11-20 14:27:44 +01:00
Klaas Freitag	e30c484a7a	Ignore the SIGPIPE signal as that disturbs debugging with Qt Creator. ... It is questionable why this happens and if this patch really helps, or if it might have side effects. Input appreciated :)	2013-11-20 14:27:44 +01:00
Klaas Freitag	0f6dd8748f	Fixed some header wording.	2013-11-20 14:27:44 +01:00
Klaas Freitag	a342f63fdf	Changed wording: Replaced Protocol against Status.	2013-11-20 14:27:44 +01:00
Daniel Molkentin	5c4d240c66	Build on mac with Qt 5 ... I still had this patch on disk.	2013-11-19 14:41:40 +01:00
Markus Goetz	e551e92e13	Downloads: Ignore file if no ETag was sent ... Fixes part of #970	2013-11-19 12:44:25 +01:00
Markus Goetz	b98d97a96d	SyncJournalDb: Fix warnings ... I got those warnings for the latter sync runs: 11-19 10:58:15:997 QSqlDatabasePrivate::removeDatabase: connection 'qt_sql_default_connection' is still in use, all queries will cease to work. 11-19 10:58:15:997 QSqlDatabasePrivate::addDatabase: duplicate connection name 'qt_sql_default_connection', old connection removed.	2013-11-19 11:28:08 +01:00
Klaas Freitag	f30ac49264	Cached more queries, used safe QSqlQuery pattern	2013-11-18 13:02:09 +01:00
Klaas Freitag	49ba252fff	Database initialize code cleanup. ... If the QSqlQuery class is called with a query in the constructor, the query is executed immediately. In fact, we executed each query twice before. Later on we might want to implement a wrapper clas around the query.	2013-11-18 10:02:33 +01:00
Klaas Freitag	69269f8f75	Use transactions to speed up database access.	2013-11-18 10:02:32 +01:00
Klaas Freitag	e73730cb94	Close database after retrieval of file record count. ... As the csync updater opens the database itself, it is cleaner to close the db before and open it again after csync has finished. Added a close method to the journal class.	2013-11-18 10:02:32 +01:00
Klaas Freitag	098e04c13f	Set PRAGMA synchronous to NORMAL	2013-11-18 10:02:32 +01:00
Klaas Freitag	b0f6628584	Moved implementation of start() to cpp file.	2013-11-18 10:02:32 +01:00
Klaas Freitag	42f6867329	Add some useful logging.	2013-11-18 10:02:32 +01:00
Daniel Molkentin	0a9a3d8f04	Cleanup in folderman	2013-11-18 09:37:09 +01:00
Daniel Molkentin	ec850e83b9	Folders need to be setup before initializing the GUI ... This fixes the incomplete context menu	2013-11-18 09:37:09 +01:00
Markus Goetz	08665d6ac2	Settings: Don't specify encoding ... QSettings automatically does escaping. When UTF-8 was set, I got all kind of problems with the QByteArray for the geometry and the umlaut in my name for the proxy user.	2013-11-18 09:30:42 +01:00
Markus Goetz	4194a078d5	Revert "set utf8 for the central settings file" ... This reverts commit 6758c89130.	2013-11-15 15:45:21 +01:00
Daniel Molkentin	6758c89130	set utf8 for the central settings file	2013-11-15 14:43:48 +01:00
Olivier Goffart	c15a1eedd1	Only update the db for ETAG if the etag has changed for directories	2013-11-15 13:53:18 +01:00
Klaas Freitag	bf6e1f10ce	Prepare the queries after the database was migrated.	2013-11-15 11:21:27 +01:00
Klaas Freitag	c22f8a47f1	Initialise values properly, avoid warning.	2013-11-15 10:32:13 +01:00
Klaas Freitag	858facb5e0	Use precompiled database statements.	2013-11-15 10:32:13 +01:00
Olivier Goffart	b3972a5ba8	Do not fetch the file id in the propagator with a HEAD ... Normally, the fileid comes with the PUT or the GET. If it did not comes with the PUT, it means the server do not support fileid, we should not query it with a useless HEAD. Also, in case the fileid changes (which it should not) update anyway to the new fileid in the db	2013-11-15 10:18:19 +01:00
Daniel Molkentin	36e8273da0	fix mac builds	2013-11-14 20:53:56 +01:00
Daniel Molkentin	7ba8983f0a	Change all Network Jobs to use start()	2013-11-14 19:20:19 +01:00
Markus Goetz	088aa6ebdd	Wizard: Default button to Next	2013-11-14 19:13:59 +01:00
Markus Goetz	767ec4ed59	Wizard: Support redirects again	2013-11-14 17:54:38 +01:00
Markus Goetz	b12b8c981d	Wizard: Also reset timeout on forwards	2013-11-14 17:23:56 +01:00
Markus Goetz	b499a62593	Wizard: Timeout handling for CheckServerJob	2013-11-14 17:23:56 +01:00
Markus Goetz	fa0a2764a4	Fix changing URL in wizard	2013-11-14 17:23:56 +01:00
Markus Goetz	a537a98f03	Tray menu: Populate at start	2013-11-14 17:23:56 +01:00
Olivier Goffart	e8e27b61f6	Revert the changes that fetch the file id in the propagator. ... We don't want to fetch the file id in the propagator. Revert "Put item member variable to base class." This reverts commit f7aa2aa348. Revert "Add isValidFileId and getFileIdPropget methods." This reverts commit ccd254abba.	2013-11-14 14:59:03 +01:00
Daniel Molkentin	578431c791	Fix building owncloudcmd in case of theming	2013-11-14 14:20:09 +01:00
Klaas Freitag	f7aa2aa348	Put item member variable to base class.	2013-11-14 11:37:32 +01:00
Klaas Freitag	ccd254abba	Add isValidFileId and getFileIdPropget methods.	2013-11-14 11:37:08 +01:00
Daniel Molkentin	8f61cc4041	Hint the OS to not show [?] in Wizards and Dialogs ... Fixes #1156	2013-11-13 20:12:56 +01:00
Daniel Molkentin	21c9fc2d35	Cleanup	2013-11-13 19:11:46 +01:00
Daniel Molkentin	171572e400	Remember paused state throughout application restarts ... Fixes #823	2013-11-13 18:58:35 +01:00
Olivier Goffart	52e01b39d6	Adapt to csync 'md5'->'etag' change	2013-11-13 14:28:41 +01:00
Daniel Molkentin	af1dcfd179	Compile fix	2013-11-13 14:24:02 +01:00
Daniel Molkentin	233a6908dd	Partial revert "Compile with Qt5" ... This reverts commit 878ae56a71.	2013-11-13 14:19:01 +01:00
Daniel Molkentin	ae83c12f05	Fix compiler warning	2013-11-13 14:19:01 +01:00
Daniel Molkentin	878ae56a71	Compile with Qt5	2013-11-13 14:00:12 +01:00
Daniel Molkentin	2ff4ebc72f	Make user() available throught AbsctractCredentials	2013-11-13 13:59:35 +01:00
Daniel Molkentin	ca79d3b437	Merge remote-tracking branch 'origin/master' into account_refactoring	2013-11-13 13:55:58 +01:00
Klaas Freitag	14081a197b	Call ne_sock_init and ne_sock_exit to initialize neons SSL stack. ... See https://github.com/owncloud/mirall/issues/1115 for more details on why that is done here now.	2013-11-11 17:47:24 +01:00
Daniel Molkentin	9fe2549938	Add user info if the auth backends provides it	2013-11-11 16:57:15 +01:00
Klaas Freitag	e0a50d4bb9	PostSyncCleanup added: Remove superfluous entries from database after ... sync.	2013-11-11 16:45:40 +01:00
Daniel Molkentin	ad1c1f4130	Remove legacy code	2013-11-11 15:36:49 +01:00
Daniel Molkentin	22ed29a30b	Remove obsolete credentialstore class	2013-11-11 15:24:07 +01:00
Daniel Molkentin	64b59f8679	Don't use integration directory	2013-11-11 15:22:51 +01:00
Daniel Molkentin	406ed5a0c0	Make new folder wizard work again	2013-11-11 15:20:07 +01:00
Daniel Molkentin	d5081f4328	Fix logic	2013-11-11 14:02:54 +01:00
Daniel Molkentin	95d7afb0d0	cleanups	2013-11-11 10:57:33 +01:00
Klaas Freitag	2b2987d962	Make sure to rebuild the recent changes menu.	2013-11-11 10:06:14 +01:00
Klaas Freitag	2eb77445be	Add rename actions to progress dispatching. ... With that fix rename operations are shown as such in the progress window and in bubble help etc.	2013-11-08 16:21:59 +01:00
Daniel Molkentin	12b1b38351	Fix connect	2013-11-08 14:02:13 +01:00
Daniel Molkentin	b0abb6362a	Don't set the content header length ... This breaks POSTS and is not needed in QNAM, since QNAM does this itself internally.	2013-11-08 14:01:56 +01:00
Klaas Freitag	a458ffd472	Add missing return in error case.	2013-11-08 12:56:54 +01:00
Daniel Molkentin	60b6f520e7	Make Shibboleth browser aware of Accounts ... Needed for SSL error handling. It's also more consistent.	2013-11-07 18:47:38 +01:00
Daniel Molkentin	8d0d5b4077	Make redirects work	2013-11-07 18:46:57 +01:00
Daniel Molkentin	5c9a6afb82	Fix crash when opening settings without a valid account	2013-11-07 18:46:28 +01:00
Klaas Freitag	162acc1cc2	Fix conflict file handling, create a proper conflict file name. ... Before this fix, the conflict file name was set in the file name variable which lead to the problem that the subsequent rename of the temp file to the final final filename was moving the temp file on the conflict file. No final file was there.	2013-11-07 16:53:22 +01:00
Daniel Molkentin	64ef43d918	Fix the key used for storing the password	2013-11-07 15:59:58 +01:00
Daniel Molkentin	33c3d2a7d0	Wizard: Initialize account credentials. ... Required to be able to readily retrieve the user name later on	2013-11-07 15:24:49 +01:00
Daniel Molkentin	1238ab4f69	fix broken connect() statement	2013-11-07 12:50:55 +01:00
Daniel Molkentin	a42ff5a07c	Show floating point prec. in account settings, too	2013-11-07 12:50:39 +01:00
Daniel Molkentin	aa4b6bd4ea	Readd "online" notion as a state in account. ... This gets updated by the ConnectionValidator. Not sure if that's the best choice, but it mimmicks the old behavior the closest.	2013-11-07 12:22:17 +01:00
Daniel Molkentin	478ba9c5ef	Fix approved SSL certificates being forgotten	2013-11-07 12:04:45 +01:00
Daniel Molkentin	bd46ad56fc	Add new quotainfo class	2013-11-07 10:14:38 +01:00
Daniel Molkentin	bde5e86c50	Reformatting fixes	2013-11-07 10:14:25 +01:00
Daniel Molkentin	ec0f01fd7c	Ensure an SSL Error Handler is always available	2013-11-07 10:14:12 +01:00
Klaas Freitag	fe4c1cc35a	Remove straycat code from mirall.	2013-11-06 14:20:44 +01:00
Daniel Molkentin	800abbf8b7	Make http credentials work	2013-11-05 18:16:00 +01:00
Daniel Molkentin	3af622d535	Make quota display work	2013-11-05 18:15:47 +01:00
Klaas Freitag	ee4cbf52dc	Remove straycats collected in the reconcile phase from journal.	2013-11-05 17:53:01 +01:00
Klaas Freitag	5cd2be058d	Fix local rename.	2013-11-05 17:50:09 +01:00
Klaas Freitag	3a21edca2b	Keep originalFile member as QString rather than C string. ... This avoids encoding problems with interesting file names.	2013-11-05 17:48:51 +01:00
Klaas Freitag	c6a926842a	Fix recursivley flag misinterpretation.	2013-11-05 17:47:51 +01:00
Daniel Molkentin	440b5164ad	Build fix	2013-11-04 16:41:59 +01:00
Daniel Molkentin	cc5f17a7d2	Merge remote-tracking branch 'origin/master' into account_refactoring ... Conflicts: src/mirall/accountsettings.cpp src/mirall/folder.cpp	2013-11-04 16:38:55 +01:00
Daniel Molkentin	85d5b82811	- Make saving/restoring accounts work. ... - Prepare for fetching quota	2013-11-04 16:36:23 +01:00
Olivier Goffart	f0a1ac4346	Fix syncing folder with nothing in it ... Do the start after connecting, as the finish may be imediate if there is nothing to do.	2013-10-31 12:11:56 +01:00
Olivier Goffart	bdc39f9cc2	Allow folder that are prefix of another	2013-10-31 11:41:56 +01:00
Olivier Goffart	d3ae2f42a7	Reset the proxy module property at every sync ... This is required for the fix for #713 Since the module properties are shared in global variables shared by every folders, removing another folder may clean the proxy settings. So we need to restore them at every sync	2013-10-31 11:39:43 +01:00
Olivier Goffart	df39ab0b2f	Don't leak the system tray	2013-10-31 10:52:19 +01:00
Olivier Goffart	28833ee5ac	Fix crash when removing folder while syncing. ... We need to set _thread to 0 after destoying it	2013-10-31 10:51:45 +01:00
Klaas Freitag	c66a1d1895	Removed unused code from LocalRename	2013-10-30 18:14:33 +01:00
Klaas Freitag	cdee0dc1cf	Added a PropagateLocalRename job to do local renames.	2013-10-30 17:37:34 +01:00
Klaas Freitag	a43c5fcfe8	Fix header name according to changes on server master.	2013-10-30 17:37:34 +01:00
Olivier Goffart	5c67f39476	Ignore error 404 on DELETE ... This may happen if we have stale entries in the database	2013-10-30 17:33:06 +01:00
Olivier Goffart	fb47657b1f	Make F6 in the account config sync the selected folder, for debugging purposes ... Issue #409	2013-10-30 16:58:08 +01:00
Olivier Goffart	76d46af4b7	Revert "Implement a sync now button" ... Actually, after discussion with the team, we decided this button is a bad idea This reverts commit b56fcd8ebd.	2013-10-30 16:48:28 +01:00
Daniel Molkentin	86af2848dd	Merge remote-tracking branch 'origin/master' into account_refactoring ... Conflicts: src/mirall/accountsettings.cpp	2013-10-30 16:37:49 +01:00
Daniel Molkentin	4ca310b63b	Remove ownCloudInfo for good	2013-10-30 16:33:15 +01:00
Daniel Molkentin	59bc1d8966	Credential Store is no longer static ... It now belongs to HttpCredentials	2013-10-30 16:32:34 +01:00
Daniel Molkentin	14c2ff44f3	More porting to Account class ... - Finish port of owncloud setup wizard to Account - Deprive MirallConfigFile of the customHandle	2013-10-30 16:31:47 +01:00
Olivier Goffart	b56fcd8ebd	Implement a sync now button ... The button is in the account config, next to the "pause/resume" button Fixes #409	2013-10-30 16:27:00 +01:00
Olivier Goffart	e38d6d974b	Replace _Button* with _button ... Identifiers starting with underscore and uppercase are reserved in C++.	2013-10-30 15:52:30 +01:00
Olivier Goffart	9500c5ffab	Do not change the instruction anymore when we finish an item ... The status is in the status. Keep the original instruction so the UI knows what to display for eath item	2013-10-30 10:46:05 +01:00
Olivier Goffart	b079cedbf5	Use the status instead of the instruction for finished items	2013-10-30 10:44:41 +01:00
Olivier Goffart	6e088e28f5	Adjust the mtime in case of fake conflicts ... "Fake conflicts" happen when the etag changes on the server, and the mtime changes on the client, but the actual file is still exactly the same. We correctly detect them as false conflict and we do not generate the conflict file for them. But we should also update the local mtime to the server mtime so future sync don't get confused.	2013-10-29 12:23:51 +01:00
Olivier Goffart	01e2743bae	Always download the conflicted files. ... Conflicts have a direction==NONE. And they need to be downloaded, not uploaded	2013-10-29 12:13:30 +01:00
Olivier Goffart	75ffa787a6	emit the EndDownload progress at the right place. ... It was put in rename instead of download	2013-10-29 12:13:30 +01:00
Olivier Goffart	4ad9f34807	Save the UPDATED files in the database ... Those are files that were detected as "resolved conflict". They should have been a conflict because they both were new, or both had their local mtime or remote etag modified, but the size and mtime is the same on the server. This typically happen when the database is removed. Nothing will be done for those file, but we still need to update the database.	2013-10-29 12:13:30 +01:00
Daniel Molkentin	a91799a11c	Make the setup wizard compile again ... - introduces more jobs - needs more cleaning up	2013-10-28 20:01:59 +01:00
Olivier Goffart	adc47948a5	Add a comment explaining OwncloudPropagator::start	2013-10-28 17:00:27 +01:00
Olivier Goffart	6e886e28e9	Merge branch 'propagator-job' ... Conflicts: src/mirall/owncloudpropagator.cpp	2013-10-28 16:26:25 +01:00
Klaas Freitag	e63fc184a5	Options parsing added.	2013-10-28 16:07:13 +01:00
Olivier Goffart	84a40dcb59	Refactor the new propagator in jobs ... This makes the code (IMHO) more easy to understand, and will allow even more easy parallelism	2013-10-28 15:58:35 +01:00
Olivier Goffart	8e90782107	Make owncloudcmd display the debug output	2013-10-28 15:45:37 +01:00
Klaas Freitag	68ba99b7f0	Fixed fileID parsing and improved logging.	2013-10-28 15:28:34 +01:00
Klaas Freitag	2fefc428a8	Write file Id to journal table. ... Since this requires a change of existing sync journals, database migration code was added.	2013-10-25 13:31:00 +02:00
Klaas Freitag	17220f2604	Query file Id from server if unknown.	2013-10-25 13:31:00 +02:00
Klaas Freitag	7a68961b25	Add handling for the file_id data to the sync items.	2013-10-25 13:31:00 +02:00
Daniel Molkentin	aa2baa45fb	Cleanups, ownership for ssl error handler	2013-10-24 12:55:26 +02:00
Daniel Molkentin	eda5feb82c	Bring back proper ssl handling	2013-10-24 00:29:08 +02:00
Daniel Molkentin	d2b445c80c	Basic port, misses wizard	2013-10-23 14:48:53 +02:00
hefee	38679f79b5	Need inotify on FreeBSD for libsync	2013-10-23 01:24:27 +02:00
hefee	a927caf2b0	Fixing Utility::platform for all platforms	2013-10-23 00:59:29 +02:00
Daniel Molkentin	29c846a764	WIP: Dissolve owncloudinfo class	2013-10-21 21:42:52 +02:00
Daniel Molkentin	a91ba0fd48	WIP: Move network tasks from ownCloudInfo into Job classes.	2013-10-18 12:24:29 +02:00
Daniel Molkentin	a25d55a265	Add QtJson to 3rdparty, use it in ownCloudInfo	2013-10-18 02:00:19 +02:00
Olivier Goffart	0efbfb10aa	Fix MOVE of directory. ... Remove the right entry from the database (i.e: the original file name) Fetch the etags of the sub entries	2013-10-17 13:06:39 +02:00
Olivier Goffart	cb8006b89f	Fix comments of the propagation step. ... Also, don't mark item as removed if the instruction is not REMOVE	2013-10-17 12:09:44 +02:00
Klaas Freitag	660469cbf5	Do not propagate a move of the Shared folder.	2013-10-17 10:48:31 +02:00
Daniel Molkentin	a06e551469	Merge pull request #1103 from Absolight/freebsd-port ... Patches for FreeBSD	2013-10-16 08:52:46 -07:00
Olivier Goffart	746b86a1dd	Save the progress db once a chunk has been upload ... Allow to resume when we cancel the sync	2013-10-16 16:47:24 +02:00
Mathieu Arnold	1c594b6a8d	FreeBSD doesn't have statvfs64, like MacOS X.	2013-10-16 15:57:59 +02:00
Olivier Goffart	313832de8d	Put the progress database within the journal	2013-10-16 12:01:14 +02:00
Olivier Goffart	2c63f7a24d	Merge branch '1.4' ... Conflicts: VERSION.cmake src/mirall/application.cpp src/mirall/application.h src/mirall/csyncthread.cpp src/mirall/folder.cpp src/mirall/folder.h src/mirall/folderman.cpp	2013-10-15 17:00:53 +02:00
Olivier Goffart	10fba886dc	Do not elide the progress text ... It's size is computed so the text fit, there is no need to alide it. Fixes #1094	2013-10-15 14:58:34 +02:00
Klaas Freitag	d0d362664b	Handle proxy on folder level, not folderman level.	2013-10-14 16:11:52 +02:00
Klaas Freitag	f841450dae	Do append non empty lines not starting with a hash to ignores.	2013-10-14 16:11:52 +02:00
Klaas Freitag	a3927c5c2c	Avoid quick flickering up of the ok-icon for the sync prepare state. ... For the SyncPrepare phase now the icon that was displayed before is kept. If the folder was disabled before, the sync icon is displayed.	2013-10-14 12:59:08 +02:00
Klaas Freitag	89cfa387cd	Remove bogus html formatting tag.	2013-10-14 11:46:02 +02:00
Olivier Goffart	1fccb23442	Don't show desktop notification when the user don't want to ... Fix #1093	2013-10-14 11:33:47 +02:00
Klaas Freitag	bfd50ffcd0	Do not show progress if nothing is transmitted, show number of deletes.	2013-10-14 11:16:17 +02:00
Klaas Freitag	4f2a171913	Avoid quick flickering up of the ok-icon for the sync prepare state. ... For the SyncPrepare phase now the icon that was displayed before is kept. If the folder was disabled before, the sync icon is displayed.	2013-10-11 17:54:26 +02:00
Daniel Molkentin	005d70a73c	Proxy support: Reset useSystemConfiguration() in all cases but DefaultProxy ... Fixes #1016	2013-10-11 14:25:35 +02:00
Klaas Freitag	592291cbcb	Fix initialized after warning.	2013-10-11 12:10:47 +02:00
Klaas Freitag	7236bd7dd4	Make problem warnings not appearing in the tray. ... This fixes bug #944: Do not show the warning icon in the tray.	2013-10-11 12:09:27 +02:00
Klaas Freitag	c02d5f41a5	Remove bogus html formatting tag.	2013-10-11 12:09:27 +02:00
Daniel Molkentin	5a7cd815ab	Reconnect if network is unavailable after startup ... Fixes: #1080	2013-10-11 11:43:23 +02:00
Daniel Molkentin	c2c01bccfc	Fix literal occurances of "ownCloud" in GUI	2013-10-10 11:35:22 +02:00
Daniel Molkentin	2240039442	Fix literal occurances of "ownCloud" in GUI	2013-10-10 11:34:45 +02:00
Klaas Freitag	fb4728c7ee	Handle sync enable flag correctly in folder scheduling. ... This fixes bug #1083. Conflicts: src/mirall/folder.cpp	2013-10-10 11:32:56 +02:00
Klaas Freitag	f34621578e	Use qint64 rather than int64_t.	2013-10-09 14:33:24 +02:00
Klaas Freitag	5e50b1f1fd	Add some progress meassuring logging.	2013-10-09 14:33:09 +02:00
Klaas Freitag	3c95d342ee	Handle sync enable flag correctly in folder scheduling. ... This fixes bug #1083.	2013-10-09 14:27:28 +02:00
Klaas Freitag	53ac5427a8	Integrate progress dialog into settings dialog.	2013-10-09 14:27:28 +02:00
Klaas Freitag	1ed8afba09	Minor changes.	2013-10-09 14:27:28 +02:00
Klaas Freitag	ef81a8a2ad	Use qint64 rather than int64_t.	2013-10-08 15:41:15 +02:00
Klaas Freitag	fa9d1614e7	Add some progress meassuring logging.	2013-10-08 14:07:46 +02:00
Olivier Goffart	05fbfb520f	Protect the sync database by a mutex since it is used by the thread	2013-10-04 21:05:46 +02:00
Daniel Molkentin	805e1330ad	Compile with MinGW	2013-10-04 20:29:42 +02:00
Olivier Goffart	7c6fcf688c	Fix the fact that some success was reported as error	2013-10-04 15:55:59 +02:00
Olivier Goffart	127055dd70	Refactor a bit the error reporting from the propagator ... Add different classes of error failures. Fatal error means the sync should be stopped. SoftErrors are not to be displayed to the user. We still need to make a classification of the errors.	2013-10-04 15:55:59 +02:00
Markus Goetz	f4929e849e	CsyncThread: Activate recursive PROPFIND	2013-10-04 15:42:40 +02:00
Mackie Messer	ba9ac03b0b	Put plugins in PlugIns, not Plugins on Mac ... Requires 770539f0a5 on csync	2013-10-04 13:01:46 +02:00
Mackie Messer	0257f7e169	Add sqlite plugin for OS X	2013-10-04 13:01:46 +02:00
Olivier Goffart	8ed2588cdf	Fix build with Qt5	2013-10-03 23:14:10 +02:00
Olivier Goffart	d8d2d36638	Fix SQL Query	2013-10-03 23:00:47 +02:00
Olivier Goffart	baa9ba089c	Save the database after each operation.	2013-10-03 22:41:12 +02:00
Olivier Goffart	3495b822a5	TMP	2013-10-03 20:01:07 +02:00
Daniel Molkentin	be88d425fc	Fix connecting to the mysql db	2013-10-03 19:52:09 +02:00
Klaas Freitag	94a06cec5b	WIP on the journal database.	2013-10-03 18:52:02 +02:00
Klaas Freitag	4008f6b309	Fix file status enum names.	2013-10-03 17:55:32 +02:00
Klaas Freitag	daac6886a0	Added method setFileRecord to update sync journal	2013-10-03 17:48:14 +02:00
Daniel Molkentin	e304dfd5b9	Add socketapi ... Slightly amended by: Daniel Molkentin <danimo@owncloud.com>	2013-10-03 17:05:01 +02:00
Klaas Freitag	2e3aabf99b	Read header without prefix path now that it's in 3rdparty.	2013-10-03 16:47:48 +02:00
Klaas Freitag	59bf8740a0	Add c_jhash.h header from csync to 3rdparty.	2013-10-03 16:41:23 +02:00
Olivier Goffart	21cd57228e	Fix build with Qt5 ... Missing SQL module	2013-10-03 16:29:47 +02:00
Klaas Freitag	4501c64e61	Do not include whole header of csync_exclude.	2013-10-03 16:22:31 +02:00
Klaas Freitag	273105e78b	Handle new case SyncAbortRequested.	2013-10-03 16:21:54 +02:00
Klaas Freitag	2707116350	Minor fixes for file_status	2013-10-03 16:12:50 +02:00
Klaas Freitag	c7d30bae98	Handle new sync result enum.	2013-10-03 15:32:44 +02:00
Klaas Freitag	be328581a7	Implemented sync status function for overlay icons.	2013-10-03 15:29:10 +02:00
Klaas Freitag	c32bc27b3e	Add sync journal database class that opens the csync db to read from it.	2013-10-03 15:29:10 +02:00
Klaas Freitag	0fef88a9b9	Some comments added.	2013-10-03 15:29:10 +02:00
Klaas Freitag	3e0fc56495	Dont show the [i] icon in the tray, see bug #942	2013-10-03 15:29:10 +02:00
Olivier Goffart	396ec4f888	Fix race condition in the logger. ... Logs can come from multiple thread, we need to keep the _logstream protected by a mutex	2013-10-03 14:37:13 +02:00
Olivier Goffart	79ea7c3eed	Abort the sync asynchroniously ... Don't block the GUI when clicking on pause Mirall issue #968	2013-10-03 14:36:32 +02:00
Olivier Goffart	b18810f381	Implement abort with the new propagator ... abort was implemented in csync after the new propagator was written, so it was not working with the new propagator	2013-10-03 14:35:56 +02:00
Daniel Molkentin	339ed20abc	Utility::showInFileManager(): Substitute valid desktop file parameters	2013-10-03 12:05:00 +02:00
Klaas Freitag	44ed577992	List results for all folders, not only one.	2013-10-03 11:36:18 +02:00
Klaas Freitag	f6685accc3	Use subdirs for more xdg dirs to go through	2013-10-02 19:23:06 +02:00
Klaas Freitag	2c2e79c13d	Consider the folder of items to delete from info window.	2013-10-02 19:23:06 +02:00
Daniel Molkentin	81961068a2	Utility: Move OS specific implementations into separate files	2013-10-02 19:15:56 +02:00
Daniel Molkentin	4e91a6450c	Change the recent changes menu and file item dialog behavior ... Recent Changes: - "No items synced recently" - Add separator to the details section - Make items clickable (will open file location in file manager) - If a file was deleted, disable it File Item Dialog: - Make items clickable (will open file location in file manager) This is implemented via a new method Utility::showInFileManager(QString), which goes through great lengths to use use the right file manager on all OSes/WMs/DEs, and make sure it selects the file in question if possible. This needs good testing, though. Fixes #1044	2013-10-02 18:17:48 +02:00
Daniel Molkentin	3dc2547bb5	WIP	2013-10-02 18:16:32 +02:00