3809 Commits

Author	SHA1	Message	Date
Olivier Goffart	bd6769a3fd	LsColJob: one must now specify the properties ... So the discovery phase don't ask for the quota, and the selective sync don't ask for all the other properties Issue #2906	2015-03-02 11:03:25 +01:00
Markus Goetz	80f3c7584b	libowncloudsync: Don't link to Qt SQL and Qt XML ... For issue #2901 ..	2015-02-27 16:20:25 +01:00
Klaas Freitag	05624e3fc8	FileSystem: Remove QFileInfo based implementations. ... QFileInfo has to be refreshed if the underlying file has been modified in between. That is dangerous so ckamm and me decided to eliminate the QFileInfo based implementations. This was triggered by a bug that the client uploaded files that it should not have.	2015-02-27 15:27:49 +01:00
Christian Kamm	e381143a8f	Ensure good sync state if in-progress folder is deleted. #2896 ... The slotFolderSyncFinished() didn't reliably trigger because the folder was being deleted before the syncFinished signal could fire.	2015-02-27 12:39:19 +01:00
Christian Kamm	b03209ccef	Inform user about ignored long files. #2882	2015-02-27 12:12:39 +01:00
Markus Goetz	ec03ebd69f	Token Auth: Allow empty token ... Just username/password. The received token will automatically be stored inside the QNetworkCookieJar.	2015-02-27 11:58:18 +01:00
Roeland Jago Douma	51c617801d	static member QFileInfo::exists is not available on 4.8	2015-02-27 08:43:33 +01:00
Klaas Freitag	8507aba9f8	SocketAPI: Append trailing slash for directories in UPDATE_VIEW. ... This fixes #2233	2015-02-26 16:41:55 +01:00
Olivier Goffart	d8b6e00fe7	Propagator: Let network propagator job understand a new header OC-ErrorString ... This allows the server to send a readable error string in many cases	2015-02-26 15:53:09 +01:00
Christian Kamm	c8167b77c9	Remove mention of allprop #2865	2015-02-26 12:36:11 +01:00
Christian Kamm	c37792f58f	Propagator: Upload files with future timestamps. #2880	2015-02-26 11:00:06 +01:00
Christian Kamm	842e5ba5e0	Sharing: Fix for folders containing &. #2892	2015-02-26 09:58:09 +01:00
Roeland Jago Douma	fba9020950	Added copyright header	2015-02-25 18:32:25 +01:00
Klaas Freitag	506cc3908a	Add proper copyright headers to some files, fixes #2869	2015-02-25 17:00:27 +01:00
Klaas Freitag	ca00b02b0a	ShareDialog: Improve some GUI, fix #2850 ... This improves some wording and fixes some show/hide issues with password setting.	2015-02-25 13:44:27 +01:00
Klaas Freitag	201075827f	Sharedialog: Add a Share button.	2015-02-25 13:44:27 +01:00
Christian Kamm	5c7fd24ea8	Handle 503 due to maintenance more gracefully. #2884	2015-02-25 12:02:10 +01:00
Christian Kamm	76ac628153	Discovery: Distinguish 503 Storage not available. #2884	2015-02-25 12:02:10 +01:00
Christian Kamm	6f71bd9353	SocketAPI: Don't mark .lnk files as ignored on windows. #2447	2015-02-25 11:55:48 +01:00
Christian Kamm	f88398e776	lnk files: Fix exists() calls. #2792	2015-02-25 11:50:32 +01:00
Christian Kamm	08c33cd1dc	Discovery: Fix handling of 503 on a folder. #2884	2015-02-25 08:09:07 +01:00
Klaas Freitag	1929040bb7	Discovery: Preserve the error message.	2015-02-24 22:02:31 +01:00
Klaas Freitag	3af936c8a1	Some minor cleanups.	2015-02-24 22:02:29 +01:00
Daniel Molkentin	f38aa698eb	Don't translate dummy strings	2015-02-20 10:12:31 +01:00
Daniel Molkentin	366f3f68b8	Activity view: Always add date ... Fixes #2223	2015-02-20 10:12:19 +01:00
Jocelyn Turcotte	03e23da6a3	Show the settings also when no arguments are passed ... sendMessage would only be called if there were options to be sent to the running application. Fix the issue by having explicitly named messages and always send the show settings message. Issue #2374	2015-02-19 16:57:16 +01:00
Jocelyn Turcotte	2ddaf5a06a	Add a NO_MSG_HANDLER cmake option ... This allows QDebug to output to stdout or OutputDebugString to ease development.	2015-02-19 16:57:16 +01:00
Olivier Goffart	5e1aa7d383	SyncEngine: Fix move would re-upload the file ... Because SyncJournalDb::postSyncCleanup was deleting the entries in the database	2015-02-19 15:00:37 +01:00
Olivier Goffart	e1871eb325	libsync: Fix qWarning in SyncEngine::slotJobCompleted saying we cannot find the sync item when moving ... We need to compare against the original file name, that's why it's there	2015-02-19 13:13:45 +01:00
Olivier Goffart	1998b602b9	SyncEngine: better merge of the renames node ... The same file is on the two sync trees under different names in case of a rename We must therefore use the rename target as the key in the _syncItemMap to ensure that the trees are correctly merged. Also use the same UTF-8 decoding for the target than for the actual file in order to catch invalid utf-8 in the rename target	2015-02-18 12:41:06 +01:00
Olivier Goffart	193fca4a8b	SyncFileItem::operator<: must return false when two items are equal ... Fixes #2852	2015-02-18 12:41:06 +01:00
Olivier Goffart	fb77cd5f7e	SyncEngine: Fix detection of the server reconfiguration ... Some files might be kept (like the default files) The files should be considered as NONE only if they are NONE on both trees issue #2847	2015-02-17 16:44:13 +01:00
Daniel Molkentin	99d674c346	Default shiboolethwebview to 900x700, remember last size ... Also add host to the title Addresses #2285	2015-02-17 15:28:14 +01:00
Daniel Molkentin	9690ca0198	Explain the "crash now" button to translators	2015-02-17 14:03:09 +01:00
Olivier Goffart	9351c7485f	Try another way to fix the build	2015-02-17 14:04:16 +01:00
Olivier Goffart	d43b82dc82	Fix compilation with clang ... The compilation error was account.h:140:113: error: expected ')' const QList< QPair<QString, QString> > &queryItems = QList< QPair<QString, QString> >()); ^ followed by more errors. The problem is because the compiler has hard time disambiguiating the comma int foo(const QPair<int, int> &p = QPair<int, int>()); ^ It is indeed quite hard for the compiler to know if this comma is a separation between complate arguments or the separation between arguments of the functions. Use the C++11 construct instead which does not need commas	2015-02-17 11:09:45 +01:00
Olivier Goffart	ce195bd599	SyncEngine: add an getter to the journal	2015-02-17 11:08:16 +01:00
Olivier Goffart	c0c8a22fa3	SyncEngine: pass a non-const reference to the SyncFileItemVector in aboutToPropagate ... That way, users of the library can change the contents of the sync item vector.	2015-02-17 11:08:16 +01:00
Jocelyn Turcotte	a955defae5	Raise the share window to make sure that the user sees it	2015-02-16 16:47:00 +01:00
Daniel Molkentin	2423aa592f	Add new icons by Jan	2015-02-16 14:47:32 +01:00
Olivier Goffart	151228b2a6	Fix build when compiling libsync without QtGui ... Utility must stay QtGui-free, move the hidpiFileName to the theme which is the only part in libsync which uses it, and already has #ifdefs	2015-02-16 10:24:42 +01:00
Volkan Gezer	bd4f68233f	some typos, grammar and sentence fixes	2015-02-14 23:47:07 +01:00
Olivier Goffart	d6bdbf9f34	Logger: use qFormatLogMessage with Qt 5.4 so it respects the Qt logging preferences	2015-02-14 14:23:01 +01:00
Christian Kamm	40dbc78407	concatUrl: Remove manual parsing, add test. #2817	2015-02-13 14:53:55 +01:00
Daniel Molkentin	957c9f060d	GeneralSettings: Add OpenSSL version number to about text	2015-02-12 23:23:47 +01:00
Daniel Molkentin	0bf0bab1eb	One more Qt4 compile fix	2015-02-12 22:13:58 +01:00
Olivier Goffart	a7c97388a9	Fix Qt4 build for another error	2015-02-12 20:16:02 +01:00
Olivier Goffart	86c480ee09	Fix Qt4 build	2015-02-12 20:10:31 +01:00
Olivier Goffart	0184a00151	PropagateDirectory: make the code a bit more readable ... Do not call slotSubJobFinished when there is are no sub jobs because no sub jobs were finished. Instead just call a finalize method	2015-02-12 20:00:04 +01:00
Olivier Goffart	b9161aa06c	libsync: Fix a case in which canceling the sync would result in some folder never being sync'ed ... The problem occurs because of the sorting of items when we have things like bigfolder bigfolder/bigsubfolder bigfolder-2 Then, because dashes come before slash in ascii, the bigfolder-2 would come before its content and the propagator would thinkg bigfolder is empty and save the etag before it is processed Should fix issue #2832	2015-02-12 20:00:04 +01:00
Daniel Molkentin	00e42d1177	More HIDPI support ... Except for the non-native activity tab icon in settings, this should fix #11	2015-02-12 19:44:40 +01:00
Klaas Freitag	d37dd040d0	Sharedialog: Use new share link from ownCloud Server 8 on. ... This is derived from pull request https://github.com/owncloud/client/pull/2813	2015-02-12 17:04:03 +01:00
Christian Kamm	a2aef04f21	ConValidator: Avoid a double auth check during startup. #2801	2015-02-12 15:25:44 +01:00
Christian Kamm	8f75434558	QuotaInfo: Ensure only one QuotaJob during startup. #2801	2015-02-12 15:25:44 +01:00
Daniel Molkentin	3dd6bcc323	Disable GUI support for TLS client certificates ... The feature needs mor work	2015-02-12 15:17:59 +01:00
Olivier Goffart	063271e978	propagateupload: Disable parallel chunk upload for owncloud < 8 ... Issue #2743	2015-02-12 14:50:42 +01:00
Olivier Goffart	438c4fe72e	Account: put the server version in the account	2015-02-12 14:50:42 +01:00
Klaas Freitag	f4144d6d38	Merge pull request #2827 from rullzer/fix_2812 ... Added push button to sharedialog to set password	2015-02-12 13:49:56 +01:00
Klaas Freitag	eada70ba44	Sharedialog: Removed Thumbnail retrieval. ... It uses an unstable API that the server does not really support. We need to postpone that. Removed for now.	2015-02-12 13:47:07 +01:00
Daniel Molkentin	3439ea395b	Remove one more mention of certDate	2015-02-12 12:43:41 +01:00
Daniel Molkentin	ba3bab8f49	Remove certificateDate property and other superfluous code	2015-02-12 12:37:42 +01:00
Christian Kamm	9ba88f6baf	Windows: Sync .lnk files correctly. #2792	2015-02-12 11:27:58 +01:00
Christian Kamm	e4fce1250b	Progress: Ensure overall progress is between 0 and 100. #2648 ... This should *already* be the case - but @dahan1999 reported that it fixed #2648.	2015-02-12 10:09:07 +01:00
Roeland Jago Douma	8523803d94	Added push button to sharedialog to set password ... Added button to explicitly set the password (makes is clear the user has to do somethign!). Patch for #2812	2015-02-11 22:14:51 +01:00
Olivier Goffart	4f202e5f4c	Fix TokenCredentials compilation	2015-02-11 18:10:01 +01:00
Christian Kamm	91ae912373	ShareDialog: Don't crash with bad response. #2811	2015-02-11 16:02:50 +01:00
Christian Kamm	5cdf448693	SyncJournal: Use DELETE journal mode on FAT filesystems. #2693	2015-02-11 14:03:55 +01:00
Christian Kamm	89c69250ef	Fix crash in discovery thread dtor. ... Occasionally on Windows ~DiscoveryMainThread() triggered a crash. Probably because the QMutableLinkedListIterator was destroyed after it's underlying data had been removed (from the map). Cleaning up the map and lists was redundant anyway, so the destructor is changed to only explicitly destroy the vio_file_stat objects.	2015-02-11 14:00:23 +01:00
Christian Kamm	e79e2b80c8	SocketApi: Fix crash on exit. #2798 ... The _listeners list is destroyed before the _localServer. And since _localServer is the parent of all generated QLocalSockets, they get destroyed in turn - which triggers onLostConnection() and thus accessed the destroyed _listeners list. To avoid that, delete all active QLocalSockets in SocketApi before its members are destructed. We also now delete sockets when we're done with them. I think disconnected sockets would otherwise linger until SocketApi destruction.	2015-02-11 09:50:10 +01:00
Christian Kamm	f8b24ac34d	Fix reconnection after long network outage #2321 ... The problem was that StatusNotFound can indicate either a transient network problem or a permanent server configuration problem.	2015-02-11 09:24:56 +01:00
Christian Kamm	51b9ec30a9	Remove connect to removed slot. ... This seems to have slipped back in, probably during a complex merge in ba8b1bbe06.	2015-02-11 08:12:09 +01:00
Klaas Freitag	d45d3892cb	Account: Fix path assembling with QUrl, add query items separately. ... Otherwise Qt does encode the delimiter between path and query items. This fixes bug #2804	2015-02-10 17:13:27 +01:00
Klaas Freitag	0bf6a220ae	Merge pull request #2807 from rullzer/sharedialog_force_password_multshare ... Reset _public_share_id after we delete the share, thanks	2015-02-10 12:18:10 +01:00
Roeland Jago Douma	c44abf4918	Reset _public_share_id after we delete the share	2015-02-10 07:53:35 +01:00
Roeland Jago Douma	d7f5e89a1d	Sharedialog: retrive thumbnail from server for shares ... Initial patch for #2726. Request a thumbnail from the server if files are to be shared.	2015-02-09 22:17:37 +01:00
Olivier Goffart	51337a10af	LSCOL job: Fix getting the list of folders when there are non-ascii ... Task #2795	2015-02-08 12:23:47 +01:00
Markus Goetz	d4132072d8	OS X: Send notification natively ... For #2728	2015-02-07 18:23:40 +01:00
Klaas Freitag	4849c31add	Sharing: Handle "Enforce password" for public shares properly. ... If a 403 is received from the attempt to create a public link, the dialog shows the password field, as this is server enforced. This fixes #2774	2015-02-06 16:27:11 +01:00
Daniel Molkentin	01bca39138	s/mirall/client in transifex & translations ... Last part of #2470	2015-02-06 15:16:55 +01:00
Olivier Goffart	6e8527e66d	Wizard: Show the remote folder name when the theme has one ... Relates to issue #2788	2015-02-06 14:50:52 +01:00
Jocelyn Turcotte	0d2b7967bc	Windows: Fix opening activity entries with a space in the name ... This fixes #2601	2015-02-06 13:44:06 +01:00
Olivier Goffart	70c8803a79	SelectiveSync: show a message in case of error or if there is no subfolder ... Usefull when the folder does not exist (for example in case the theme has a defaultServerFolder that does not yet exist, #2788) But also to avoid confusion (issue #2663)	2015-02-06 12:27:54 +01:00
Olivier Goffart	0d2fb0754c	Wizard: Fix the advanced setup page when the theme has a defaultServerFolder ... Especially the selective sync dialog Task #2788	2015-02-06 12:27:54 +01:00
Markus Goetz	1e57432aae	Propagator: Fix crash ... This crash was uncovered when testing parallel chunks when one chunk finished the upload. The propagate was then finished with the other UploadDevices still being in-flight in the QNAM.	2015-02-06 11:19:41 +01:00
Markus Goetz	7c0d3b8485	Sharing: tr()s added	2015-02-06 11:11:09 +01:00
Daniel Molkentin	46abd47bfe	Merge pull request #2787 from cmeh/patch-1 ... Orthography: "an folder" corrected to "a folder"	2015-02-06 10:31:57 +01:00
Olivier Goffart	5ec793e045	propagateupload: Save the mtime given by the server in the reply to GET ... There could be a race condition if the file was updated on the server between the discovery and the propagate phase. By taking the mtime from the server, we make sure that we do not have a race. This is tested by t6.pl with BIG3.file because the script was modifying the file between the two phases	2015-02-06 10:23:20 +01:00
cmeh	1554f41441	Orthography: "an folder" corrected to "a folder"	2015-02-06 10:22:49 +01:00
Daniel Molkentin	9e945eb471	Settings dialog: better color for separator line	2015-02-06 08:30:51 +01:00
Daniel Molkentin	c4dd1cfb69	Mac Settings Dialog: Native icons for account	2015-02-06 07:54:25 +01:00
Volkan Gezer	eaa9c4fdf8	json capital	2015-02-05 20:41:08 +01:00
Markus Goetz	94e61c3205	Notifications: Fix creation of notification (fixup2) ... For #2728	2015-02-05 17:20:52 +01:00
Markus Goetz	c4cf13bd97	Notifications: Fix creation of notification (fixup) ... For #2728	2015-02-05 16:55:32 +01:00
Markus Goetz	71e22ffe2c	Notifications: Fix creation of notification ... For #2728	2015-02-05 16:46:40 +01:00
Olivier Goffart	3169a6f170	SelectiveSync: change the wording of the dialog on the wizard ... Have different wording depending on the wizardSelectiveSyncDefaultNothing theme option Relates to #2580	2015-02-05 16:22:04 +01:00
Markus Goetz	446e2b27d7	OS X Sparkle: Fix warning	2015-02-05 15:49:46 +01:00
Olivier Goffart	856df4c5f6	libsync: Get the capabilities and store it in the account	2015-02-05 15:42:56 +01:00
Olivier Goffart	34237f604e	JsonApiJob: Refactor out of the shibbolethuserjob	2015-02-05 15:42:01 +01:00
Olivier Goffart	21345b81f1	wizard: fix the EntityExistJob URL ... We need to add the davPath in there. Otherwise there will be a redirect which will break shiboleth (We want to only enter the password once) Issue #2739 and #2780	2015-02-05 12:53:04 +01:00
Olivier Goffart	3dd8ce08b8	Parallel chunk upload: Fix a off-by-one while saving the done chunk in the DB ... We should assume that the chunk currently uploading is NOT done (hence the -1) il task 405	2015-02-04 18:52:26 +01:00
Markus Goetz	f233af04f6	Windows XP: Possible fix for #2648	2015-02-04 18:49:04 +01:00
Olivier Goffart	acb7e972ea	Merge pull request #2778 from jturcotte/master ... Allow building natively on Windows with MinGW	2015-02-04 17:11:56 +01:00
Jocelyn Turcotte	1ac523ec01	Output libocsync and libowncloudsync in the bin directory ... Windows finds DLLs using PATH or the directory of the process' executable. By outputing those dependend DLLs together with owncloud.exe, the developer only need to have OpenSSL's bin and the qtkeychain build directory in his PATH to let the dynamic linker find them. As the documentation of RUNTIME_OUTPUT_DIRECTORY points out, this only affects windows as other platforms don't consider libraries as runtime targets.	2015-02-04 15:00:22 +01:00
Olivier Goffart	ca56e5d9ca	SyncEngine: Fix crash ... We must check if 'it' is not == to begin() before doing it-1 Also i believe the logic was reversed if it was begin() Task #2765	2015-02-04 14:52:41 +01:00
Jocelyn Turcotte	43a51c1bef	Fix the MinGW build ... - qtkeychain isn't necessarily in a qt5keychain subdirectory. - Explicitly add OpenSSL to the include directories - Make sure that the USE_OUR_OWN_SQLITE3 code is initialized for csync by calling find_package.	2015-02-04 14:50:38 +01:00
Olivier Goffart	26132fd14e	owncloudconnectionmethoddialog: typo	2015-02-04 13:42:49 +01:00
Olivier Goffart	ca68ccd76a	Fix Qt4 build	2015-02-03 20:04:04 +01:00
Olivier Goffart	1f9d7c41e8	owncloudconnectionmethoddialog: Change order of buttons, fix wording, and add the URL	2015-02-03 17:55:01 +01:00
Roeland Jago Douma	48254579a2	Sharedialog: add copy button text and actually connect the button	2015-02-03 13:02:52 +01:00
Daniel Molkentin	a3106b1771	Client Dialog Support: Fix certificate dialog	2015-02-02 23:35:39 +01:00
Jeroen Hoek	227b7ccabd	Add dialog to connection wizard ... When connecting to a https:// URL fails, present the user with three choices: * Try again with a http:// URL * Configure client-side TLS certificates * Go back and enter a different URL This allows users connecting with an ownCloud server secured with client-side TLS certificates to start the certificate import wizard manually instead of relying on a custom server error message.	2015-02-02 22:29:21 +01:00
Christian Kamm	49021fd96d	SyncJournal: Reset all prepared statements. #2757 ... Makes closing of the database actually release file locks.	2015-01-30 15:35:42 +01:00
Olivier Goffart	db6214e090	SyncEngine: Do not assert when the neon session is 0 ... It can now be 0 if neon is not in used Issue #2755	2015-01-30 01:05:46 +01:00
Markus Goetz	df214cd6c1	Folder: Make debug message clearer ... The thread was actually already started in the discovery phase.	2015-01-29 20:47:45 +01:00
Klaas Freitag	d2f1e6e03e	ShareDialog: Disable sharing of external files. ... See https://github.com/owncloud/client/issues/2732 for discussion.	2015-01-29 18:11:04 +01:00
Daniel Molkentin	332601ed26	Remove noisy debug output	2015-01-29 15:37:21 +01:00
Christian Kamm	43d6dbb0f2	SQL: Add debugging options. #2693 ... OWNCLOUD_SQLITE_JOURNAL_MODE: To use something else than WAL OWNCLOUD_SQLITE_TEMP_STORE: To test with storing temporaries in memory.	2015-01-29 11:02:01 +01:00
Christian Kamm	cd0ad21132	SQL: Improve error reporting of failed exec(). #2693	2015-01-29 09:47:48 +01:00
Daniel Molkentin	6fa73e073f	Certificate Wizard: Remove dead code, cleanup style	2015-01-28 17:38:38 +01:00
Christian Kamm	5fc231cda4	Shib: Fix fetching of 'user'. #2751	2015-01-28 15:15:35 +01:00
Daniel Molkentin	1ca8ab81c7	Fix for non C++11 compilers	2015-01-28 14:19:37 +01:00
Olivier Goffart	d70e146c1f	Merge remote-tracking branch 'origin/ssl_client_cert' ... Conflicts: CMakeLists.txt csync/src/CMakeLists.txt csync/src/csync_owncloud.c	2015-01-28 14:13:40 +01:00
Daniel Molkentin	989005d616	Clientcert support: Explictly link libsync against openssl	2015-01-28 13:31:17 +01:00
Christian Kamm	2cee591b0e	Merge branch 'sharedialog_fixes' of git://github.com/rullzer/client ... Fix missing OcsShareJob constructor. Conflicts: src/gui/sharedialog.cpp	2015-01-28 12:19:40 +01:00
ckamm	8a71d7d254	Merge pull request #2730 from rullzer/filebrowser_integration ... Sharedialog: 404 is also an acceptable response when retriving shares	2015-01-28 12:09:33 +01:00
Christian Kamm	7950eb8ed6	sqlite: Update to version 3.8.8.1. #2750	2015-01-28 11:52:04 +01:00
Christian Kamm	f59515883d	FolderMan: Require 2s minimum delay. ... Otherwise we run into "can't upload because it's too recent" issues when the folder watcher triggers a sync. We used to do this, but my recent refactoring started counting the time since the last sync against this minimum delay, leading to 1ms delays in practice. This fixes the regression.	2015-01-28 11:24:47 +01:00
Daniel Molkentin	524f04f34e	Wizard: Give useful error message when server access is forbidden ... Final fix for #2607	2015-01-28 11:06:41 +01:00
Daniel Molkentin	9e7ee42eb7	Wizard Remove unused pointer	2015-01-28 11:06:41 +01:00
Daniel Molkentin	6f82e80698	Remove debug	2015-01-28 11:06:41 +01:00
Christian Kamm	37680a0909	ShareDialog: Prepare for multiaccount. #43 ... Also fix a possible bug with the share dialog when no account is configured.	2015-01-28 10:52:55 +01:00
Christian Kamm	350ad98c27	Folderwizard: Prepare for multiaccount. #43 ... Avoid accessing the global account instance and instead pass it in from the outside.	2015-01-28 10:40:32 +01:00
Olivier Goffart	b0dbb49ca8	Shib: fix broken signal/slot connections	2015-01-26 16:23:43 +01:00
Olivier Goffart	3169833cd7	gui: Still give a decent experience if there is no system tray ... Helps for tasks #1138, #2023, #2123	2015-01-26 13:00:45 +01:00
Joachim Schiele	9abc3e1333	fixes required by upstream	2015-01-23 19:22:56 +00:00
Olivier Goffart	dcba129a98	Make it compile without neon	2015-01-23 17:56:46 +01:00
Olivier Goffart	b856266e91	Remove neon link flag when not required	2015-01-23 17:35:17 +01:00
Olivier Goffart	fe51ada1e8	Don't require NEON with Qt 5.4	2015-01-23 17:11:34 +01:00
Olivier Goffart	807277c0ae	Socket API: Do not broadcast the shared menu entry on all socket when one connects to the socket API ... Now we reply to the command SHARE_MENU_TITLE	2015-01-23 16:09:38 +01:00
Markus Goetz	12ac9f9aa9	Discovery: Fix broken signal/slots	2015-01-23 15:37:36 +01:00
Markus Goetz	3885d5d706	Discovery: Report root etag from engine to folder ... For #2352	2015-01-23 15:30:44 +01:00
Markus Goetz	c54621eb19	OS X: Share menu for Finder	2015-01-23 12:00:31 +01:00
Klaas Freitag	2943b4a85a	CMake: Fixed the rpath settings to make the nighlies build again.	2015-01-23 11:50:42 +01:00
Klaas Freitag	ed0b4e48d5	Sharedialog: Fix some error display.	2015-01-23 11:50:42 +01:00
Roeland Jago Douma	f9938c90ff	Sharedialog: 404 is also an acceptable response when retriving shares ... When we try to get the shares for a file/dir that has no shares yet 404 is an acceptable response from the server.	2015-01-23 10:29:12 +01:00
Roeland Jago Douma	bcdc19f0e3	Sharedialog: Moved more logic to OcsShareJob ... To make the Sharedialog a bit cleaner and to only have the logic in one place. The postdata is now passed as a QList<QPair<QString, QString>> to the OcsShareJob.	2015-01-23 09:41:10 +01:00
Roeland Jago Douma	fb967427e8	Sharedialog: We always want json return format ... Cleanup the code a bit and set that we want json as return format for all replies.	2015-01-23 09:17:00 +01:00
Roeland Jago Douma	0b10761291	Sharedialog: emit proper error code, only show error label if there is one	2015-01-23 09:10:02 +01:00
Olivier Goffart	0f98a90858	Wizard: Add an option in the theme to default to nothing selected in the selective sync ... Issue #2580	2015-01-22 15:57:55 +01:00
Christian Kamm	094da51d82	FolderWatcher: Fix ignore list usage. ... All patterns with started with a ] were not working correctly.	2015-01-22 15:42:47 +01:00
Olivier Goffart	3c26bfa618	Propagate Remote mkdir: save the fileid to the database early ... It's important so that if we delete or rename a diectory that is being uploaded, this is properly detected	2015-01-22 15:11:04 +01:00
Olivier Goffart	168c89aba7	Wizard: fix spacing	2015-01-22 15:11:03 +01:00
Markus Goetz	0502f684e9	Discovery: Even less qDebug	2015-01-22 14:45:08 +01:00
Markus Goetz	45cb679ea7	Discovery: Less verbose debug	2015-01-22 14:37:35 +01:00
Markus Goetz	c9f9d55658	Merge branch 'qnam_csync_update' ... Conflicts: src/libsync/networkjobs.cpp	2015-01-22 14:34:36 +01:00
Markus Goetz	dde8e35785	Discovery: Put results into proper place in map ... The map is for memory management. It can later be used as a cache for the recursive PROPFIND (if we decide to activate it again)	2015-01-22 14:25:24 +01:00
Christian Kamm	fa4e6d8261	Exponential backoff for rapid follow up syncs. #2355	2015-01-22 08:55:52 +01:00
Christian Kamm	145df8ec67	Pause between sync runs (particularly long ones) #2355	2015-01-22 08:55:52 +01:00
Christian Kamm	af5cbdbed8	Folder: Add timer for sync duration.	2015-01-22 08:55:52 +01:00
Nourredine	ba8b1bbe06	adds 'SSL client certificate' support from n.octeau with qknight changes as: ... * removed broken QSsl::SslV3 default * rewrote slotHandleErrors(): no longer claim errors which are none. * hack reverted: lib64 was not the cause for NixOS issues related to libraries. * refactored csync/src/csync_owncloud.c and discovered+fixed why the dav_connect was never getting the certPath+certPassoword * cleanup of code but seems this crushed the ssl client certificate support * fixes the https://github.com/owncloud/client/issues/69#issuecomment-69358377 issue * lots of cleanup * From TODO list : translate all french comments into english * changed _pemCertificate type from QString to QByteArray	2015-01-21 23:55:11 +00:00
Olivier Goffart	f2a7e0b28f	Selective sync dialog: give a proper size by default	2015-01-21 15:37:00 +01:00
Olivier Goffart	0e86ceff73	Connection Validator: let the user cancel the password dialog ... And don't ask for the password again if this happens	2015-01-21 15:33:51 +01:00
Olivier Goffart	c91de092e5	Setup wizard: Fix the http fallback logic ... Also don't allow to go back from the advanced settings page because this break everything	2015-01-21 15:33:51 +01:00
Markus Goetz	7a173f6e62	OS X: Fix path rewrite for owncloudcmd ... It was broken after the folder restructuring (cmd/ and client/)	2015-01-21 15:17:40 +01:00
Klaas Freitag	95f7e83c5c	Sharedialog: Some more refinements after the merge of the branch. ... - Some dialog changes: Made it less vertical space comsuming - Some variable cleanups - Allow to share files that are not within the synced dir by copying them to the root of a sync dir first.	2015-01-21 15:05:23 +01:00
Olivier Goffart	d8b621d05f	LsColJob: fix getting the sizes when the path contains %-encoded chars	2015-01-21 12:04:54 +01:00
Markus Goetz	fb87ad1442	OS X: Fix path rewrite for owncloudcmd ... It was broken after the folder restructuring (cmd/ and client/)	2015-01-20 19:03:56 +01:00
Markus Goetz	c580275a01	Discovery: Delete file entries on destruction	2015-01-20 18:49:27 +01:00
Olivier Goffart	5c2298fa37	Discovery phase: fix a few warnings	2015-01-20 18:50:03 +01:00
Markus Goetz	906779c4b1	SyncEngine: Use QNAM for csync_update ... This is for #2507	2015-01-20 18:27:25 +01:00
Klaas Freitag	bd80c034ba	Merge pull request #2723 from rullzer/filebrowser_integration ... Sharedialog: link sharing from desktop	2015-01-20 17:45:34 +01:00
Daniel Molkentin	00ed37dd02	Merge pull request #2709 from rullzer/monochrome-state-info-icon ... Resepct theming when no syncs are configure	2015-01-20 08:21:42 +01:00
Daniel Molkentin	4de815ad67	Merge pull request #2710 from rullzer/sort_folder_order ... Manged folder list in the tray icon is now sorted	2015-01-19 18:56:55 +01:00
Daniel Molkentin	86eed7cb81	Fix SSL button icons	2015-01-18 15:34:48 +01:00
Roeland Jago Douma	63f18a7ebb	Sharedialog: Pass QDate around instead of QString ... Now pass a QDate object around so we only do the conversion in one place in case the API changes.	2015-01-17 09:57:17 +01:00
Roeland Jago Douma	233f0423fa	Sharedialog: Also reply on delete should be checked	2015-01-17 09:48:18 +01:00
Roeland Jago Douma	d5bddca01d	Sharedialog: More Q_FOREACH	2015-01-17 09:29:13 +01:00
Roeland Jago Douma	00cb6f71da	Sharedialog: Set correct minimum date ... The minimum date should always be the current date + 1 day.	2015-01-17 09:10:42 +01:00
Roeland Jago Douma	9ac35d5869	Sharedialog: Use arg instead of append	2015-01-17 09:01:24 +01:00
Roeland Jago Douma	bd1db30eea	Sharedialog: Minor fixes ... The server generates a new share when a password is set/deleted so we need to refetch the shares once that is done. It is not possible to set an expiration date in the past for a share. So do not allow the user to select a date in the past.	2015-01-17 08:50:28 +01:00
Roeland Jago Douma	6c3a5b1d69	Sharedialog: Do not hard code error reply messages ... The server provides error messages in the json return code. Use those error messages.	2015-01-17 08:29:20 +01:00
Roeland Jago Douma	c233baab5b	Sharedialog: grouped sharelink stuff in one widget ... A bit of grouping in the UI requiring less ->hide() and ->show() calls	2015-01-17 08:10:18 +01:00
Christian Kamm	aa6a5e4ac2	Credentials: Use the bound account everywhere. ... This is preparation for multiaccount.	2015-01-16 15:22:56 +01:00
Roeland Jago Douma	71560ace71	Sharedialog: Show general info about a share ... A start with some general share info in the share dialog.	2015-01-16 14:48:56 +01:00
Roeland Jago Douma	0fba4eee98	Sharedialog: Removed user/group sharing	2015-01-16 14:06:34 +01:00
Christian Kamm	91fce3ea73	Make public API explicit about blacklist kind. #2301 ... 'blacklist' can mean the selective sync blacklist or the error blacklist. Names in public API are now explicit about which blacklist is meant.	2015-01-16 10:17:19 +01:00
Christian Kamm	b50475bc17	SQL: Fix error reporting on prepare fail. #2697	2015-01-16 09:12:25 +01:00
Klaas Freitag	40c802b148	Download: Handle locking problems as soft errors, enterprise #455	2015-01-15 20:51:30 +01:00
Klaas Freitag	7d9f917810	Filesystem: Check more return values and more logging.	2015-01-15 20:51:30 +01:00
Klaas Freitag	a5ae1a9734	Folder: Only count error free downloads for the gui notification.	2015-01-15 20:51:30 +01:00
Klaas Freitag	506360716a	FolderMan: Removed too explicit logging that scares users.	2015-01-15 20:51:30 +01:00
Olivier Goffart	22ad34fa0e	Merge branch '1.7' ... Conflicts: admin/win/nsi/l10n/French.nsh src/mirall/propagator_qnam.cpp	2015-01-15 17:58:43 +01:00
Olivier Goffart	ce0e7e4a5d	Propagator download: Do not assume the server do not support ranges if we cannot parse the Content-Range header ... There are several reason why start==0 * The Content-Range header was not present * We can't parse it * Or it is actually 0 If we can't parse it, we cannot assume anything and must error out. So only in the first case we should discard the temporary file and continue. Issue #2708	2015-01-15 17:56:49 +01:00
Olivier Goffart	907b79d3b8	Utility: Use appropriate unit when converting from bytes to human readable units ... We must not use the SI units if we use power of 2 I believe that we should use SI units and power of 10 But since the server still use power of 2, we need to show the same numbers But at least we use the proper standard IEC unit that are explicit	2015-01-15 14:06:17 +01:00
Olivier Goffart	863731fd6a	Revert "Utility: Use SI units" ... This reverts commit 7445fa7ef7. and commit f654c53c35. The server still use wrong powers, so we still need to use the same	2015-01-15 13:56:51 +01:00
Olivier Goffart	c9f1b3229b	Add Folder Wizard: fix wording ... (Relates #2663)	2015-01-15 13:55:48 +01:00
Olivier Goffart	2b8b204cfc	SelectiveSyncDialog::estimatedSize: return qint64 because -1 in case of error	2015-01-15 13:07:16 +01:00
Olivier Goffart	264471af43	csync: cleanup some unused error code	2015-01-15 12:19:06 +01:00
Olivier Goffart	08d3ae9f02	csync_statedb: Have more granular error reporting when the loaddb fails ... In order to distiguish error from sqlite_open or from the integrity check Issue #2673	2015-01-15 11:36:24 +01:00
Roeland Jago Douma	cd0c9b2ddb	Sharedialog: More error checking	2015-01-14 19:47:25 +01:00
Roeland Jago Douma	b80bbe6587	Sharedialog: more const	2015-01-14 19:36:42 +01:00
Roeland Jago Douma	879d41bf2d	Sharedialog: Fix spinners and passwordfield ... The password field now show correct info when a password is entered etc. Maybe we should have an extra info part where we state that the user needs to press enter to submit the password	2015-01-14 19:08:04 +01:00
Roeland Jago Douma	7b1cfd69d7	Sharedialog: use QProgressIndicator ... This is a merge from the movie in the original commit (which was local) to the QProgressIndicator. However, on all connections I tested it, it did not add much since the API is in gernal pretty quick. So maybe we can just remove this.	2015-01-14 18:42:56 +01:00
Luca Lorenzetto	ef9f2a965d	Fix for issue #2703	2015-01-14 17:39:14 +01:00
Olivier Goffart	ac0e8b1fe1	Qt 4 fix	2015-01-14 16:30:10 +01:00
Olivier Goffart	da0f7317b4	Wizard: Show the size of the folders that will be downloaded ... Part of #2580	2015-01-14 16:11:07 +01:00
Roeland Jago Douma	3e81839af5	Sharedialog: Removed duplicted code ... Handling of updated shares is identical from users and groups	2015-01-14 15:27:15 +01:00
Christian Kamm	0af5574951	Propagate upload: code cleanup	2015-01-14 15:20:02 +01:00
Olivier Goffart	0ae9055ea6	Propagator upload: Fix UploadDevice::seek	2015-01-14 15:08:09 +01:00
Olivier Goffart	885aafcea3	SelectiveSync dialog: Show the sizes of the folder	2015-01-14 15:08:09 +01:00
Olivier Goffart	7445fa7ef7	Utility: Use SI units	2015-01-14 15:08:09 +01:00
Markus Goetz	a544133d73	Propagator: Guard access to BandwidthManager ... Shouls fix #2623	2015-01-14 14:28:47 +01:00
Christian Kamm	b3c02798a3	Propagator: Use FILE_SHARE_DELETE on Windows. #2070 #2597	2015-01-14 14:16:05 +01:00
Roeland Jago Douma	0bd6eb1792	Sharedialog: fix changes due to rebase	2015-01-14 13:51:02 +01:00
Olivier Goffart	3ec19ee355	Propatage upload: Preload the chunk in memory and close the file ... This should solve #2675 and #1981 By preloading the chunks in memory before sending them, we don't keep the file open and therefore we let other program open the file for writing. If the file is modified between two chunks, we detect that and abort anyway	2015-01-14 13:46:51 +01:00
Olivier Goffart	0215b250af	UploadDevice: mark overrided method as Q_DECL_OVERRIDE	2015-01-14 13:46:51 +01:00
Olivier Goffart	6a0c9fdd34	Propagate upload: Change the default chunk size to 5MiB and make chunk upload parallel ... The server is slow to process each chunk. As a result the time between the chunks is not neglectible. Therefore we gain a lot of time by uploading the chunks in parallel. So the bandwitdh is used when the server is waiting between chunks.	2015-01-14 13:46:51 +01:00
Olivier Goffart	7f1593c5d7	PropagateUpload: The PUTJob owns the chunk device, so make it a QScopedPointer instead of a QSharedPointer	2015-01-14 13:46:51 +01:00
Roeland Jago Douma	e420a689dc	Sharedialog: More reply checking and removing some duplicated code	2015-01-14 13:43:01 +01:00
Roeland Jago Douma	9addd56f9b	Sharedialog: follow correct behavior for files when editing permissions	2015-01-14 13:43:01 +01:00
Roeland Jago Douma	a7e69a5dc5	Sharedialog: Started parsing server replies	2015-01-14 13:43:01 +01:00
Roeland Jago Douma	f6a83d5de2	ShareDialog: UI is different for files/dirs ... Bunch of if statements to make sure that we do not display delete/create on files.	2015-01-14 13:43:01 +01:00
Roeland Jago Douma	d1d8a40acf	Sharedialog: fix unused var compiler warnings	2015-01-14 13:39:07 +01:00
Roeland Jago Douma	cb18dfaaef	Sharedialog: Of course users can also have create and delete privileges	2015-01-14 13:39:07 +01:00
Roeland Jago Douma	a22a03e501	ShareDialog: Group sharing is now also possible ... Basically the same functionality as for user sharing. Maybe it would be wise to merge the two functionalities. Should be rather straight forward if we also merge the UI parts.	2015-01-14 13:39:06 +01:00
Roeland Jago Douma	9a35b5670e	ShareDialog: Allow sharing with users ... This commit needs a lot of cleaning up. And a lot of error checking needs to be added. However it is now possible to change and add new shares with users. Sharing with groups should be just copy paste. Also the UI needs some love.	2015-01-14 13:39:06 +01:00
Roeland Jago Douma	017b54f9a8	Sharedialog: Allow modifications of permission for users	2015-01-14 13:39:06 +01:00
Christian Kamm	9b7e6cc5c1	Fix warnings. ... * remove Unused variable * zorder for spacers makes no sense	2015-01-14 11:28:53 +01:00
Klaas Freitag	209276efa8	ShareDialog: Moved open slot from Application object to Gui object. ... Also set auto delete flag for the dialog explicitely.	2015-01-13 13:50:41 +01:00
Daniel Molkentin	31e584e3e3	Fix win32 build	2015-01-12 13:53:40 +01:00
Klaas Freitag	ad09f6491b	ShareDialog: Fix const ref for arguments.	2015-01-12 11:35:11 +01:00
Klaas Freitag	efbe033bfb	Sharedialog: Fix merge problem (use AccountPtr) plus cleanup.	2015-01-12 11:30:02 +01:00
Klaas Freitag	2c6f0950f6	Merge pull request #2674 from rullzer/filebrowser_integration ... Add Sharing from the desktop, SocketAPI and Dialog.	2015-01-12 11:16:28 +01:00
Roeland Jago Douma	b680788f48	Sharedialog: Allow setting and retrieving of experiation data for public urls	2015-01-12 10:14:45 +01:00
Daniel Molkentin	5e0d4ab31d	Further Windows compile fix	2015-01-12 09:50:37 +01:00
Daniel Molkentin	488f993f45	Fix compilation on Windows	2015-01-12 09:40:11 +01:00
Roeland Jago Douma	811cbc27c0	Sharedialog: Construct correct public url for existing shares	2015-01-11 14:16:49 +01:00
Volkan Gezer	cefa31eb82	fix typo ... suggested by transifex translator	2015-01-11 14:07:04 +01:00
Roeland Jago Douma	25e90ff658	Sharedialog: use Q_FOREACH	2015-01-11 13:56:23 +01:00
Roeland Jago Douma	fa390299f9	Added Q_FUNC_INFO at several places	2015-01-11 13:41:15 +01:00
Roeland Jago Douma	accb036507	Removed some unused outcommented code	2015-01-11 13:36:45 +01:00
Roeland Jago Douma	44690ff596	ShareDialog: fixed "" -> QString	2015-01-11 13:27:32 +01:00
Roeland Jago Douma	e20f819c1d	Sharedialog: QString("") -> QString()	2015-01-11 13:24:40 +01:00
Roeland Jago Douma	1d011a2f9a	ShareDialog: make visible text translatable	2015-01-11 13:22:48 +01:00
Roeland Jago Douma	bc84a78b0f	ShareDialog: Made slot arguments const	2015-01-11 11:19:12 +01:00
Daniel Molkentin	6034bd0946	Wizard: Never attempt to hide server page ... The wizard code used to call hide() on hardcoded wizards. This means that for a brief moment, the first page with the URL (disabled line edit) may be seen. I think that's completely legitimate from a feedback perspective. The alternative would be to unhide on error, but this is rather unelegant...	2015-01-11 07:38:09 +01:00
Klaas Freitag	786a877986	SocketAPI: Some cleanups plus added some consts	2015-01-09 11:44:01 +01:00
Daniel Molkentin	c86d8e5acf	Clean up BSD support patch	2015-01-08 22:40:47 +01:00
Daniel Molkentin	4a819026df	Merge pull request #2634 from ryo-on/netbsd-support ... Support NetBSD like FreeBSD or Linux.	2015-01-08 22:35:44 +01:00
Olivier Goffart	7671ae8df7	Application: Initialize the folderman after we checked for existance ... So we don't start the SocketAPI if we are going to quit. We also do not log any message anymore before we install the hooks Should solve #2666	2015-01-08 16:52:23 +01:00
Daniel Molkentin	df555d5321	Merge remote-tracking branch 'origin/master' into accountstate ... Conflicts: src/cmd/cmd.cpp	2015-01-08 15:38:41 +01:00
Daniel Molkentin	c3468b7ed6	Merge remote-tracking branch 'origin/master' into accountstate ... Conflicts: src/gui/owncloudsetupwizard.cpp src/gui/owncloudsetupwizard.h src/libsync/propagatedownload.cpp src/libsync/propagatedownload.h	2015-01-08 15:33:39 +01:00
Olivier Goffart	bbf0e7c0a5	owncloudcmd: add --unsyncedfolders to test selective sync	2015-01-08 15:27:02 +01:00
Daniel Molkentin	3f5c1d2ade	Merge pull request #2678 from chrodan/master ... Hide Ignored files in context menu	2015-01-08 14:29:36 +01:00
Daniel Molkentin	dd063d0207	Add hack to make old themes work	2015-01-08 14:21:58 +01:00
Christoph Dann	309ff2997c	potential fix for #1865 ... Do not show ignored files in context menu	2015-01-08 11:42:14 +01:00
Daniel Molkentin	8e8ca97eec	Fix build	2015-01-08 09:42:26 +01:00
Daniel Molkentin	51d7559a2c	Simplify checkDowngradeAdvised logic ... Also, show() and back() belong into slotConnectionCheck only	2015-01-07 18:22:44 +01:00
Daniel Molkentin	5c4f706fe4	Setup Wizard: Make sure to reset auth type when URL changes	2015-01-07 18:01:18 +01:00
Daniel Molkentin	7ac32a19b5	Do not show the HTTP-reconnect popup when its not warranted ... Fixes usability issues in the workaround of #2607	2015-01-07 18:01:11 +01:00
Olivier Goffart	8e3dbcb7c0	SocketAPi: use absoluteFilePath unstead of canonicalFilePath ... Because canonicalFilePath is way too slow. Issue #2671	2015-01-07 14:37:05 +01:00
Olivier Goffart	ab0bc75e43	PropagateUploadFileQNAM::slotUploadProgress: Fix inverted condition ... ( Apply this commit 2d8053a9df )	2015-01-05 17:32:12 +01:00
Olivier Goffart	414ac5433d	Merge branch '1.7' ... Conflicts: binary doc/accountsetup.rst doc/architecture.rst doc/navigating.rst doc/owncloudcmd.rst doc/troubleshooting.rst	2015-01-05 14:40:53 +01:00
Olivier Goffart	b2c01ffe21	SyncEngine: Show an error when a file name is not encoded with valid UTF-8 ... ... instead of uploading the file with replacement character, and asserting on the next sync. Issue #2649 If the file or folder on the file system has a name with invalid UTF-8, We would convert the name to utf-8, and the conversion would result in replacement character placeholder. And we would upload that file on the server with that name, and save it with this name on the database. Fix this issue by showing an error to the user for invalid files.	2015-01-05 13:54:31 +01:00
Olivier Goffart	517dea6958	accountsettings: Use right palette when using reversed palette ... Issue #2654 The problem is that the WindowsVistaStyle does something wierd with the palette when drawing the text, and we should do the same then.	2015-01-05 12:17:05 +01:00
Roeland Jago Douma	ee2e6e5dce	Also allow sharing if we only sync a part	2014-12-28 20:13:11 +01:00
Roeland Jago Douma	facb6b2e81	Check box public link now works multiple times ... When deleting a share (public link) and recreating it we need to store the new id.	2014-12-28 20:13:11 +01:00
Roeland Jago Douma	ec3c83c0c9	Minor sharedialog.ui fixes	2014-12-28 20:13:10 +01:00
Roeland Jago Douma	0ad4fb7273	Create valid poststring	2014-12-28 20:13:10 +01:00
Roeland Jago Douma	763d5f67cd	Some error checking on SHARE sockeAPI command	2014-12-28 20:13:10 +01:00
Roeland Jago Douma	b7d4c997a3	Fix rebase of branch	2014-12-28 20:13:10 +01:00
Alfie "Azelphur" Day	bd7f45e398	Everything works now, albeit without error checking.	2014-12-28 20:13:10 +01:00
Alfie "Azelphur" Day	748440ced3	Initial push for filebrowser integration, not finished yet but it's a start :)	2014-12-28 20:13:10 +01:00
Ryo ONODERA	16c4864e67	Support NetBSD like FreeBSD or Linux.	2014-12-21 23:00:56 +09:00
Roeland Jago Douma	cd8affc255	Resepct theming when no syncs are configure	2014-12-19 15:08:49 +01:00
Roeland Jago Douma	8677fb18bb	Manged folder list in the tray icon is now sorted ... We are using a QHash to store all the folder objects. This does not allow for easy sorting and looks weird to the user. Now they are first inserted into a temp QMap to sort them properly.	2014-12-19 13:59:50 +01:00
Christian Kamm	4fa212c43b	CSync callbacks: Don't use global account.	2014-12-18 15:39:51 +01:00
Christian Kamm	a9da5ebff6	Wizard: Sometimes preserve folders when folder config is skipped. ... * When folder config is used, other folder definitions are always removed. * Fix a bug with the wizard becoming stuck when 'skip folder config' is used.	2014-12-18 15:39:51 +01:00
Christian Kamm	38ebfec1fb	Use global Account/AccountState less. ... * Use a shared pointer to Account everywhere to ensure the instance stays alive long enough for a sync to terminate * Folder is now tied to an AccountState * SyncEngine and OwncloudPropagator tie to an Account and use that for all jobs they run Issue: Since the setup wizard currently always replaces the account, it will always wipe all folder definitions, even when the actual changes to the account were minor.	2014-12-18 15:39:51 +01:00
Christian Kamm	6c7acd585e	Account: Split into libsync/Account and gui/AccountState. ... This allows all the account state information to live in gui while the sync-relevant data stays in libsync. I also moved quotainfo to gui since it depends on the account state.	2014-12-18 15:39:51 +01:00
Olivier Goffart	e8efaa5ed8	Direct download URL: Fix resuming ... The server might support resuming, so don't always erase the temporary file and pass the startSize, so the temporary file will be remove if the server does not support it after all (because it is not sending the "bytes" header Also pass the expected etag for consistency even if it's not used in this case.	2014-12-18 12:13:12 +01:00
Daniel Molkentin	986b23856f	Make setup page usable from shibboleth ... Second patch to address #2607	2014-12-17 18:13:59 +01:00
Olivier Goffart	96872e2b3b	Download: When direct URL don't work, retry through webdav	2014-12-17 14:28:13 +01:00
Daniel Molkentin	42ffed3f57	Wizard: Show server errors when coming from shibboleth ... The wizard needs to be restored and rewound to the first page First patch to address #2607	2014-12-17 14:24:07 +01:00
Christian Kamm	a006c6962c	Move account state related logic into Account. ... The account state is now managed mostly by the Account itself instead of through Application. The gui can still control whether an account is signed out or not.	2014-12-17 12:01:10 +01:00
Olivier Goffart	b1d392e415	Download job: allow redirect on direct download link ... Issue #2614	2014-12-16 11:51:25 +01:00
Olivier Goffart	cbf00e9378	Connection Validator: Fix connection warning ... The timeout signal does not exist. Timeout is handled as a normal network arror.	2014-12-16 11:48:15 +01:00
Olivier Goffart	414838cae8	Settings dialog: remove the code that was updating the account icon ... I just wanted to fix the warning: QObject::connect: No such slot OCC::SettingsDialog::slotUpdateAccountIcon(QIcon) in settingsdialog.cpp:108 It turns out we don't need anymore the signal or any of the code that was updating the account icon in the settings dialog since it we now have a fixed icon	2014-12-16 11:36:52 +01:00
Olivier Goffart	3ee14164db	network jobs: Refactor the redirect handling in AbdtractNetworkJob ... Move the redirect handling from CheckServerJob to AbstractNetworkJob, so we can later use it in any job (in preparation for task #2614)	2014-12-16 11:27:02 +01:00
Klaas Freitag	c6daa8e59b	Overlays: In case of folders, make sure to append slashes at end. ... This fixes #2373	2014-12-12 16:38:07 +01:00
Klaas Freitag	7cc6c1a10f	Theme: Add a missing dot.	2014-12-12 13:37:02 +01:00
Klaas Freitag	7f73cc1694	Theme: split the about string apart to have small translation units.	2014-12-12 13:33:38 +01:00
Daniel Molkentin	9a13ec736d	Fix OS X compilation	2014-12-11 15:08:13 +01:00
Christian Kamm	1a3041690f	ConValidator: Simplify and cleanup. ... * This way using it with multiple accounts will be easier. * Timeouts on the authed requests are handled.	2014-12-11 14:48:01 +01:00
Christian Kamm	84e5ad7346	FolderMan: Delete old journal file when adding folder. #2606	2014-12-11 12:28:01 +01:00
Christian Kamm	4559bb5553	Fix counting of affected files. #1132 ... * Also ensure the maximum is always >= the current value. * Take care to handle the ULLONG_MAX value that's sometimes used as _completedFileCount.	2014-12-11 11:33:42 +01:00
Christian Kamm	d8c59fcb73	Use connection validator to ping the server. #2485 ... * Stop the quota job from having an effect on account status as it can sometimes take a long time to reply. See #2485 and owncloud/core#12744. * Instead of indirectly using the quota job, use the connection validator to regularly ping the server with a basic PROPFIND for 'getlastmodified' on /. This request was usually fast for users even when the quota PROPFIND was slow.	2014-12-10 13:40:11 +01:00
Christian Kamm	53d5de685c	Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/gui/folder.cpp src/gui/folder.h src/libsync/networkjobs.cpp src/libsync/owncloudpropagator.h src/libsync/propagatedownload.cpp	2014-12-10 13:01:36 +01:00
Olivier Goffart	a3e7f513e6	SocketAPI: use the canonical path ... Issue #2591	2014-12-09 20:48:51 +01:00
Daniel Molkentin	d034f10af3	Fix compilation	2014-12-08 19:25:57 +01:00
Daniel Molkentin	a2b817f0c0	mirall.qrc -> client.qrc	2014-12-08 18:00:29 +01:00
Daniel Molkentin	d5f2c36abd	Mirall -> (Desktop) Client	2014-12-08 17:54:32 +01:00
Daniel Molkentin	d86b3f04b1	Merge branch 'master' into rename_client	2014-12-08 17:44:04 +01:00
Klaas Freitag	72a90199db	Wizard: Removed superflous text, as it is already in the header. ... This fixes mirall#2358	2014-12-08 11:12:15 +01:00
Klaas Freitag	49bb861045	Removed useless debug output	2014-12-06 12:37:53 +01:00
Klaas Freitag	1d6661e7e4	Fix the number of displayed items in progress display for removes. ... This fixes mirall#1132 A variable that counts the affected items of the propagator operation done on a item was added to SyncFileItem. Usually that is 1 because most operations affect only the item itself. But for removes, the number can be higher for directories (one remove removes a whole tree). Some rearrangements were needed.	2014-12-06 12:31:45 +01:00
Christian Kamm	40f44c2389	DB: Delete corrupt database. #2547 ... * Also use readonly DB access for SocketAPI.	2014-12-04 15:35:55 +01:00
Olivier Goffart	441b5bd1dc	Setup Wizard: remove all folder definition before starting a new sync ... Issue #1989	2014-12-04 15:18:27 +01:00
Christian Kamm	dc2f0d59cb	FolderWizard: Clean up naming of 'add folder' button. #2371	2014-12-04 10:47:26 +01:00
Christian Kamm	4dcfacf2d5	Fix compile. :/	2014-12-04 09:59:24 +01:00
Christian Kamm	b7485106ef	NetworkJobs: Set timeout to 5 minutes everywhere.	2014-12-04 09:54:17 +01:00
Christian Kamm	f82893496b	Fix typo.	2014-12-04 09:54:15 +01:00
Christian Kamm	c418e58f88	Etag job scheduling: Silence warnings, make prettier.	2014-12-04 09:52:13 +01:00
Klaas Freitag	9ea359de52	GUI: Check if there are sync folders configured and how proper msg. ... This fixes #2264	2014-12-03 17:11:42 +01:00
Christian Kamm	b7d7f424c5	FolderMan: only touch _currentSyncFolder when done #2407 ... Also simplity terminateSyncProcess() to always terminate the *current* sync run. Only one can be running at a time anyway.	2014-12-03 13:46:37 +01:00
Markus Goetz	46bd473664	Folders: Move ETag check scheduling to FolderMan ... Only 1 check per time is able to run now. For #2553 Might improve #2479 #2485 #2534	2014-12-02 22:32:54 +01:00
Daniel Molkentin	6030fec6cb	Fix typo	2014-12-02 15:08:15 +01:00
Daniel Molkentin	b7323dc403	Merge branch 'master' into rename_client	2014-12-02 14:33:28 +01:00
Daniel Molkentin	c6d74d6c12	Fix typo	2014-12-02 14:33:17 +01:00
Daniel Molkentin	a42709f814	Namespace fixes	2014-12-02 14:20:13 +01:00
Daniel Molkentin	3016844dd7	Merge branch 'master' into rename_client ... Conflicts: README.md src/gui/folderman.cpp src/gui/settingsdialog.cpp src/libsync/accessmanager.cpp src/libsync/propagateupload.h	2014-12-02 13:37:22 +01:00
Olivier Goffart	8fbb55a0c8	Wizard: Fix escaping of error message. ... An url can contains % signs, so if it does, the errors formating was wrong because of the use of QString::args Also, the error is in html format, and we need to let the message box know that, otherwise we will just see <br/>	2014-12-02 10:22:46 +01:00
Olivier Goffart	f046a7e7fe	Wizard: Attempts to really close the database when starting the backup ... Still for issue #1989	2014-12-02 10:22:46 +01:00
Markus Goetz	92ce707268	Bandwidth: Fix issue with removed download jobs ... The measuring broke when a job that is currently measuring was removed.	2014-12-02 09:37:48 +01:00
Daniel Molkentin	3f5887cc03	Merge pull request #2565 from owncloud/accountsettings_itemsontop ... Refactor generic settings dialog	2014-12-01 15:01:45 +01:00
Olivier Goffart	fb3f5d86cf	Fix compilation after merge	2014-12-01 14:41:39 +01:00
Olivier Goffart	512492bf30	Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/libsync/propagatedownload.cpp	2014-12-01 14:37:47 +01:00
Daniel Molkentin	afee1ee1c0	Make all ptr-based members either const or check for their existance	2014-12-01 13:08:49 +01:00
Olivier Goffart	3253cc38b2	Propagator upload: Mark error while opening the file as SoftError ... Because otherwise a lot of error are shown to the user when the user deletes a directory that is syncing Task #1981	2014-12-01 12:22:52 +01:00
Olivier Goffart	b154e1baa1	Nautilus shell integration: Use fallback when XDG_RUNTIME_DIR is not defined ... Same fallback as in Qt5 Task #2477	2014-12-01 12:06:09 +01:00
Daniel Molkentin	714599aeaa	Refactor generic settings dialog ... - move items on top like on Mac OS (right is free for accounts now) - The account icon no longer reflects the current status (in prep for multi-account)	2014-12-01 11:37:06 +01:00
Olivier Goffart	fc3a8b944e	Propagator: Don't forget to mark the direcotry as finished if its first job fails ... Otherwise we would go ahead and propagate the content of the directory	2014-11-27 15:36:13 +01:00
Olivier Goffart	2ed2ef3b28	Propagator QNAM: Fix resuming ... We forgot to account the fact that we could have been resuming when comparing the size of the Content-lenght to the size of the temporary file	2014-11-27 14:50:49 +01:00
Olivier Goffart	e7e91b6931	Revert "Folder: Don't blindly trigger sync on first EtagJob result" ... We need to do a sync even if the etag was empty because we do not know if this is because the etag really changed or because it was new. Also, some part of the code rely on this fact to schedule a sync. The fact that there is two sync with 30 sec at the beginning is not a big problem, because we also need to do the sync the put the directory etag in the db. This reverts commit 1c001ee138.	2014-11-27 12:50:36 +01:00
Olivier Goffart	1f9d02e7fa	Shibboleth: Fix our implemtnation of CookieJar::deleteCookie ... It was deleting too many cookies. That function is virtual in Qt5 and is used when adding cookie. But some Shibboleth have several cookies with the same name, and we need to keep them. Our implementaiton was meant to delete all the shiboleth cookies when we want to log out	2014-11-27 12:26:59 +01:00
Olivier Goffart	c9c1547813	Compile with Qt4 ... (QSharedPointer::reset is only in Qt5)	2014-11-25 16:24:47 +01:00
Olivier Goffart	9a8c868793	Propagator upload: Remove debug output	2014-11-25 15:34:06 +01:00
Olivier Goffart	13ec5da84e	neon jobs: Start them in their thread.	2014-11-25 15:08:32 +01:00
Klaas Freitag	3e34d000f2	Propagator: Add the chunk size to PUT requests.	2014-11-25 10:21:33 +01:00
Olivier Goffart	734db6f932	propagate Upload: Let the poll job count for a job ... In order to avoid that there are many concurrent poll jobs that takes all the QNAM channel and causes timeouts of queued jobs	2014-11-24 13:33:13 +01:00
Olivier Goffart	d76e3c0488	Parallel chunk upload: abort all chunks if one of them errors out	2014-11-24 12:05:25 +01:00
Olivier Goffart	c0de20dda0	UploadDevice: reduce debug verbosity	2014-11-24 12:05:25 +01:00
Markus Goetz	79c37f9fe4	Poll Jobs: Properly use DB index ... Why do we sometimes use 0-based, sometimes 1-based indices?	2014-11-24 11:35:39 +01:00
Olivier Goffart	c460b3f3be	Bandwith manager: It needs do be initialiazed after the limits of the propagator	2014-11-21 16:55:46 +01:00
Markus Goetz	1c001ee138	Folder: Don't blindly trigger sync on first EtagJob result ... For #2352	2014-11-21 16:47:15 +01:00
Olivier Goffart	78362af168	Compile with TOKEN_AUTH_ONLY ... (QtGui is not included in that case)	2014-11-21 12:15:41 +01:00
Olivier Goffart	1c58b75ac2	Merge branch '1.7'	2014-11-21 11:08:20 +01:00
Olivier Goffart	41568c885d	Propagator: only check the content-lenght if it is there ... If content-lenght is 0, don't chack it is the size we recieved. It can be zero when using HTTP chunk encoding. Also do not remove the temporary file so it can be re-used on the next sync and ask for a new sync immediatly to re-do the sync. Fixup the fix to task #2528	2014-11-21 11:03:14 +01:00
Klaas Freitag	65a307970b	Propagator: Compare the actual file size with the request content length ... The values must match. Otherwise the request did succeed, but the file was not downloaded completely. This fixes https://github.com/owncloud/mirall/issues/2528	2014-11-20 18:49:34 +01:00
Christian Kamm	3e3ca14b4c	Print ssl library version only on Qt >=5.0.0.	2014-11-20 13:46:44 +01:00
Christian Kamm	8b45d1c928	Sync: Change force-sync interval to 2h everywhere. #2297	2014-11-20 13:38:32 +01:00
Christian Kamm	0fe7a69b39	FolderWatcher: Detect own changes. #2297	2014-11-20 13:16:29 +01:00
Christian Kamm	6d09f1b6c0	Folder watcher now reports changing paths instead of dirs.	2014-11-20 12:51:16 +01:00
Christian Kamm	1ada20ac7b	Linux folderwatcher: Get full path of changed file. #2297	2014-11-20 12:42:59 +01:00
Christian Kamm	d04eedeb8d	OSX: Trust the file watcher. #2297 ... * Use a bigger default force sync interval (2h) * Allow the file watcher to schedule a sync while a sync for the same file is running.	2014-11-20 12:42:59 +01:00
Christian Kamm	f275002ebe	Merge branch '1.7'	2014-11-20 12:41:06 +01:00
Christian Kamm	d4e0941c27	Windows filewatcher: switch to ReadDirectoryChangesW. ... Based on danimo's #2454 fix for #2455 and related to #2297.	2014-11-20 12:36:17 +01:00
Christian Kamm	9dc57359b9	csync db files: Hide after some commit/transactions. #2461 ... The shm and wal files are only created later.	2014-11-20 12:30:04 +01:00
Christian Kamm	4d7b8bdb25	Merge remote-tracking branch 'origin/1.7' ... Conflicts: OWNCLOUD.cmake test/CMakeLists.txt test/testfolderwatcher.h	2014-11-19 14:45:25 +01:00
Christian Kamm	421a8cc6b7	Windows: Make unit tests compile.	2014-11-19 14:18:37 +01:00
Christian Kamm	3706c76622	useLegacyJobs: Fix logic.	2014-11-19 10:31:42 +01:00
Olivier Goffart	9a6710e330	Propagator: add a bit of documentation comments	2014-11-18 17:54:53 +01:00
Olivier Goffart	1113980b20	Propagator: Change the scheduler ... It still needs to be a bit optimized, but it allows to paralelized jobs between directories (this is required to paralelize the mkcol)	2014-11-18 17:35:31 +01:00
Olivier Goffart	0b275c4933	Revert "WiP: switch to ReadDirectoryChangesW"	2014-11-17 11:11:13 +01:00
Olivier Goffart	e529bbed90	Merge pull request #2454 from owncloud/fswatcher_readdirectorychanges_port ... switch to ReadDirectoryChangesW	2014-11-17 09:43:29 +01:00
Olivier Goffart	a3b21022af	new bandwith limiting: Do a test on the Qt version to activate it ... We need Qt 5.3.3. If the compiled qt version is Qt 5 but smaller than Qt 5.3.3, do a runtime check. OWNCLOUD_NEW_BANDWIDTH_LIMITING is still there for a special setup in which we patch Qt with the patches	2014-11-14 17:29:28 +01:00
Olivier Goffart	ad92e7b888	Move UploadDevice to the right header	2014-11-14 16:40:13 +01:00
Olivier Goffart	c73522de2e	Remove ChunkBlock ... It is not in used	2014-11-14 16:39:39 +01:00
Olivier Goffart	14f5e8e32e	Move all the neon code to the _legacy files	2014-11-14 16:13:50 +01:00
Olivier Goffart	f3797abecf	Fix the PropfindJob ... -the namespace mangling was wrong -And the way we read the reply did not work	2014-11-14 15:03:48 +01:00
Markus Goetz	5b7ec19778	SyncEngine: Also output the neon version	2014-11-14 15:02:09 +01:00
Olivier Goffart	1310bef528	Port the propagate mkdir to QNAM ... This way we can make it parallel	2014-11-13 18:57:07 +01:00
Markus Goetz	348b7bf4eb	SyncEngine: Output versions used	2014-11-12 09:21:37 +01:00
Markus Goetz	30479cc5a2	Wizard: Properly show error message	2014-11-12 09:21:37 +01:00
Daniel Molkentin	7246011b62	Merge pull request #2459 from owncloud/typo ... fix typo	2014-11-12 00:09:22 +01:00
Daniel Molkentin	281c0e1553	Merge branch 'master' into rename_client ... Conflicts: CMakeLists.txt src/gui/main.cpp src/libsync/accessmanager.cpp src/libsync/accessmanager.h src/libsync/owncloudpropagator_p.h	2014-11-12 00:07:59 +01:00
Daniel Molkentin	cdac8d56d5	Merge remote-tracking branch 'origin/master' into crashreporter ... Conflicts: src/libsync/utility.cpp src/libsync/utility.h	2014-11-11 23:53:38 +01:00
Olivier Goffart	7b4be209aa	MOVE: fix moving with special character. ... The Destination header need to be %-encoded	2014-11-11 16:27:06 +01:00
Olivier Goffart	c712b7c46c	Parallel MOVE by porting the job to qnam	2014-11-11 16:09:01 +01:00
Olivier Goffart	22c6892870	DELETE: Error out if the HTTP code is not 204	2014-11-11 14:32:25 +01:00
Olivier Goffart	134650eb44	Parallel DELETE	2014-11-11 13:19:29 +01:00
Olivier Goffart	506ba022f1	Split propagator_qnam.cpp into propagateupload.cpp and propagatedownload.cpp	2014-11-11 12:17:10 +01:00
Klaas Freitag	fc6d572a6c	Make compile against Qt4	2014-11-11 10:10:46 +01:00
Daniel Molkentin	b54c079766	Adjust issue urls	2014-11-09 23:38:07 +01:00
Daniel Molkentin	2db17a57d2	Fix header names	2014-11-09 23:25:57 +01:00
Daniel Molkentin	a992c5b8d3	Fix build	2014-11-09 23:10:18 +01:00
Daniel Molkentin	269b59c2ba	More CMake adjustments	2014-11-09 22:58:24 +01:00
Daniel Molkentin	d57d3cf1f6	Drop Mirall from strings	2014-11-09 22:35:29 +01:00
Daniel Molkentin	ae85aa33fd	Adjust namespaces	2014-11-09 22:34:07 +01:00
Daniel Molkentin	f2eadacf09	Remove "Mirall" from class names	2014-11-09 22:30:29 +01:00
Daniel Molkentin	9ebc41ed6f	Remove "Mirall" from cmake project files	2014-11-09 22:30:05 +01:00
Olivier Goffart	7ae6712d56	Add a few Q_DECL_OVERRIDE	2014-11-08 11:21:48 +01:00
Olivier Goffart	98a283b4ec	Fix clang warnings	2014-11-08 11:21:48 +01:00
Olivier Goffart	d524f6b395	Fix compilation errors after merge	2014-11-08 11:11:05 +01:00
Olivier Goffart	6b716683e2	Merge the long PUT Poll URL feature with the new sql backend	2014-11-08 11:09:50 +01:00
Olivier Goffart	ba2c33af0b	Fix the il branch merge: Move the bandwidthmanager to libsync	2014-11-08 10:52:14 +01:00
Olivier Goffart	de11f602d5	Merge remote-tracking branch 'origin/il' ... Conflicts: csync/src/csync_private.h src/CMakeLists.txt src/gui/folder.cpp src/libsync/owncloudpropagator.cpp src/libsync/owncloudpropagator.h src/libsync/propagator_qnam.cpp src/libsync/propagator_qnam.h src/libsync/syncengine.cpp src/libsync/syncengine.h src/mirall/syncjournaldb.cpp	2014-11-08 10:48:36 +01:00
Volkan Gezer	260c8e0227	fix typo	2014-11-07 17:51:15 +01:00
Daniel Molkentin	7c034b427e	Handle invalid handle & fix an issue found during code review	2014-11-07 14:52:31 +01:00
Daniel Molkentin	f25d175b5d	Merge remote-tracking branch 'origin/1.7'	2014-11-06 19:54:20 +01:00
Olivier Goffart	b70ecc3dd3	Never overwrite the mtime from the local file system in the db when updating the metadata ... Attempt to fix #2431	2014-11-06 15:13:10 +01:00
Daniel Molkentin	89670e5ce4	Folderwatcher_win: handle conversion error	2014-11-06 12:54:33 +01:00
Christian Kamm	174e1acbc7	Folder::wipe(): Remove partial downloads and -shm,-wal db files.	2014-11-06 12:49:02 +01:00
Christian Kamm	1f09a24a72	Resync button: Remove partial downloads too. #2445	2014-11-06 12:17:04 +01:00
Christian Kamm	eed91ddf46	Legacy propagator: Don't use mtime retrieved via _fstat64. ... May be the cause of #2431	2014-11-06 12:16:55 +01:00
Daniel Molkentin	96a7118d05	WiP: switch to ReadDirectoryChangesW	2014-11-06 12:04:33 +01:00
Klaas Freitag	6eec896282	FolderWatcher: Check for hidden outside of loop	2014-11-06 09:23:30 +01:00
Christian Kamm	a49a6bfd88	Logging: Report setModTime failures. ... Ths may be helpful for #2252 and maybe even #2431.	2014-11-05 13:20:19 +01:00
Christian Kamm	b87931c0a9	Logging: Print etags, not just result of comparison.	2014-11-05 13:08:53 +01:00
Christian Kamm	9b640d586b	Wizard: Fix local folder warning in advanced setup wizard. #2362 ... The _oldLocalFolder should always be the previously configured folder, not the one that was most recently chosen on the wizard page.	2014-11-05 12:10:41 +01:00
Christian Kamm	7440ffc0e6	Download: Fix data loss when rename fails. #2428	2014-11-05 11:00:46 +01:00
Markus Goetz	cf6219bb6f	NetworkJobs: Improve timeout handling and increase timeout by 5 sec	2014-10-30 11:54:58 +01:00
Christian Kamm	45eeb5065f	Download: Avoid overwriting file with case conflict. #1914	2014-10-30 09:06:53 +01:00
Klaas Freitag	ef16c409ef	Merge pull request #2393 from svkurowski/issue-2215 ... Switch monochrome systray icon color depending on systray brightness	2014-10-29 14:54:33 +01:00
Olivier Goffart	1eccfb798f	Add missing license headers ... Part of #2068	2014-10-29 13:30:46 +01:00
Klaas Freitag	b9b9f3c136	Propagator: Schedule a resync immediately if file is modified during upload	2014-10-29 13:10:56 +01:00
Olivier Goffart	7810da51a8	Propagator: report error when deleting directories ... Will help to understand why a directory cannot be removed Will help for #2348	2014-10-29 12:23:48 +01:00
Christian Kamm	4e20a02fe5	SyncJournalDB: Add filesize column to metadata. ... * Alter table to include column. * Make get/set in SyncJournalDB store and load it. * Make csync recover the stat_t's size member from it.	2014-10-29 09:53:36 +01:00
Markus Goetz	7bad731ad2	CheckServerJob: Guard again null reply ... Lucia had reported a crash in this function	2014-10-29 09:38:20 +01:00
Daniel Molkentin	dc1e73dcb7	Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/libsync/syncjournaldb.cpp test/CMakeLists.txt	2014-10-28 23:27:58 -04:00
Markus Goetz	782463589e	ownSql: Also mention filename	2014-10-28 21:50:09 +01:00
Markus Goetz	ff570c4a6b	ownSql: Don't set busy timeout on bad object	2014-10-28 21:46:30 +01:00
Klaas Freitag	105ff694f2	SyncEngine: Handle 503 condition as soft error to properly handle etags. ... Otherwise the ETags could be removed from the db and cause file deletes.	2014-10-28 17:13:21 +01:00
Olivier Goffart	5723abe6eb	Merge remote-tracking branch 'origin/fix_service_unavailable' into 1.7	2014-10-27 20:49:46 +01:00
Klaas Freitag	0692fea9d8	discovery: handle 503 reply code from server for directories ... 503 for directories means that the dir is a mounted directory from an external mount which currently is not available. The directory is ignored and not traversed into during discovery phase.	2014-10-27 19:21:12 +01:00
Markus Goetz	b0882a5cd2	Fix compile	2014-10-27 17:18:49 +01:00
Markus Goetz	4c1a0005e6	Make two more asserts usable in nondebug	2014-10-27 16:01:18 +01:00
Markus Goetz	05ceed926c	SyncEngine: Log for an assert, return -1 for nondebug compile	2014-10-27 15:52:17 +01:00
Olivier Goffart	ce300d88ee	Wizard: show the choice to start a clean sync if the directory exist even on new accounts ... Task #2406	2014-10-27 13:05:17 +01:00
Brandon Coleman	05c0249672	correct spelling on user is empty error.	2014-10-27 07:59:31 -04:00
Brandon Coleman	2498c13078	options are required at the beginning of owncloudcmd. ... Conflicts: src/owncloudcmd/owncloudcmd.cpp	2014-10-27 07:59:31 -04:00
Olivier Goffart	cddad94e45	Selective Sync: change the label text ... to specify that the files will be removed from the local folder Task #2404	2014-10-27 11:33:25 +01:00
Brandon Coleman	ece1100d65	options are required at the beginning of owncloudcmd.	2014-10-26 15:33:50 -05:00
Brandon Coleman	e5b03634ae	correct spelling on user is empty error.	2014-10-25 11:01:58 -05:00
Sascha Vincent Kurowski	59f18583d1	Switch monochrome systray icon color depending on systray brightness. ... https://github.com/owncloud/mirall/issues/2215 As of version 10.10 Yosemite, Mac OS X offers the user the option to use a dark version of the dock and menu bar. The systray icon was black even on the dark menu bar, thus rendering it nearly impossible to spot.	2014-10-24 21:52:41 +02:00
Christian Kamm	1c4072e231	Selective sync ui: Fix #2390	2014-10-24 16:11:29 +02:00
Klaas Freitag	86e13ea06f	FolderMan: Use folderForPath method to get the folder object for a path	2014-10-24 15:07:33 +02:00
Klaas Freitag	c12d3870cd	Merging work branch for a bug fix for bug #2379. ... It closes all db connections if the new local path is a already synced folder path.	2014-10-24 14:43:48 +02:00
Christian Kamm	fce76a13cb	Sync scheduling: Only do a follow-up sync 3 times. #2355 ... After trying again immediately for 3 times, no more fast follow-ups are run until a sync finishes without needing a fast follow-up.	2014-10-24 13:31:48 +02:00
Christian Kamm	82b14370fc	Sync scheduling: Only retry up to twice after fail. #2386 ... Previously when a sync failed, we'd retry very soon (30s) no matter how often a sync had failed before. After this change we'll retry twice and then back off to the regular 5min interval.	2014-10-24 13:31:48 +02:00
Klaas Freitag	a9d8e9dcd8	Setupwizard: Close the database in case of moving the folder.	2014-10-24 13:05:29 +02:00
Klaas Freitag	542e989046	Setup Dialog: Terminate sync if the new folder is a an actual folder.	2014-10-24 11:59:56 +02:00
Klaas Freitag	f5c199740d	Followup: To unregister a path in socket api use the alias of folder.	2014-10-24 11:36:01 +02:00
Klaas Freitag	f37b81c8b7	Unregister path in socketapi before removing it.	2014-10-24 11:12:06 +02:00
Christian Kamm	c0ea69ee24	SqlQuery: Reset after each successful exec(). ... In e5269a4151 I moved the reset calls to before the first bindValue() because we didn't consistently reset() after exec(). However, some queries may keep a lock on the database so it is necessary to reset() as soon as the data is read. This commit reintroduces these reset() calls.	2014-10-24 10:11:00 +02:00
Christian Kamm	5640cbf653	SqlDatabase: Make it non-copyable.	2014-10-24 09:56:30 +02:00
Daniel Molkentin	3c7ff97ed4	SocketAPI: Don't use a theme dependent name for now ... We will revert this once #2388 is implemented	2014-10-23 17:46:17 -04:00
Christian Kamm	e5269a4151	Add SyncJournalDB autotests. ... There also was a bug in syncjournaldb: in some error conditions the sql query wasn't reset properly. We now always reset a query before calling bindValue.	2014-10-23 15:15:47 +02:00
Markus Goetz	0d9ae241c9	OwnCloudFinder: Rename to SyncStateFinder ... Project file names stay the same, only the output file(s) changed	2014-10-23 12:19:19 +02:00
Klaas Freitag	e726e7aad8	util: Use canonicalFilePath to clean the path opened by explorer. ... This fixes bug #2299	2014-10-23 10:41:07 +02:00
Olivier Goffart	de56b753d1	protocolwidget: fix string that need to use plural translation	2014-10-22 18:26:40 +02:00
Olivier Goffart	e46ab72718	SocketAPI: Show error when we are not allowed ... Issue #1931	2014-10-22 17:25:38 +02:00
Olivier Goffart	9330d2e1e8	SocketAPI: always clean the path and use the normal slash	2014-10-22 15:33:35 +02:00
Olivier Goffart	020e19f770	SocketAPI: Fix all files are new ... (Introduced because of bad resolution of merge conflict in my last commit)	2014-10-22 15:32:09 +02:00
Olivier Goffart	22dd275b15	SocketAPI: Fix the shared symbol, including for owncloud6 Shared dir ... The shared symbol would not appear if the status came for estimateState Also added the shared symbol for the Shared/ directories (owncloud 6 compat)	2014-10-22 15:10:21 +02:00
Markus Goetz	6342e76e19	Wizard: Change misleading text	2014-10-22 15:06:33 +02:00
Markus Goetz	55dd149a03	SocketAPI: Less verbose	2014-10-22 14:43:23 +02:00
Markus Goetz	39a0f28753	Move qtmacgoodies module forward	2014-10-22 14:43:03 +02:00
Olivier Goffart	7740150576	Selective Sync widget: add a "Loading..." label ... Task #2088	2014-10-22 13:48:05 +02:00
Olivier Goffart	4f367faf4d	SocketAPI: Show an error for files inside the selective sync folders ... Task #2283	2014-10-22 13:31:20 +02:00
Olivier Goffart	3840186dd8	Utility: fix function signature	2014-10-22 13:31:20 +02:00
Daniel Molkentin	ed51a45187	Add title to selective sync dialog	2014-10-22 06:29:22 -04:00
Christian Kamm	c832226aa1	Merge remote-tracking branch 'origin/1.7' into master	2014-10-22 12:25:58 +02:00
Christian Kamm	a20375372d	Blacklist: Don't ignore error files forever. #2247 ... Instead try them again regularly, but don't show the user any error messages if the error persists.	2014-10-22 12:25:18 +02:00
Olivier Goffart	6073e3f345	SocketAPI: do not show a progress icon in case of errors	2014-10-22 12:19:57 +02:00
Olivier Goffart	d31ccacf57	SocketAPI: show an ignored icon for paused folders	2014-10-22 12:19:57 +02:00
Klaas Freitag	3243365210	JournalDb: Do not longer always have a write operation on version table. ... Rather read the value from the table and if it is what we expect do not write it.	2014-10-22 10:59:58 +02:00
Christian Kamm	7ae0338f5c	Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/CMakeLists.txt src/cmd/cmd.cpp src/gui/socketapi.h src/libsync/syncengine.h test/CMakeLists.txt	2014-10-22 10:41:55 +02:00
Markus Goetz	a993496ab4	SyncJournalDB/SyncEngine: Properly detect 1.5 upgrade ... Else we end up never reading file data from the DB.	2014-10-21 20:25:15 +02:00
Markus Goetz	d7ac878efd	SyncJournalDB: Fix deleteBatch	2014-10-21 16:37:51 +02:00
Markus Goetz	e5a0db8782	SyncJournalDB: Fix version table filling up	2014-10-21 16:37:39 +02:00
Markus Goetz	24d4840c93	SyncJournalDB: Set WAL files to hidden	2014-10-21 15:58:56 +02:00
Markus Goetz	fa70798fb5	SyncJournalDB: WAL checkpoint at end of sync	2014-10-21 15:41:11 +02:00
Markus Goetz	1af480ea3b	CMake: Fix RPATH	2014-10-21 15:39:31 +02:00
Olivier Goffart	a76fc0ee5a	SocketAPI: send the change of the parent folder in the broatcast ... Also do not compute the status if there is nno listeners	2014-10-21 15:26:51 +02:00
Olivier Goffart	80e86d6c1b	ownsql: fix warning with clang ... warning: equality comparison with extraneous parentheses [-Wparentheses-equality]	2014-10-21 14:59:42 +02:00
Olivier Goffart	dc13e39bb1	SocketAPI: do not have a special case for UPDATE_VIEW on windows ... This is a relique on the old times when there was no persistant connection in the windows plugin	2014-10-21 14:57:50 +02:00
Markus Goetz	5d048c18bc	Sqlite3: Switch to WAL ... This is faster.	2014-10-20 23:09:28 +02:00
Markus Goetz	0fb779d363	SyncEngine: De-initialize recursive PROPFIND value correctly	2014-10-20 22:24:28 +02:00
Daniel Molkentin	d0ed82a686	We need SqlDatabase and SqlQuery to be exported ... Required due to 53b3e5af1b	2014-10-20 19:58:10 +02:00
Klaas Freitag	26f068bcab	SocketApi: Properly manage the database connections. ... Removed the fishy closeDb() method of SqlQuery again.	2014-10-20 17:31:33 +02:00
Markus Goetz	f0dc3725e8	ownSql: Still also use sqlite3 busy handler	2014-10-20 17:26:25 +02:00
Markus Goetz	2de22b408b	SyncEngine: Avoid transaction warning	2014-10-20 17:20:58 +02:00
Klaas Freitag	04b62b139d	Fix compile error and add warning.	2014-10-20 17:10:34 +02:00
Klaas Freitag	2f20f3c65d	SocketApi: Instanziate Object to call QFileInfo::exists ... QFileInfo on Qt4 does not have static members.	2014-10-20 17:05:14 +02:00
Klaas Freitag	53b3e5af1b	SocketAPI: Use new class SqlQuery to cache the sql queries. ... This results in better handling of the BUSY condition through SqlQuery.	2014-10-20 16:55:37 +02:00
Markus Goetz	7dbb98c2e5	SyncEngine/SyncJournalDB: Don't keep transactions open	2014-10-20 16:50:55 +02:00
Markus Goetz	8b35cda4c6	SyncEngine: Refactor startSync() code	2014-10-20 15:51:50 +02:00
Markus Goetz	cb36a37779	SyncEngine/SyncJournalDB: Fix creation of .csync_journal	2014-10-20 14:27:00 +02:00
Markus Goetz	704c5f2de7	NetworkJobs: Higher timeout for pre-oC7 ... Pre-oc7 has PHP session locking for PROPFIND (by recursive PROPFIND in csync_update), the oc7 doesn't.	2014-10-20 13:34:09 +02:00
Klaas Freitag	3fcb0d2d6b	SocketAPI: Properly release precompiled statements. Use sqlite3_close ... rather than its v2 equivalent. That should make it compile on older linux platforms.	2014-10-20 10:51:03 +02:00
Klaas Freitag	2dfe0ed42e	Remove unused variable, fixes compile warning.	2014-10-20 10:51:03 +02:00
Daniel Molkentin	6048a7143a	Revert "Remove references to qsqlite3" ... QtWebkit needs it This reverts commit b1c10c8454.	2014-10-20 10:27:34 +02:00
Klaas Freitag	b5736fb5a7	Sql: Handle SQLITE_BUSY properly for sqlite3_step and sqlite3_prepare. ... Repeat the statements a couple of times and sleep in between.	2014-10-18 16:16:29 +02:00
Klaas Freitag	7822a6b000	csync_statedb: Finalize the precompiled statements after discovery. ... As described in http://www.sqlite.org/cvstrac/wiki?p=MultiThreading precompiled statements should not be used across thread borders. However, the reconcile phase would reuse the statements if defined (it calls statedb function from a different thread) so it is saver to finalize them at the end of the update run.	2014-10-18 14:18:11 +02:00
Olivier Goffart	a5bd437d48	Propagator: Fix renaming of files and case confflicts ... Better fix for #1385 and #2318	2014-10-17 16:15:03 +02:00
Olivier Goffart	08156186fa	Revert "propagator: Do not check for case clash when renaming" ... This caused test regressions in t8.pl (#2318) This reverts commit dad8c1c27c.	2014-10-17 16:15:03 +02:00
Markus Goetz	f1006ca8b0	owncloudcmd: Always need exclude list ... Try to load the system list or the user supplied list. For #2322	2014-10-17 15:58:01 +02:00
Markus Goetz	93c85711d1	ownSql: Always use finish()	2014-10-17 13:39:48 +02:00
Markus Goetz	e5ef5f2410	Revert "socketapi: if the filename is empty, it's actually /" ... Not needed, the socketapi checks for "". This reverts commit 561e3c780d.	2014-10-17 13:29:34 +02:00
Daniel Molkentin	52a5729298	Merge pull request #2319 from owncloud/sqlite_capi ... Introduce a common sqlite layer across csync and mirall. This avoids conflicts that both each load different and/or updated sqlite versions.	2014-10-17 12:11:27 +02:00
Daniel Molkentin	4525161e7c	Updater: allow overriding update URL through environment	2014-10-17 12:07:18 +02:00
Daniel Molkentin	dee6d18d69	Discovery phase: Improve UI by quoting folder names	2014-10-17 12:07:18 +02:00
Daniel Molkentin	d44179142f	Discovery phase: Properly decode percent encoding	2014-10-17 12:07:18 +02:00
Klaas Freitag	c66c01245b	Beautified some debug logging strings.	2014-10-17 11:35:06 +02:00
Markus Goetz	b1c10c8454	Remove references to qsqlite3	2014-10-16 17:51:17 +02:00
Markus Goetz	1d5b3aadea	sqlite3: Bundle 3.8.6 for Mac and Windows ... it is linked into ocsync.	2014-10-16 17:38:45 +02:00
Markus Goetz	2d420cd72c	ownSql: Always use SQLITE_TRANSIENT ... More safe.	2014-10-16 15:30:50 +02:00
Markus Goetz	707d6880a8	main: Show console message if already running	2014-10-16 15:25:33 +02:00
Markus Goetz	dbad1a8d45	ownSql: Don't allow copying of SqlQuery ... This fixes a crash on OS X where the destructor calls sqlite3 to invalidate the underlying handle.	2014-10-16 15:10:25 +02:00
Klaas Freitag	36eaff92e5	JournalDb: Some Sql statement fixes, make t7 work again. ... plus some minor fixes.	2014-10-16 11:22:57 +02:00
Klaas Freitag	e51c299937	ownSql: create an null value of an empty string in bindValue.	2014-10-16 11:20:50 +02:00
Klaas Freitag	8c7953a47c	ownSql: Proper initialization of result value plus assert on it.	2014-10-16 11:20:21 +02:00
Daniel Molkentin	4527784905	Second part of #1661 ... - QT_INSTALL_TRANSLATIONS was not defined in Qt5 - Some languages have been split up in multiple qm's. We only need qtbase for now	2014-10-16 11:08:29 +02:00
Klaas Freitag	ee8a93ae9a	ownSql: Proper initialization of errId	2014-10-16 10:39:10 +02:00
Klaas Freitag	89c51e7649	ownsql: Implement the transaction functions.	2014-10-15 19:47:25 +02:00
Olivier Goffart	2bba4134fb	owncloudgui: Fix a small leak ... The systray icon were not destroyed while qutting	2014-10-15 18:11:52 +02:00
Klaas Freitag	336c95ce5b	ownsql: Cleanups: In modern C++, we use 0 instead of NULL	2014-10-15 16:46:39 +02:00
Klaas Freitag	babe891242	SyncEngine: Show a warning if post update script can not be exec.	2014-10-15 16:43:58 +02:00
Klaas Freitag	eeb5ca42e0	ownsql: Added some paranthisis to make clear whats happening.	2014-10-15 13:29:25 +02:00
Daniel Molkentin	03ee742981	Correct lookup logic for Qt translations ... Fixes #1661	2014-10-15 09:33:38 +02:00
Klaas Freitag	0094c1ecf5	Make the sync work with new sql implementation.	2014-10-14 20:51:51 +02:00
Klaas Freitag	357c08c5b3	NewSQL: minor fixes to get stuff going	2014-10-14 12:18:33 +02:00
Klaas Freitag	e7d9ec50dc	Merge branch 'sqlite_capi' of github.com:owncloud/mirall into sqlite_capi ... Conflicts: src/mirall/socketapi.cpp	2014-10-14 11:43:10 +02:00
Klaas Freitag	09b0ba31ef	Sql: New implementation of ownSql class to go away from Qt's own Sql	2014-10-14 11:14:57 +02:00
Klaas Freitag	26ffa078ef	SocketAPI: Cache database conections and statements	2014-10-13 17:31:40 +02:00
Markus Goetz	eb60aca34f	SyncJournalDB: Clarify debug message	2014-10-13 17:29:26 +02:00
Markus Goetz	4d3020421a	SocketAPI: Remove old dbFileRecord function ... We will use the _capi functions	2014-10-13 17:29:26 +02:00
Markus Goetz	f1ce0a1cf3	SocketAPI: Use non-recursive (heuristic) computation of icons	2014-10-13 17:29:26 +02:00
Klaas Freitag	dd28a645a1	SocketAPI: Cleanup, removed helper namespace, added as private methods.	2014-10-13 15:38:57 +02:00
Klaas Freitag	561e3c780d	socketapi: if the filename is empty, it's actually /	2014-10-13 15:36:13 +02:00
Klaas Freitag	46fd79604d	JournalDb: Do not use static variable for path.	2014-10-13 14:49:53 +02:00
Klaas Freitag	d08c2de619	Use sqlite C api.	2014-10-13 14:14:43 +02:00
Jürgen Weigert	07bcaaebf9	unreachable --version code made reachable. ... error message improved.	2014-10-12 19:28:13 +02:00
Markus Goetz	b285e98988	SQlite: Print versions we use	2014-10-11 17:33:35 +02:00
Klaas Freitag	ab40ba2f75	owncloudcmd: Handle trust ssl switch correctly by overwriting trustssl ... method in a subclass of HTTPCredentials.	2014-10-11 17:17:43 +02:00
Klaas Freitag	bbcb8ba3e7	credentials: Allow to trust ssl certs in subclasses of HTTPCredentials. ... This allows to handle the --trust option in owncloudcmd. In the owncloudcmd subclass of the httpcredentials, we allow to manually trust the ssl certificate through a command line switch.	2014-10-11 17:17:43 +02:00
Markus Goetz	ef48de34f7	Logger: Log the thread pointer ... Maybe we can somehow reduce this to make it not so many characters wide?	2014-10-11 16:58:47 +02:00
Olivier Goffart	7e898cf60c	SelectiveSync: rename blacklist to selectiveSyncBlackList in some places ... Issue #2301	2014-10-11 16:24:45 +02:00
Klaas Freitag	2f5cea0e73	owncloudcmd: Add a custom ssl verification callback for neon. ... That fixes the SSL related problems we had with ci.owncloud.org	2014-10-11 15:55:37 +02:00
Olivier Goffart	282abdd804	Sync engine: Restart sync when we get a precondition failed error	2014-10-11 15:40:28 +02:00
Olivier Goffart	9b178c5bb2	Sync engine: Do not write to the database too early ... It is possible that we have should_update_etag set to true for files that we also need to propagate. In which case we must not write to the DB too early as this could cause data loss. (cf: issue #2296)	2014-10-11 15:40:28 +02:00
Klaas Freitag	d491663143	owncloudcmd: Fix some slash screwup, to make the split succeed bug #2211	2014-10-11 15:14:07 +02:00
Klaas Freitag	8eaeba6486	owncloudcmd: Fix url handling with csync, make owncloudcmd sync again. ... This fixes mirall issue #2211	2014-10-11 12:21:26 +02:00
Daniel Molkentin	77d2cba155	owncloudcmd: don't prompt for password if it was provided	2014-10-10 18:04:00 +02:00
Daniel Molkentin	2149092c7a	owncloudcmd: Fix crash	2014-10-10 18:04:00 +02:00
Olivier Goffart	100d1361b6	Add Folder wizard: Sort the folders when selecting the remote folder ... Issue #1872	2014-10-10 16:56:05 +02:00
Daniel Molkentin	76f5266fa1	Fix small inefficiency in socketapi	2014-10-10 16:20:57 +02:00
Daniel Molkentin	3ebe3b1196	Use local socket (named pipe) connection also on Windows	2014-10-10 15:57:05 +02:00
Daniel Molkentin	c4f96c2fba	owncloudcmd: Implement --version, fix strings ... Part of #2211	2014-10-10 15:55:58 +02:00
Olivier Goffart	d880f2ffbc	propagator: Do not show an error message saying it was done by user interaction if it was not ... There is many reasons why we could abort (for example timeouts) And in this case we should not show to the user it was aborted by user interaction	2014-10-10 14:58:56 +02:00
Klaas Freitag	9bb89dced5	Less offensive logging, only use error if there was one.	2014-10-10 10:16:59 +02:00
Markus Goetz	f0fef4f232	OS X: Fix .app creation for non-system Qt	2014-10-09 16:50:03 +02:00
Daniel Molkentin	7eb10a08b8	SSL error dialog: Remove debug noise	2014-10-09 16:49:31 +02:00
Olivier Goffart	4c83653d5d	Selective sync: do not upload or rename file that would ends up in a not selected folder ... Issue #2283	2014-10-09 16:50:03 +02:00
Christian Kamm	3149cd03be	Sync scheduling: Never enqueue a folder while it is synced. ... Issues: #2268, #2275	2014-10-09 15:55:10 +02:00
Christian Kamm	5314765410	fix compile	2014-10-09 15:55:10 +02:00
Olivier Goffart	621a37be15	Selective sync: Remove the etag of parent folders in the db when adding or removing items in the selective sync blacklist	2014-10-09 15:28:51 +02:00
Olivier Goffart	6de104a03a	Selective Sync: ensure that the blacklist contains the last '/' ... In the sync engine. Because that makes tha tthe lower_bounds in selective sync works properly. For example, if both "Test" and "Test Test" are in the list, then "Test/Foo" would match the "Test Test" because slash is after space Task #2289	2014-10-09 15:11:04 +02:00
Olivier Goffart	97560509ea	Selective sync: change the text of the label. ... Selective sync is a black list. Unchecked folder are blacklisted Partially checked folders are not in the blacklist and the files there are sync'ed	2014-10-09 14:36:26 +02:00
Christian Kamm	dfba8fbe5e	CheckServerJob: Require status code 200. #2290	2014-10-09 11:06:00 +02:00
Klaas Freitag	32fea6523f	Use climits for ULONG_MAX rather than modern C++ option	2014-10-09 11:03:07 +02:00
Klaas Freitag	d1c1a18226	SyncJournal: Use precompiled statement in blacklist query.	2014-10-09 10:05:20 +02:00
Klaas Freitag	04558beabe	SyncJournal: Use the NOCASE Collate for blacklist query.	2014-10-09 10:05:20 +02:00
Klaas Freitag	425d0d77c5	Two little typo fixes.	2014-10-09 10:05:20 +02:00
Christian Kamm	886f9d82f2	Sync scheduling: Improve logging. #2275	2014-10-09 09:01:35 +02:00
Daniel Molkentin	6c8eab734e	Remove C++11ism that doesn't work with older GCCs	2014-10-08 18:56:30 +02:00
Christian Kamm	705cd571a5	Download: Don't store message body if status != 2xx #2280	2014-10-08 14:18:29 +02:00
Christian Kamm	48d3c75745	GET: Retry if bad range header used. #2280 ... * If a 416 is returned and we used a Range header, try again from scratch. * The direct URL logic was also inconsistent for resumed downloads: it sent the Range header but didn't check the returned Content-Range header correctly. Now resuming is disabled for direct URL downloads.	2014-10-08 14:18:29 +02:00
Christian Kamm	285cb78962	Sync scheduling: Don't always force-sync. #2268 ... If lastEtag was null, a force sync was triggered. Force syncs don't update the etag. The etag retrieval job would only run if lastEtag was not null. So it could never become non-null.	2014-10-08 10:51:32 +02:00
Christian Kamm	708655d9b2	fix incomplete rename ... from 9bd7ffe952	2014-10-08 09:36:47 +02:00
Christian Kamm	9bd7ffe952	blacklist: Fix stale blacklist removal. #2247 ... Use the right check to determine whether a file has a blacklist entry, SyncFileItem::FileIgnored was incorrect because that denotes files from the ignore list or blacklisted files with no retries left. The blacklistedInDb flag does the right thing. Rename it to hasBlacklistEntry to be more explicit.	2014-10-08 09:17:40 +02:00
Markus Goetz	8febd90f2a	Propagator: Be less verbose	2014-10-08 09:07:29 +02:00
Daniel Molkentin	1579c23ff1	Fix order in which credentials are getting fetched	2014-10-07 18:21:22 +02:00
Markus Goetz	bf18ecae13	Propagator: Fix bw limiting bug, be less verbose in logging	2014-10-07 17:42:50 +02:00
Markus Goetz	89971925ca	Propagator: Be more verbose about propagator choice	2014-10-07 14:55:30 +02:00
Markus Goetz	d1cc3c34c9	Propagator: Relative download limit	2014-10-07 14:46:55 +02:00
Markus Goetz	de79f9338a	Propagator: Bandwidth limiting for new propagator	2014-10-07 14:46:55 +02:00
Olivier Goffart	5471bfd5a8	No need to update mtime and etag after a move ... The server keeps the mtime and etag anyway. And changing the mtime also changes the etag and so make other clients re-download the file instead of detecting the move	2014-10-07 09:13:13 +02:00
Daniel Molkentin	961df010cb	Propagator: Fix typo in Win32-only code	2014-10-06 15:39:49 +02:00
Klaas Freitag	12b09fab67	CaseClash: more defensive logging on Windows.	2014-10-03 11:54:32 +02:00
Klaas Freitag	41fa562dce	blacklisting: disable broken remove stale entries function for now.	2014-10-03 11:35:18 +02:00
Klaas Freitag	81d3ce8257	cmake: Commented setting of the INSTALL_PREFIX var on Mac	2014-10-01 20:55:39 +02:00
Daniel Molkentin	bcc06af904	fix last commit	2014-10-01 17:46:29 +02:00
Daniel Molkentin	a98242a2b8	fix install target for macdeployqt	2014-10-01 17:32:17 +02:00
Olivier Goffart	0d303f1d1f	SelectiveSync: sort the item instead of using the order from the server ... Task #2259	2014-10-01 13:47:24 +02:00
Daniel Molkentin	dafd9c308f	More removal of obsolete CMake code	2014-10-01 12:51:38 +02:00
Olivier Goffart	147fa60f81	Merge branch 'socketapi_localsocket' into 1.7	2014-10-01 12:34:22 +02:00
Olivier Goffart	a1b9405e2e	Windows has not been ported back to QLocalSocket	2014-10-01 12:33:54 +02:00
Olivier Goffart	db02d44c6a	No need to update mtime and etag after a move ... The server keeps the mtime and etag anyway. And changing the mtime also changes the etag and so make other clients re-download the file instead of detecting the move	2014-10-01 11:22:00 +02:00
Klaas Freitag	dff1f77dfa	SocketAPI: remove nonsense FIXME's.	2014-09-30 17:12:07 +02:00
Daniel Molkentin	1a2fff8ed8	OS X: Use a python script to fix for bundle fixup... ... ...rather than relying on cmake magic	2014-09-30 17:09:16 +02:00
Markus Goetz	52c12b33c3	OS X: CMD+H should hide the dialog	2014-09-30 15:21:55 +02:00
Klaas Freitag	479b340d75	Folderman: Check if socketApi member is non zero, no crashes.	2014-09-30 12:33:51 +02:00
Klaas Freitag	06c48f58cc	SyncEngine: Use proper start indicator, max unit64. ... This avoids a warning.	2014-09-30 12:29:24 +02:00
Klaas Freitag	0ee81a2865	SocketAPI: Set permission of the socket Directory. ... Set that to be accessible by the owner only.	2014-09-30 11:23:49 +02:00
Klaas Freitag	e78c251832	SocketAPI: Split up for specific linux and mac implementation.	2014-09-30 11:23:49 +02:00
Markus Goetz	f8b73eb9d9	SocketApi: Port OS X to use local sockets	2014-09-30 07:36:20 +02:00
Olivier Goffart	a587148c73	SocketApi: Save the socket in $XDG_RUNTIME/<appname>/socket	2014-09-29 13:54:13 +02:00
Olivier Goffart	9acd3a58ee	SocketApi: Use QLocalSocket after all for windows and linux ... Relates issue #2189	2014-09-29 12:19:33 +02:00
Olivier Goffart	10989d13e4	Folder: Remove slotTerminateAndPauseSync ... This make no sens to just set the pause config flag here. It make selective sync to mark the folder as posed on restart	2014-09-26 12:43:54 +02:00
Olivier Goffart	b4071cec01	DiscoveryPhase: fix the name of a function ... It was renamed from white list to black list long ago	2014-09-26 12:35:56 +02:00
Klaas Freitag	b1c842373d	Add OWNCLOUDSYNC_EXPORT to make building on windows.	2014-09-26 10:07:50 +02:00
Olivier Goffart	a3d70b3cf6	Attempt to fix a crash ... The reply might be null at the point we are timing out. Issue #2246	2014-09-26 10:04:36 +02:00
Klaas Freitag	98d9f7924d	SocketAPI: Before reporting something new check for parent permissions. ... In case it is not allowed to create files or dirs because of missing permissions in shares, the socket API has to report an error state rather than the NEW state. As discussed in mirall issue #1931	2014-09-25 21:52:20 +02:00
Klaas Freitag	172295289e	Permissions: If a top level shared dir is removed, do not restore files in it ... A top level shared dir can always be removed on the client, even if it is read only shared. In that case, the removal means "unsharing". Fixed the permission check accordingly. See bug #1918 for more information.	2014-09-25 15:39:14 +02:00
Klaas Freitag	8ba08d7e87	Activity View: honor error string even if no warning ... that allows to specify a more specific user message to be displayed.	2014-09-25 15:03:54 +02:00
Klaas Freitag	8915f94931	Mac Overlays: handle filenames with slashes properly. ... There are filenames with slashes on MacOSX, they can be created in Finder. Internally they are converted to colons.	2014-09-25 12:24:32 +02:00
Markus Goetz	1543899795	Upload Chunking: Fix progress DB values	2014-09-25 11:32:54 +02:00
Klaas Freitag	31bf844452	DownloadJob: Refresh the FileInfo after renaming the target file. ... Otherwise the activity view reports file size 0.	2014-09-25 10:59:08 +02:00
Olivier Goffart	dad8c1c27c	propagator: Do not check for case clash when renaming ... Issue #1385 When renaming, we would normaly already have an error if the file already exist. And we want to allow the renaming to chang ethe case (Eg. "hello" -> "HELLO"	2014-09-24 16:43:01 +02:00
Klaas Freitag	2c67a7ca71	progress: Set a clear start indication in the progress. ... Before, 0 was used to indicate the sync start which wipes the activity window. However, if there _are_ no synced items but only ignored items the overall counter stays zero which wipes the list all the time. This fixes bug #2171	2014-09-23 15:58:06 +02:00
Klaas Freitag	5b10a9f3a7	Minor: Remove unused definition	2014-09-22 13:47:45 +02:00
Klaas Freitag	d0fb1acebb	Win32: Define HANDLE variable, make win compile again.	2014-09-22 13:47:17 +02:00
Christian Kamm	fa881ba1c7	Notifications: Don't emit one per error. #1777	2014-09-19 15:59:03 +02:00
Olivier Goffart	9ae4d45243	Restart the sync when we detect we need to redo a sync ... Fixes #1968 Relates #2038 (cherry picked from commit a84b7dc27e) Conflicts: src/mirall/owncloudpropagator.h src/mirall/propagator_qnam.cpp src/mirall/syncengine.h	2014-09-19 11:51:17 +02:00
Christian Kamm	2eec85a97c	NetworkJobs: Propagator jobs keep others from expiring. #2155 ... In some owncloud server setups multiple concurrent connections for the same session are not supported: owncloud/core#11153 This causes issues with multiple uploads and downloads. A usual symptom is the quota job failing and the sync aborting. This workaround lets activity on the propagator's GET and PUT jobs reset the timeout of all network jobs. That way, queries like the quota job would not time out while a large up/download is in progress.	2014-09-19 11:22:57 +02:00
Olivier Goffart	1cd5681967	permissions: Remember the permissions for the root folder	2014-09-19 10:58:52 +02:00
Olivier Goffart	50e718b1e7	Merge branch '1.7' ... Conflicts: src/CMakeLists.txt src/cmd/cmd.cpp src/gui/folder.cpp src/gui/socketapi.cpp translations/mirall_ca.ts translations/mirall_cs.ts translations/mirall_de.ts translations/mirall_el.ts translations/mirall_en.ts translations/mirall_es.ts translations/mirall_es_AR.ts translations/mirall_et.ts translations/mirall_eu.ts translations/mirall_fa.ts translations/mirall_fi.ts translations/mirall_fr.ts translations/mirall_gl.ts translations/mirall_hu.ts translations/mirall_it.ts translations/mirall_ja.ts translations/mirall_nl.ts translations/mirall_pl.ts translations/mirall_pt.ts translations/mirall_pt_BR.ts translations/mirall_ru.ts translations/mirall_sk.ts translations/mirall_sl.ts translations/mirall_sv.ts translations/mirall_th.ts translations/mirall_tr.ts translations/mirall_uk.ts translations/mirall_zh_CN.ts translations/mirall_zh_TW.ts	2014-09-18 17:10:21 +02:00
Olivier Goffart	7c36e5c0e6	parallel chunk upload: allow "true" for the value of OWNCLOUD_PARALLEL_CHUNK	2014-09-18 14:29:38 +02:00
Olivier Goffart	1b62ed1e7e	Parallel chunk upload: Fix progress	2014-09-18 12:36:30 +02:00
Klaas Freitag	e9248066df	SyncJournal: Better error report for sql statements in updateDbStructure ... Also, even if the updateDatabaseStructure fails, precompile the sql statements. This will help to debug and maybe solve bug #2106	2014-09-18 12:02:28 +02:00
Christian Kamm	a88ac00115	SyncEngine: Better reporting when ignoring hardlinks. #2217 ... Also touch csync to actually let us know it's ignoring the file due to it having hard links.	2014-09-18 11:32:29 +02:00
Christian Kamm	30683b38a8	Updater: Add "didn't check for updates" message. #2175 ... Don't show "Checking server..." when we are not. (cherry picked from commit ece11dc3d8)	2014-09-18 09:43:13 +02:00
Christian Kamm	45aefeb146	SelectiveSyncDialog: Change 'partial' behavior. ... The real bug in #2219 actually was that the gui allowed users to choose to not sync the root folder. That's not supported and no longer possible in the UI. Instead you may now sync a folder's files without syncing its sub- folders.	2014-09-18 09:42:50 +02:00
Daniel Molkentin	db3318886e	Merge pull request #2214 from owncloud/2211 ... Implement (most of) #2211	2014-09-18 00:09:26 +02:00
Daniel Molkentin	54eb837950	Remove unused confdir option	2014-09-18 00:07:33 +02:00
Christian Kamm	e395282e0e	SelectiveSyncDialog: Fix sync-nothing case. #2219	2014-09-17 16:13:47 +02:00
Christian Kamm	1f129d0bcb	Propagator: Don't upload files that were changed recently. ... Instead skip them and try another sync later. See #2167, #2169, #2210.	2014-09-17 15:30:18 +02:00
Christian Kamm	c2ae5e5fd1	FolderMan: Ensure a 1s delay between sync request and start. ... That way the propagator can detect files that are still being changed right now and skip them.	2014-09-17 15:30:18 +02:00
Christian Kamm	ece11dc3d8	Updater: Add "didn't check for updates" message. #2175 ... Don't show "Checking server..." when we are not.	2014-09-17 11:41:04 +02:00
Christian Kamm	99aa2cdf2a	Log: Print client version on sync start. #2178	2014-09-17 09:39:04 +02:00
Christian Kamm	0eb9401c62	File change detection: Also look at file sizes. ... See #2167 and #2169. * csync_detect_update: Reupload a file if the sizes differ, similar to how we reupload if the mtimes differ. * PropagateUploadFileQNAM::slotPutFinished(): Abort an upload if the size changed, similar to how we abort an upload if the mtimes changed.	2014-09-17 09:05:13 +02:00
Daniel Molkentin	122fa596b3	Remove stray file that was not meant to be committed	2014-09-17 00:55:55 +02:00
Daniel Molkentin	5406407ed6	Implement --non-interactive as per Juergens' request	2014-09-17 00:12:16 +02:00
Daniel Molkentin	b72cee2783	Fix passing URLs not ending in /remote.php/webdav	2014-09-16 23:53:01 +02:00
Daniel Molkentin	fe023e2229	Allow passing user/pass explicitly or via netrc ... #2211	2014-09-16 23:52:28 +02:00
Olivier Goffart	66595a3597	Parallel chunk uploads ... This does not include progress indicator	2014-09-16 17:40:42 +02:00
Olivier Goffart	9b1779bb06	Fix compilation ... qFatal does not work with <<	2014-09-15 18:03:44 +02:00
Olivier Goffart	97cc05eeea	journaldb: Assert in case of SQL error ... relates issue #2106	2014-09-15 14:27:39 +02:00
Christian Kamm	20dd3b0a69	FolderMan: Fix startFromScratch logic. #1989 ... (cherry picked from commit 4566ca3127)	2014-09-15 13:53:38 +02:00
Christian Kamm	f348eabf19	Account: Fix cert save/restore from settings. #2160 ... (cherry picked from commit cc1121ef00)	2014-09-15 13:53:38 +02:00
Olivier Goffart	5870a57002	wizard: fix start a clean sync ... The problem was that the backup function failed as we tried to move /home/xxx/ownCloud/ to /home/xxx/ownCloud/.oC_bak The intention was to move it to /home/xxx/ownCloud.oC_bak Issue #1989	2014-09-15 13:49:13 +02:00
Olivier Goffart	278bc5a8cd	owncloudcmd: ask for the login and password and put it in the url (if it's not there already) ... Because we cannot rely on HTTPCredentials to open windows in a command line tool Fixes #1860	2014-09-15 13:24:31 +02:00
Olivier Goffart	af5e8ee18c	AbstractNetworkJob ... Abort the transfer in case of timeout. This avoid that a connection that never replies blocks mirall Issue #2148	2014-09-12 18:06:29 +02:00
Olivier Goffart	52e8343f76	ConnecitonValidator: Handle the timeout ... otherwise the account may be stuck in a disconnect case if there is a timeout Issue #2148	2014-09-12 18:06:17 +02:00
Olivier Goffart	a4dbf5942c	owncloudcmd: restart the sync if required ... Fixes #2038	2014-09-12 17:23:01 +02:00
Daniel Molkentin	ada1d42ebf	Sparkle requirement bumped to 1.8	2014-09-12 16:08:52 +02:00
Daniel Molkentin	f27182ae05	fFx Utility::freeDiskSpace for win32	2014-09-12 16:08:52 +02:00
Markus Goetz	2fddf05515	OS X: Overlay Icons: Load from bundle-specific path ... The client (in this case mirall) tells the Finder plugin where to get the icons. This enables installation in different locations and in branded clients.	2014-09-12 15:09:47 +02:00
Tim Vandecasteele	f3cc614427	Fix apple build. ... The apple build was broken because the elseif in the CMakeLists is never triggered. Some code was not properly adapted for the new qtmacgoodies. Some paths were not adapted to new split.	2014-09-12 14:24:26 +02:00
Olivier Goffart	79052ba7c6	Blacklist: ignore problems that don't have HTTP error code and are possibly problem on the local file system ... Issue #1985	2014-09-12 14:13:04 +02:00
Markus Goetz	4960890d70	Propagator: Commit the DB for Poll Jobs	2014-09-11 12:05:35 +02:00
Olivier Goffart	a84b7dc27e	Restart the sync when we detect we need to redo a sync ... Fixes #1968 Relates #2038	2014-09-10 17:27:33 +02:00
Daniel Molkentin	927af0adec	Fix build on win32: add missing export	2014-09-10 16:31:47 +02:00
Daniel Molkentin	f59a6862ca	raiseDialog: Actually send the XEvent ... Amendment to 25c274a0bd Conflicts: src/mirall/owncloudgui.cpp	2014-09-10 13:21:27 +02:00
Olivier Goffart	71408bab60	I forgot to rename one of the while list to the blacklist	2014-09-10 11:01:38 +02:00
Christian Kamm	88b7f2e0ee	SyncJournal: Don't use C++11 features.	2014-09-05 12:48:45 +02:00
Markus Goetz	f5f04bcc4b	SyncEngine: Always return _renameTarget in destination() if possible ... We want to do this since the instruction is actually ERORR, not RENAME.	2014-09-05 10:07:24 +02:00
Christian Kamm	2630a73a1c	Propagator: Use csync to get the modification time. ... See owncloud/core#9781	2014-09-04 14:16:23 +02:00
ckamm	4decd15ca9	Merge pull request #2161 from ckamm/stale-downloadinfo ... Clean up stale journal entries and temporaries. #2057	2014-09-04 14:14:39 +02:00
ckamm	3a59dd24f3	Merge pull request #2162 from ckamm/error-missing-exclude ... Don't do a broken sync when the system exclude file is missing	2014-09-04 14:14:07 +02:00
Olivier Goffart	c232411e96	uploading: make sure to cast to uint64 to avoid integer overflow	2014-09-04 13:46:01 +02:00
Christian Kamm	1cf1f6edcb	Fix style issues.	2014-09-04 13:27:11 +02:00
Christian Kamm	5d36a27893	Clean up stale journal entries and temporaries. #2057 ... * Downloadinfo entries for files that no longer need to be downloaded are useless and can be removed. In particular, the temporary files holding partially retrieved files are now deleted when no longer necessary. * The same is true for blacklist entries for paths that are no longer being discovered. * Same for uploadinfos for files that no longer need to be uploaded.	2014-09-04 13:14:15 +02:00
Christian Kamm	da94533647	Folders: Signout should not switch folders to paused state. #2112 ... On signout, syncs that are running in folders are aborted. That used to also switch the state of these folders to 'paused'. To fix that, aborts that are caused by user actions no longer change the folder paused state. Aborts due to errors should still pause folders! Otherwise we'd try resyncing them even though there was an error.	2014-09-04 11:21:28 +02:00
Markus Goetz	69066013c1	ownCloudTheme: Fix casing in appName() ... Without this fix, the section in the config file uses the wrong name, leading to re-configuration of the client needed.	2014-09-03 17:30:34 +02:00
Christian Kamm	aef569ee9d	SyncEngine: Use exclude file fallback next to binary on linux. ... This is mainly useful for developers where the system-wide exclude file may not exist.	2014-09-03 14:53:01 +02:00
Christian Kamm	cf881aa6dc	SyncEngine: Fix invalid slot name in sync error condition.	2014-09-03 14:52:55 +02:00
Christian Kamm	a48bf3142c	SyncEngine: Abort sync with error if system exclude file is missing. ... Syncing without the system exclude file would cause lots of trouble. For instance we would try uploading the temporary files we store partially completed downloads in.	2014-09-03 14:52:46 +02:00
Daniel Molkentin	c0131695c5	Return from Folder::slotPollTimerTimeout() if the account object is 0 ... Right now, we crash instead. This can happen if a folder is created when an account object is not (anymore/yet) created. Fixes #2142	2014-09-02 14:51:33 +02:00
Daniel Molkentin	fcbadda40f	Make Settings Window close on Ctrl+W ... Fixes #2141 (cherry picked from commit 2ab19b23d7)	2014-09-02 14:03:20 +02:00
Daniel Molkentin	2455faa6fe	Account Migrator: Switch to string comparison for URLs. ... QUrl does not normalize trailing slashes, so there is no benefit of using QUrl here. (cherry picked from commit d770f9cc1a)	2014-09-02 14:03:07 +02:00
Markus Goetz	0be4b59cff	Sparkle: Keep permissions from bundle	2014-08-31 18:57:39 +02:00
Olivier Goffart	291231c561	Merge missing commits from 1.6.2-themefix into 1.7 ... Conflicts: VERSION.cmake	2014-08-30 17:57:58 +02:00
Dominik Schmidt	7ad557f2f8	Add crash reporter to osx package and don't build it with BUILD_LIBRARIES_ONLY enabled	2014-08-30 14:45:39 +02:00
Dominik Schmidt	ef70052b0e	Package installer if it was built	2014-08-30 14:12:40 +02:00
Dominik Schmidt	202426f536	Make crash reporter application name branded	2014-08-30 11:05:52 +02:00
Dominik Schmidt	d240415671	Make crash reporter logo branded	2014-08-30 11:05:34 +02:00
Dominik Schmidt	1aca22b5f8	Make crash reporter executable branded	2014-08-30 10:46:09 +02:00
hefee	68792ee9db	Fixing spellingerror ... GNU Public License -> GNU General Public License	2014-08-30 02:18:55 +02:00
Klaas Freitag	bcff1ced5e	Merge branch '1.7' ... Conflicts: src/CMakeLists.txt src/cmd/cmd.cpp src/gui/folderman.cpp src/gui/wizard/owncloudadvancedsetuppage.cpp src/libsync/account.cpp	2014-08-29 20:40:33 +02:00
Klaas Freitag	7ce2a93c63	Merge remote-tracking branch 'origin/reuse_oc_config' into 1.7 ... Conflicts: src/CMakeLists.txt src/mirall/folderman.cpp src/mirall/folderman.h src/mirall/owncloudtheme.h	2014-08-29 20:23:07 +02:00
Olivier Goffart	5d19426930	Propagator: When the server don't support ranges, reset the counter so the progress is not messed up ... Issue #2081	2014-08-29 19:33:20 +02:00
Olivier Goffart	1b51a10b19	Socket API: be consistant in the VERSION command and add the VERSION at the beginning	2014-08-29 17:28:36 +02:00
Dominik Schmidt	38ff7d87c8	Hide crashreporter config option if not build with crashreporter enabled	2014-08-29 17:07:31 +02:00
Markus Goetz	12e2bac16b	Propagator: Also parse OC-ETag header ... Client side part of https://github.com/owncloud/core/issues/9005	2014-08-29 16:30:58 +02:00
Olivier Goffart	34a27c748a	Progress: in case of resuming chunks, advance directly at startup by the amount of chunk already done ... Fixes #2103	2014-08-29 16:06:56 +02:00
Markus Goetz	7ec0c52439	Poll URL: Use trimmed() on response	2014-08-29 13:58:33 +02:00
Olivier Goffart	a73fbccf8c	t4.pl: add a test to test that ignored file are not deleted	2014-08-28 19:33:52 +02:00
Klaas Freitag	7f1d707d23	ownCloud Theme: Do not have the oCSetupTop custom media, see #1445	2014-08-28 18:10:53 +02:00
Daniel Molkentin	25c274a0bd	X11: Bring Settings window to front when launched	2014-08-28 17:25:00 +02:00
Olivier Goffart	0fb0f2c204	Selective sync: start a sync when the selective sync settings changes	2014-08-28 16:27:46 +02:00
Dominik Schmidt	6abaad1ae8	Show crash reporter if trying to read the crash-reporter-enabled config crashes	2014-08-28 16:23:14 +02:00
Dominik Schmidt	89aec52503	Add checkbox to general settings to disable the crash reporter	2014-08-28 16:19:17 +02:00
Markus Goetz	b6f42a91f4	OS X: Fix Finder bundle NVTY->OWNC	2014-08-28 15:45:07 +02:00
Markus Goetz	2aef6a2174	Poll URL: Don't delete from DB in case of 503	2014-08-28 13:44:21 +02:00
Olivier Goffart	79f00c2a2a	Wizard: adjust alignements	2014-08-28 13:32:14 +02:00
Olivier Goffart	e5068e7543	Selective sync: if one click twice on the button in the wizard, it should keep the blacklist	2014-08-28 12:25:44 +02:00
Olivier Goffart	858218ac34	Wizard: new layout	2014-08-28 12:18:19 +02:00
Dominik Schmidt	b8e8d975aa	Add CRASHREPORTER_SUBMIT_URL to OWNCLOUD.cmake	2014-08-28 12:08:07 +02:00
Markus Goetz	6e0330ff65	SyncEngine: Error out if we don't have a sync dir	2014-08-28 11:47:40 +02:00
Markus Goetz	3aa7178382	PollJob: Increase timeout	2014-08-28 11:27:08 +02:00
Dominik Schmidt	439bf7641e	Use include path for libcrashreporter-qt instead of lengthy relative include	2014-08-28 11:11:42 +02:00
Dominik Schmidt	34042028b3	Add CRASHREPORTER_SUBMIT_URL define and default it to some placeholder owncloud url	2014-08-28 11:05:46 +02:00
Markus Goetz	2f34b046d0	Overlay Icons: Improve OS X version, improve general feedback ... Now the update phase of the syncing algorithm pushes stuff the notification socket too.	2014-08-27 19:15:43 +02:00
Olivier Goffart	a73316306d	Selective sync: new design in the wizard	2014-08-27 19:03:11 +02:00
Daniel Molkentin	cf12a56b4c	Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/gui/socketapi.cpp	2014-08-27 18:22:07 +02:00
Olivier Goffart	928652e4cf	Selective sync: rename the button 'choose what to sync'	2014-08-27 17:31:57 +02:00
Olivier Goffart	7950b49cb1	Selective sync dialog: fix fetching sub directory when the folder is not the root folder	2014-08-27 17:19:36 +02:00
Klaas Freitag	cc6aa66ab0	JournalDB: Do prepare the queries even if the db update failed. ... Also, add more logging in case SQL errors happen while db structure update.	2014-08-27 14:01:33 +02:00
Olivier Goffart	ea381392a7	SocketAPI: fix the BROADCAST message	2014-08-27 13:55:06 +02:00
Olivier Goffart	bb7f63dcfd	AccountSettings: be less verbose in the status string	2014-08-27 13:51:14 +02:00
Olivier Goffart	253d65727b	Socket api: Add a VERSION command	2014-08-27 13:51:14 +02:00
Klaas Freitag	d2e1489fe7	Propagator: Set the chunk size to 20MB as requested by Matt.	2014-08-27 10:35:58 +02:00
Dominik Schmidt	2b4849a2fa	Add crash reporter using libcrashreporter-qt	2014-08-26 18:15:13 +02:00
Olivier Goffart	2356601bb3	folder: Make sure not to pol the server if the account is disconnected ... Fixes #2108	2014-08-26 16:23:19 +02:00
Olivier Goffart	9b88c7d3c1	SSLButton: fix memleak	2014-08-26 15:59:19 +02:00
Olivier Goffart	302499b483	uploading: make sure to cast to uint64 to avoid integer overflow	2014-08-26 15:58:55 +02:00
Dominik Schmidt	17e16f5e79	Add "Crash" entry to systray if started with --debug	2014-08-26 15:46:24 +02:00
Dominik Schmidt	b176ff6626	Don't use CMAKE_INSTALL_PREFIX for RPATH	2014-08-26 15:19:46 +02:00
Daniel Molkentin	e5471d8318	Build after merge	2014-08-26 14:33:21 +02:00
Daniel Molkentin	902bb7a198	Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir ... Conflicts: src/CMakeLists.txt src/gui/accountsettings.cpp src/gui/folderwizard.cpp src/gui/settingsdialog.cpp src/libsync/syncengine.h	2014-08-26 11:29:42 +02:00
Markus Goetz	b037e6356e	TokenCredentials, DirectDownload: Rework cookie handling ... That way we don't override QNAM's cookie jar behaviour	2014-08-22 13:46:22 +02:00
Markus Goetz	824628061b	Propagator: Don't have cookies overriden by QNetworkCookieJar ... The direct download feature has its own cookies, don't let QNAM override them.	2014-08-22 12:12:46 +02:00
Klaas Freitag	c473428be6	Merge pull request #2084 from owncloud/contextless_exclude ... Contextless exclude, @ogoffart reviewed, I'll merge.	2014-08-21 13:15:18 +02:00
Klaas Freitag	dc8f437b31	Excludes: Add an context free implementation of exclude file loading. ... So that we are more thread safe.	2014-08-21 12:43:04 +02:00
Olivier Goffart	aabcf80774	Sync engine: Take also in account the fact that the instruction can be IGNORE on both tree	2014-08-21 11:33:38 +02:00
Olivier Goffart	1cf956ec21	Discovery phase: clear the callbacks after use	2014-08-21 11:27:25 +02:00
Klaas Freitag	54e2b9345b	GUI: on Mac do not call slotUpdateAccountIcon	2014-08-21 11:00:57 +02:00
Klaas Freitag	75101a0319	Application: Unload all folders when shutting down. ... That sends a proper UNREGISTER message via socket API.	2014-08-20 17:33:48 +02:00
Klaas Freitag	d1a660ce20	SocketAPI: Add parameter to enable wait for the socket write. ... This is needed to wait until the UNREGISTER message is sent to the shell code when mirall shuts down.	2014-08-20 17:33:48 +02:00
Klaas Freitag	4356005c5a	FolderMan: Do not remove the folder icon too early from the map. ... Otherwise, method unloadFolder can not do important frees. This is one part of the fix for #2073 because now the socketapi will send the UNREGISTER_PATH message over the socket.	2014-08-20 17:33:48 +02:00
Daniel Molkentin	8fdee79505	Fix crash in accountsettings	2014-08-20 16:06:38 +02:00
Klaas Freitag	988fe70771	Merge pull request #2075 from owncloud/use_folder_paused ... Rework of the status icons in FolderMan and Folder objects.	2014-08-20 10:50:28 +02:00
Klaas Freitag	d02175210b	Status Icon: Set a proper icon if no sync is configured. ... This fixes bug #1956	2014-08-19 17:47:28 +02:00
Klaas Freitag	617887a0c6	Propagator: If the sync was interrupted by pausing, do not show error. ... Handle problems which happen because of pausing the sync as soft errors rather than normal errors which are blacklisted and displayed in the gui. This fixes bug #1959	2014-08-19 14:21:59 +02:00
Klaas Freitag	e4fe4cb4d3	Status icons: Display the correct icons after startup connect.	2014-08-19 14:21:59 +02:00
Klaas Freitag	dc0a054d94	Status icons: Set the offline icon at the very beginning. ... Otherwise, if the account is signed out and opens the credential popup, there is a wrong icon displayed. If the account is coming from keychain this icon is quickly overwritten.	2014-08-19 14:21:51 +02:00
Klaas Freitag	924d9b985f	Some minor cleanups.	2014-08-19 14:21:51 +02:00
Klaas Freitag	bb3bd6930a	StatusModel: Have another property accountConnected. ... With that , make the status model aware of the account connection state. With that, we can grey out the correct state icon if the account is not connected and display the normal icon if the account is connected.	2014-08-19 14:21:51 +02:00
Klaas Freitag	1245ed6f06	Status Icons: Let FolderMan only write the folder config files. ... Remove the setSyncEnabled() call to individual folders which mistakenly set the folders to pause. Let the folders keep their pause state on their own. If FolderMan is set to be enabled emit a general refresh signal rather than one for each folder.	2014-08-19 14:21:51 +02:00
Klaas Freitag	01b0ee49de	Status Icons: Rename the syncEnable method to isPaused. ... Previously, in folder and folderman there have been the syncEnabled properties, but they confused the semantics: While in FolderMan the syncEnabled flag represents the network connection and stuff, in Folder it represented if the user paused or resumed the folder. This resulted in mixed use of both, which lead to wrong icon states. This patch renames the folder methods and properties to isPaused to make more clear about what it is.	2014-08-19 14:21:42 +02:00
Olivier Goffart	9c98883bea	propagator mkcol: If the server replies with a file-id in the header, use it ... Newer server will have a file id directly in the file header. https://github.com/owncloud/core/issues/9000	2014-08-18 20:42:43 +02:00
Olivier Goffart	2fb19e25b5	Fix clang 3.0 compilation	2014-08-18 19:44:18 +02:00
Olivier Goffart	c291eb3db4	Fix compilation error	2014-08-18 15:45:58 +02:00
Olivier Goffart	7f38ce8908	Selective sync: the button should only be enabled while connected	2014-08-18 15:45:38 +02:00
Olivier Goffart	1781400340	fix compilation	2014-08-18 15:28:24 +02:00
Olivier Goffart	3760f14da8	Restore the log window	2014-08-18 15:16:33 +02:00
Olivier Goffart	dc18366111	DiscoveryPhase: put in namespace Mirall	2014-08-18 14:45:48 +02:00