3945 commits

Author	SHA1	Message	Date
Jocelyn Turcotte	9a9897ea1e	Shibboleth: Let the webview use its own QNAM #3359 ... Since we periodically recreatet the QNAM owned by the Account, the web view could end up holding a dangling pointer to it. Let the web view use its own QNAM, but make sure that the cookie jars are shared so that we can grab the session token given by the server.	2015-06-19 12:33:11 +02:00
Olivier Goffart	bb85db6cc5	Fix windows build	2015-06-18 10:24:40 +02:00
Olivier Goffart	dd5ddf2166	AbstractNetworkJob: move to its own file	2015-06-17 17:29:11 +02:00
Jocelyn Turcotte	85938ab1f1	shell_i: Remove the ICON_PATH socket API message #2340 ... It was only used on OS X and couldn't be used by the FinderSync extension since that one runs in a sandbox. So use the same system to load images in the legacy extension by shipping them in the extension bundle instead of the owncloud.app bundle. This is also given that the legacy extension needs padded icons while the FinderSync one needs unpadded icons.	2015-06-17 17:15:50 +02:00
Klaas Freitag	79cc902673	FolderMan: Save migratated folder definitions to Configfile.	2015-06-17 14:54:51 +02:00
Klaas Freitag	214bc6b29b	Folder: Simplify Folder constructor: No need for AccountState. ... Do not pass AccountState in constructor of Folder, set with a new method called setAccountState after creation. Thus the parameter does not need to be passed through all over.	2015-06-17 14:54:51 +02:00
Christian Kamm	84bae92264	AccountSettings: Fix initial visibility of sel sync panel #3355	2015-06-17 14:43:38 +02:00
Christian Kamm	191d66fc6f	Propagator: Add entry with dummy etag on local mkdir. #2761	2015-06-17 14:38:51 +02:00
Jocelyn Turcotte	c98bcc8e9e	OS X: Fix a few warnings	2015-06-17 14:32:34 +02:00
Jocelyn Turcotte	a4f519eaeb	Reduce the amount of rebuild needed after a git commit ... Since GIT_SHA1 would need to be updated in config.h, all files including it would be rebuilt by make. Reduce the number of files to rebuild by moving this variable to version.h instead.	2015-06-17 14:32:34 +02:00
Olivier Goffart	c11358219a	FolderStatusModel: fix a coverity warning	2015-06-17 12:46:49 +02:00
Christian Kamm	28d6d0dc1e	Download: Gracefully skip files with 404. #2227	2015-06-17 12:24:21 +02:00
Jocelyn Turcotte	977b1464b5	shell_i: Don't load the old extension in >= 10.10 #2340	2015-06-16 15:30:43 +02:00
Olivier Goffart	d902a37dfd	Fix Qt4 compilation ... This header is not included in Qt4's QAbstractItemModel header	2015-06-16 12:14:04 +02:00
Olivier Goffart	0cfc518c33	Fix coverity build which does not support nsdmi	2015-06-16 09:30:29 +02:00
Olivier Goffart	f8cbed34c2	Should fix coverity build ... Issue #3346	2015-06-15 17:59:08 +02:00
Olivier Goffart	2e177590a6	libsync: Remove some Theme dependency ... Theme will eventually be moved to the GUI Theme::appNameGUI and QApplicaiton::applicationName are the same, it is currently set in the constructor of ConfigFile	2015-06-15 17:39:28 +02:00
Olivier Goffart	7f0735a955	Account: don't use the Theme from the account ... The Theme will be moved to GUI The server URL is anyway overriden by the wizard or the accountmanager	2015-06-15 17:39:28 +02:00
Olivier Goffart	ce0a0e3f0d	Credential: move the implementation to the gui	2015-06-15 17:39:28 +02:00
Olivier Goffart	6e337ad242	Move Account::settings to AccountState::settings ... It is only used by the GUI. Also return a unique_ptr to make the ownership clearer	2015-06-15 17:39:28 +02:00
Jocelyn Turcotte	bfcfdeec64	shell_i: Use an NSConnection instead of a local socket #2340 ... This prepares the switch to the official FinderSync API on Yosemite which requires the extension to run in a sandbox. This complicates the usage of a local socket to communicate with a non-sandboxed GUI client. An NSConnection is easier to use in this case, which we can use as long as the server name (i.e. Mach port registered name) is prefixed with the code signing Team Identifier. A placeholder server implementation is also added to the client's SocketApi which basically reproduces the interface of a QLocalSocket. Most of the references to individual sockets we're only using QIODevice methods so the type was simply reduced. A typedef to replace the QLocalServer was the only other part needed.	2015-06-15 15:28:17 +02:00
Olivier Goffart	e321280eae	AccountManager: remove export macro	2015-06-15 14:53:36 +02:00
Olivier Goffart	a3c543a627	Move FolderStatusDelegate to its own file	2015-06-15 14:16:21 +02:00
Klaas Freitag	fa0faee8ba	Frequent update check: read check frequency from config file.	2015-06-15 12:24:18 +02:00
Olivier Goffart	bea8896012	Merge remote-tracking branch 'origin/master' into new-ui	2015-06-14 10:39:30 +02:00
Olivier Goffart	1dabdc7df1	discoveryphase: initialize DiscoveryMainThread::_currentGetSizeResult	2015-06-12 14:43:18 +02:00
Olivier Goffart	11c8415cd6	Coverity do not support non-static data initializer ... Fixes #3337	2015-06-12 13:57:17 +02:00
Olivier Goffart	81c10da8dc	Accountsettings: Show a notification when there are new unconfirmed folders	2015-06-12 12:19:24 +02:00
Olivier Goffart	2296f6a4a5	Fix Qt4 build ... QSharedPointer::create with arguments is new in Qt5	2015-06-12 08:13:08 +02:00
Olivier Goffart	53f2468430	Confirm: Set the limit to 100MB ... TODO: make this configurable	2015-06-11 15:54:39 +02:00
Olivier Goffart	cc3543dbd2	Confirm feature: The UI part in the selective sync view ... Folder that are over the threshold will appear in red in the selective sync view and will be deselected by default	2015-06-11 15:46:01 +02:00
Olivier Goffart	05ed126bfd	Account config: add the size in the selective sync part	2015-06-11 14:13:09 +02:00
Olivier Goffart	5ab20e64bf	AccountSettings: fix selective sync checking ... We need to set the root item to partially checked in case there is some folders in the blacklist The root item do not have checkmark so it is good	2015-06-10 17:00:08 +02:00
Olivier Goffart	e9e11d251f	Fix compilation after merge of the confirm and the new-ui branch	2015-06-10 16:22:14 +02:00
Olivier Goffart	139b28b471	Merge branch 'master' into new-ui ... Conflicts: src/gui/folder.cpp src/gui/folder.h src/gui/folderman.cpp	2015-06-10 15:57:55 +02:00
Olivier Goffart	16786eed54	Merge pull request #3281 from owncloud/confirm ... Confirm feature (sync engine part only)	2015-06-10 13:39:52 +02:00
Olivier Goffart	e135d4cccf	Merge remote-tracking branch 'origin/1.8'	2015-06-10 13:42:02 +02:00
Klaas Freitag	c8cb604c18	Updater: Do a tray notification if a new update is available.	2015-06-09 08:35:15 +02:00
Klaas Freitag	5b65bbf8e5	App: Do a regular check for updates, currently hardcoded every two hours.	2015-06-09 08:35:15 +02:00
Olivier Goffart	67f7892958	SocketAPI: Do not leak open DB or query ... We could leak it in case of errors. Or when the folder is removed. Make use of QSharedPointer to avoid leaks	2015-06-08 15:49:37 +02:00
Olivier Goffart	6df7551bdd	DiscoveryPhase: Fix the unlikely case the server resturns utf-8 in permissions ... UTF-8 size might be bigger than the size of the QString In that case we would end up with a non-nill terminated permissions.	2015-06-08 15:40:06 +02:00
Olivier Goffart	1b9d82679c	OwnSQL: fix initialisation of variables	2015-06-08 15:30:39 +02:00
Olivier Goffart	2c6c21d753	AccountState: do not change the state when we stay connected ... This would cause a full sync every 30 seconds.	2015-06-08 12:14:37 +02:00
Volkan Gezer	03eb11b927	from translators on transifex	2015-06-07 14:19:59 +02:00
Klaas Freitag	fc2ceb88fb	Rename thread to SyncEngine Thread to avoid confusion about Neon.	2015-06-06 10:49:47 +02:00
Christian Kamm	ee08b3759d	SyncScheduling: Avoid new resyncs on local mkdir. ... (cherry picked from commit bacf6166c1)	2015-06-05 10:27:28 +02:00
Christian Kamm	bacf6166c1	SyncScheduling: Avoid new resyncs on local mkdir.	2015-06-04 15:02:24 +02:00
Christian Kamm	2ed329e025	Improve reporting of server error messages. #3220 ... In particular the 'unsupported client version' error message is now visible to the user when trying to connect to a server that no longer supports the current client version.	2015-06-04 10:07:24 +02:00
Christian Kamm	4c10f1e40c	Wizard: Show server error message if possible. #3220	2015-06-03 16:33:09 +02:00
Olivier Goffart	02ffbf8989	confirm feature: fix typos spotted by ckamm	2015-06-03 15:20:42 +02:00
Christian Kamm	89376e14d6	Nicer fix for the security issue #3283.	2015-06-03 11:37:26 +02:00
Christian Kamm	e32bd5a59f	Merge remote-tracking branch 'origin/1.8'	2015-06-03 11:36:52 +02:00
Olivier Goffart	12f760535d	Fix folder concatenation with Qt4 ... QUrl in Qt4 do not simplify double slashes like Qt5 does, so we have to take in account different slashes possibilities	2015-06-02 20:47:06 +02:00
Olivier Goffart	e1f94cea4f	FolderStatusModel: handle network error in the LSCol	2015-06-02 20:47:06 +02:00
Olivier Goffart	fc23e810fd	folderstatusmodel: clean includes	2015-06-02 20:01:13 +02:00
Olivier Goffart	e587c8e2dc	multi-account: compile with Qt4	2015-06-02 19:57:41 +02:00
Olivier Goffart	984434c728	AccountSettings: move the progress handling in FolderStatusModel ... This is required to compile with Qt4 because signals were protected. And the logic anyway belongs to the model	2015-06-02 19:45:23 +02:00
Klaas Freitag	75b38d1a2f	Abort the request and reset the QNAM if user does not ACK a new cert. ... This is supposed to fix bug #3283	2015-06-02 12:21:49 +02:00
Christian Kamm	2435ba7e7d	Windows: Fix unit test build.	2015-05-27 14:59:28 +02:00
Olivier Goffart	28a66cb393	SettingsDialogMac: adapt to multi-account	2015-05-26 17:37:15 +02:00
Olivier Goffart	507206367f	Merge branch 'master' into new-ui	2015-05-26 14:56:08 +02:00
Olivier Goffart	9e17ddffae	Confirm feature: document the white/black/unconfirmed lists	2015-05-26 14:41:29 +02:00
Olivier Goffart	a621223cc8	SyncEngine: add an api to set the maximum size of new shared folder that do not require confirmation	2015-05-26 14:41:01 +02:00
Olivier Goffart	7bb2834d8b	Confirm feature (The sync engine part)	2015-05-26 12:34:07 +02:00
Olivier Goffart	10d9e53159	Confirm feature: Use selective sync in the database	2015-05-26 12:34:07 +02:00
Olivier Goffart	2c67692958	JournalDb: add a table in the db for the selective sync	2015-05-26 12:33:54 +02:00
Olivier Goffart	5cb10bf6a1	PropfindJob: fix parsing of properties that have a sub element ... The default argument of readElementText is ErrorOnUnexpectedElement which abort the parsing of remaining elements	2015-05-26 12:33:54 +02:00
Olivier Goffart	54a42e401b	More compilation fixes after the merge	2015-05-26 12:33:19 +02:00
Olivier Goffart	6b27d2e703	Merge remote-tracking branch 'origin/1.8'	2015-05-26 12:28:31 +02:00
Klaas Freitag	6c46713701	include qtconcurrentrun header rather than QtConcurrent for Qt4	2015-05-22 14:46:29 +02:00
Olivier Goffart	3754e6c781	Disable the curruption workaround on mac and windows ... The binaries we ship have a patched Qt	2015-05-22 14:19:44 +02:00
Olivier Goffart	6b9e123816	Merge remote-tracking branch 'origin/checksum_1.8' into 1.8	2015-05-22 10:32:37 +02:00
Olivier Goffart	fb2295fcec	Merge branch 'recall' into 1.8	2015-05-22 10:32:26 +02:00
Christian Kamm	0af2f7e5ed	ConValidator: Always run with new credentials. #3266	2015-05-22 09:38:44 +02:00
Christian Kamm	1c84d01584	Windows: Fix build of tests.	2015-05-22 09:17:24 +02:00
Olivier Goffart	3fcce08a22	recall: move the recall code in a namespace	2015-05-21 16:23:54 +02:00
Olivier Goffart	289800c1ba	Recall: make it work even if it is not in the root directory	2015-05-21 16:06:53 +02:00
Olivier Goffart	9a02a0f3a8	Recall feature: Fix some style issues	2015-05-21 16:06:52 +02:00
Jakub Moscicki	4e79093f84	recall file prototype	2015-05-21 16:06:52 +02:00
Klaas Freitag	d2fff2c3e3	Theme: Allow to change the transmission checksum through theming.	2015-05-21 15:59:24 +02:00
Klaas Freitag	8f277e46d6	TransmissionChecksumming: Remove SyncFileItem dependency.	2015-05-21 15:51:48 +02:00
Klaas Freitag	c33d962712	TransmissonChecksumValidator: Add documentation.	2015-05-21 14:32:08 +02:00
Klaas Freitag	3870915118	TransmissionChecksumValidator: Reduce verbosity.	2015-05-21 14:31:39 +02:00
Klaas Freitag	b05ca526a4	In case of empty checksum type, emit validated.	2015-05-21 14:31:18 +02:00
Klaas Freitag	4e28a24af3	Let checksumType() read the config to destinguish checksum type.	2015-05-21 14:30:21 +02:00
Olivier Goffart	aebadfcda2	FolderWizard: Add missing Q_OBJECT which prevent translations from working	2015-05-21 12:53:55 +02:00
Klaas Freitag	dec3bd4a02	Some more minor cleanups based on the pull request review.	2015-05-20 22:44:12 +02:00
Klaas Freitag	64ce0cd7a2	Improved implementation efficiency of checksum calculation. ... Based on Oliviers suggestions the file read routine now reuses one buffer to read the entire file. Other cleanups.	2015-05-20 21:42:08 +02:00
Klaas Freitag	5b5a636cc1	Make TransmissionChecksumValidator child of the job for auto delete. ... That way no explicit memory management is needed as the allocation is freed when the job (parent) is deleted automatically.	2015-05-20 16:54:04 +02:00
Daniel Molkentin	5c6a6529a6	Merge pull request #3258 from binwiederhier/bugfix/issue3256-mkcol ... Add 'Content-Length: 0' header to MKCOL request; fixes #3256	2015-05-20 15:48:33 +02:00
Philipp Heckel	68fa190cf7	Add 'Content-Length: 0' header	2015-05-20 14:40:20 +01:00
Olivier Goffart	d148464efe	SyncJournalDb::updateErrorBlacklistEntry: lock the mutext at the beginning ... The mutex need to be locked before checkConnect, that's what all the other functions are doing	2015-05-20 15:30:19 +02:00
Klaas Freitag	17fe4c3b29	PropagateUpload: Fix typo in warn message.	2015-05-20 12:30:00 +02:00
Klaas Freitag	dd6c97abb6	Propagator: Added a log that tells if transmission checksumming is used.	2015-05-20 12:27:54 +02:00
Markus Goetz	330b352001	ProgressInfo: Fix Windows build	2015-05-20 11:59:33 +02:00
Klaas Freitag	ddfe3fa7ab	TransmissionChecksum: Fix identation.	2015-05-20 10:49:18 +02:00
Klaas Freitag	1f7274c2f2	TransmissionChecksum: Removed "pseudo" thread worker functions ... Removed the Worker postfix from the method names to reflect their non threaded character, they moved into a thread in the Validator class. Thanks ckamm for review.	2015-05-20 10:45:20 +02:00
Klaas Freitag	8b371c42b7	Propagate Download: Handle malformed checksum header as error. ... Plus some cleanup, bool ok was not needed actually.	2015-05-19 17:09:40 +02:00
Klaas Freitag	c7f759fedf	Propagator: Use the TransmissionChecksumValidator class.	2015-05-19 17:09:40 +02:00
Klaas Freitag	830daa40d1	Add a class TransmissionChecksumValidator, incl. unit test. ... This does all needed to manage checksums that go with http headers ensuring that the transmission was correct.	2015-05-19 17:09:40 +02:00
Klaas Freitag	f016d25b4c	Propagate downloads: Handle checksum transmission header. ... Read a checksum from the HTTP header, and if its there, compare the downloaded tmp file against it. In case of corruption, schedule a redownload.	2015-05-19 17:09:40 +02:00
Klaas Freitag	e18fd62f34	Propagator: checksum constants go to propatorjobs header. ... So they can be used from both up- and download propagator jobs.	2015-05-19 17:09:40 +02:00
Klaas Freitag	3701fbcbfe	PropagateUpload: Add checksum calculation if required by config. ... If the config file has an transmissionChecksum entry, a checksum is added to the PUT requests in a header.	2015-05-19 17:09:39 +02:00
Klaas Freitag	67d38bc87b	Filesystem Utilities: Add Checksum calculation methods.	2015-05-19 17:09:39 +02:00
Klaas Freitag	ec83295b99	Branding: Append the appName short to the user agent string.	2015-05-19 17:09:39 +02:00
Klaas Freitag	e36252a845	Theme: (minor) remove some more mirall's	2015-05-19 17:09:39 +02:00
Klaas Freitag	d0d8de9f2f	MirallConfigFile: Add an option of transmission checksumming.	2015-05-19 17:09:39 +02:00
Daniel Molkentin	9693048f78	Find & use QtConcurrent	2015-05-19 17:09:39 +02:00
Klaas Freitag	101d2268ff	SyncFileItem class: Add member _checksum	2015-05-19 17:09:39 +02:00
Klaas Freitag	2fcad760b9	StopWatch: return the duration from the stop() command.	2015-05-19 17:09:39 +02:00
Olivier Goffart	f595fc2f9c	Fix opening external links for some labels ... Issue #3135	2015-05-15 18:44:19 +02:00
Markus Goetz	06c889630c	AccountState: Run only a single validator, allow error message overriding #3236 #3153	2015-05-15 12:27:35 +02:00
Markus Goetz	8a39748654	SyncJournalDB: Don't use NULL value ... Olivier says we should try to not be the same as the possible value for not existing entries.	2015-05-13 14:57:14 +02:00
Markus Goetz	3556ed416c	SyncJournalDB: Simplify code	2015-05-13 13:15:53 +02:00
Olivier Goffart	d7fa03cf2e	Systray menu: consider multiple account to choose the status	2015-05-13 13:10:14 +02:00
Markus Goetz	e5e2ce2b22	SyncEngine: Force re-read of folder Etags for upgrades from 1.8.0 and 1.8.1 ... This is a better fix than the previous one for the local-files-missing bug because it does not depend on the sync run to run fully through.	2015-05-13 12:54:49 +02:00
Olivier Goffart	af94e8943d	Systray menu: show one entry per account to open in a browser	2015-05-13 12:54:31 +02:00
Markus Goetz	39d103adf7	OwnSql: Fix numRowsAffected()	2015-05-13 12:54:03 +02:00
Jakob Nixdorf	a0e3858a7c	Install architecture-independent files to DATADIR. ... Change the installation target for the translations and the .desktop file to the architecture-independent DATADIR.	2015-05-13 09:54:01 +02:00
Markus Goetz	08184d07cf	Merge branch '1.9'	2015-05-12 23:03:45 +02:00
Markus Goetz	ac0e08cc91	Merge branch '1.8' into 1.9	2015-05-12 23:02:58 +02:00
Olivier Goffart	76166c6252	SyncEngine: Fix comment ... A comment should descibe the code, and not a patch.	2015-05-12 17:53:02 +02:00
Olivier Goffart	dd5a49bc78	Application: Disable to workaround of QLockFile bug for Qt versions that are fixed	2015-05-12 17:26:32 +02:00
Markus Goetz	2a45ebde33	Networkjobs: Fix Qt 4 compile (again)	2015-05-12 17:19:17 +02:00
Markus Goetz	cdfafa2180	Propagator: Mention name of conflict file (for debugging)	2015-05-12 17:11:21 +02:00
Olivier Goffart	299fa2dee6	FolderMan: fix a #warning in the migration path	2015-05-12 16:49:37 +02:00
Olivier Goffart	c2dacd03a5	BandwidthManager: fix warnings ... Unused variables	2015-05-12 16:35:27 +02:00
Olivier Goffart	de9770f52a	FolderMan: fix some signal-slot broken connection ... In many cases the alias was changed to a Folder pointer	2015-05-12 15:50:38 +02:00
Olivier Goffart	389c4f8ef9	AccountManager: remove unused variable	2015-05-12 15:38:16 +02:00
Olivier Goffart	3a7bd3f95c	AccountManager: save the config after removing an account	2015-05-12 15:37:16 +02:00
Olivier Goffart	1136b969b2	Folder: fix compilation after merge	2015-05-12 15:27:20 +02:00
Olivier Goffart	716b0c68da	Merge remote-tracking branch 'origin/master' into new-ui	2015-05-12 15:20:40 +02:00
Olivier Goffart	1edd46b995	Multi-Account: add possibility to delete an account	2015-05-12 15:16:32 +02:00
Markus Goetz	00a075b0d8	Merge branch '1.9'	2015-05-12 13:49:55 +02:00
Markus Goetz	3b34d5b54e	Account: Fix Qt4 compile	2015-05-12 13:49:07 +02:00
Jocelyn Turcotte	0f51de20c4	Fix the neon build	2015-05-12 13:04:47 +02:00
Jocelyn Turcotte	ea39e457f5	Fix the build	2015-05-12 10:35:57 +02:00
Daniel Molkentin	b54f2b3b31	Merge remote-tracking branch 'origin/1.9' ... Conflicts: VERSION.cmake src/libsync/propagatedownload.cpp src/libsync/propagateupload.cpp	2015-05-12 10:03:38 +02:00
Daniel Molkentin	a36df4aa4b	Merge remote-tracking branch 'origin/1.8' into 1.9	2015-05-12 09:57:22 +02:00
Markus Goetz	9e7779a476	Bandwidth Manager: Comment out qDebug ... We have not received any grave bug reports for it, not needed anymore.	2015-05-11 16:07:34 +02:00
Markus Goetz	625e61516f	Propagator: Limit length of temporary file name #2789 (fixup) ... Fix 22c35c4d15	2015-05-11 15:42:35 +02:00
Klaas Freitag	41614ec851	Application: ifdef lock file issue as it only happens on Qt>5.1 ... However, the fix breaks Qt4 compile, so it needs to be ifdefed. Not viel hilft viel.	2015-05-11 13:35:04 +02:00
Markus Goetz	22c35c4d15	Propagator: Limit length of temporary file name #2789	2015-05-08 16:42:03 +02:00
Christian Kamm	9507bb4be6	ShareDialog: Password ui fixes. #3189 ... * Change the textedit-empty text to be just "Password" * Hide the 'Copy link' button when the share isn't created yet * Show the checked and disabled 'Password required' checkbox when a password is required.	2015-05-08 14:53:38 +02:00
Markus Goetz	f2004da867	SSL: Re-use encryption session for different TCP connections #3159 ... This also improves the SSL configuration creation and fixes #3027	2015-05-08 14:21:27 +02:00
Christian Kamm	e1c370a9a2	Fix startup hang by removing QSettings lock file. #3175 ... In some situations the .lock file would stay around and cause subsequent starts of the client to get stuck before showing the ui.	2015-05-08 14:02:44 +02:00
Christian Kamm	b9eafaaf24	Wizard: Allow SSL cert dialog to show twice. #3168 ... Normally we never ask twice for the same url, but in the setup wizard it makes sense to do so.	2015-05-08 12:32:14 +02:00
Christian Kamm	909368025f	ProtocolWidget: Fix rename message. #3210 ... For remote renames that are replicated locally the _file member is overwritten by the target file name when the new entry is added to the metadata table. Using _originalFile here guarantees that the affected local file is mentioned.	2015-05-08 11:33:34 +02:00
Markus Goetz	0359c775e0	Discovery: Test better, treat invalid hrefs as error #3176	2015-05-07 17:19:48 +02:00
Jocelyn Turcotte	1053153ec4	Fix the Qt4 build ... Following a6500d8068 Qt4's moc doesn't expand macros and wouldn't evaluate QT_VERSION_CHECK.	2015-05-07 14:49:01 +02:00
Christian Kamm	79ac61684c	Propagator: Overwrite local data only if unchanged. #3156	2015-05-07 14:43:33 +02:00
Christian Kamm	441eca86c4	ShareDialog: Improve error reporting for share API fails. ... This would have made debugging #3204 and #3136 easier.	2015-05-07 14:16:13 +02:00
Markus Goetz	f07d3d069e	Updater on OS X: Only allow if in /Applications #2931	2015-05-07 13:04:25 +02:00
Markus Goetz	e300e3c744	Wizard: Fix lock icon #1447	2015-05-07 13:04:25 +02:00
Christian Kamm	73e2254a80	AccountState: Treat *any* 503 as a temporary error. #3113	2015-05-07 09:21:52 +02:00
Jocelyn Turcotte	7ea1baaf2d	Merge pull request #2920 from remixtj/utility_SHGetKnownFolderPath ... Use dynamic library loading for detecting the correct path for links	2015-05-06 17:22:46 +02:00
Daniel Molkentin	77a28a81eb	Bump to 1.9	2015-05-06 17:01:05 +02:00
Jocelyn Turcotte	a6500d8068	Work around the Qt PUT corruption bug with Qt < 5.4.2 #2425 ... Since QNonContiguousByteDeviceThreadForwardImpl::reset will call UploadDevice::reset with a BlockingQueuedConnection, this allows us to reset the HTTP channel along with its buffers before they get the chance to be reused with a subsequent request.	2015-05-06 16:56:50 +02:00
Luca Lorenzetto	027365aaa6	Additional code cleanup	2015-05-06 15:09:41 +02:00
Jocelyn Turcotte	58867baf33	Merge pull request #3183 from christian-burger/fix-for-windows-explorer-extension-when-syncing-whole-drive ... Windows Explorer: fix issues when syncing whole drive.	2015-05-06 14:54:19 +02:00
Daniel Molkentin	bceb40ed80	Disable setSslConfiguration calls for older Qt version ... This is only required for client certs, which currently have no GUI anyway and are experimental.	2015-05-06 11:20:16 +02:00
Daniel Molkentin	f315423811	Merge remote-tracking branch 'origin/1.8' ... Conflicts: VERSION.cmake	2015-05-06 10:04:22 +02:00
Christian Kamm	9e3c3353bd	IgnoreListEditor: Remove invalid connect. #3201 ... This has been around ever since the ignore editor was added and the slot never existed.	2015-05-06 09:34:45 +02:00
Christian Burger	79f7ea0965	refactoring as requested in pull request	2015-05-05 16:34:01 +01:00
Markus Goetz	07ffff3d77	SyncEngine: Fix accidental re-discovery because of broken version table ... Bug had been triggered by d63abef718 Broken version table in there since some time it seems like.	2015-05-05 17:07:13 +02:00
Luca Lorenzetto	f3bdfef9cf	Integrating feedbacks provided by jturcotte	2015-05-05 16:42:34 +02:00
Daniel Molkentin	bfba6f752c	Remove dead code	2015-05-05 10:23:59 +02:00
Klaas Freitag	d63abef718	SyncEngine: Handle upgrade case from 1.8.0 ... If 1.8.0 caused missing data in the local tree, this patch gets it back. For that, the usage of the journal for remote repository is disabled at the first start.	2015-05-04 13:40:25 +02:00
Christian Burger	018cc54a94	Windows Explorer: fix issues when syncing whole drive. ... When the local sync target is just a drive letter (e.g. "X:\"), neither the display of the sync status via file icon overlay, nor the creation of a share link works. In the latter case no pop-up comes up and no server request is done. QDir::cleanPath() usually removes trailing slashes, but not if the path to be cleaned is just "X:\". In that case the trailing slash is kept. This commit accounts for that exception.	2015-05-04 10:29:25 +01:00
Markus Goetz	4700c604b1	Proxy: Register meta type #3170	2015-04-29 14:54:08 +02:00
Olivier Goffart	e02f1a222e	FolderMan: refactor some function to take a Folder* instead of an alias ... I want to remove this dependency of alias in the code because we might get rid of it entierly later	2015-04-28 17:49:05 +02:00
Olivier Goffart	e4694a6db8	Setup wizard: Do not remove all the folders of all theother acocunts when adding an account ... Also we need the alias to be unique	2015-04-28 17:46:45 +02:00
Olivier Goffart	e5ad1b27b4	Settings dialog: show the first account page at start	2015-04-28 11:39:27 +02:00
Olivier Goffart	92e259c276	Add folder: Do not add at other accounts folder to know if you can add a folder	2015-04-28 11:29:35 +02:00
Olivier Goffart	f81918173b	Account settings: show the folder of the right account	2015-04-27 19:09:48 +02:00
Olivier Goffart	4006bcdaed	Wizard: Setup the folder in the right account	2015-04-27 17:43:07 +02:00
Olivier Goffart	3e4886725a	Folder: remove the member references to the FolderDefinition members	2015-04-27 17:33:59 +02:00
Olivier Goffart	f688bda759	Wizard: Save the settings after adding an account ... So the account persist even if the client is not properly closed	2015-04-27 17:19:46 +02:00
Olivier Goffart	ac855858de	owncloud gui: move a comment where it belongs ... The code was moved long time ago in commit ea1c95100 but the comment stayed. I have no idea if the comment is still accurate	2015-04-27 17:14:25 +02:00
Olivier Goffart	ae17f58b80	HTTP Creds: Do not send the password at every request	2015-04-27 16:28:37 +02:00
Olivier Goffart	23dc464ea2	Folderman: Fix crash when adding an account ... Clang is picky if we forget to return a value	2015-04-27 14:34:39 +02:00
Olivier Goffart	04382c467b	Progress: Fix broken signal connection	2015-04-27 12:34:15 +02:00
Olivier Goffart	be1b39067d	Merge branch 'master' into new-ui	2015-04-27 12:32:12 +02:00
Olivier Goffart	ddfb7f3b7a	Merge remote-tracking branch 'origin/1.8'	2015-04-27 12:20:11 +02:00
Christian Kamm	78e82eb920	AccountWizard: Fix auth error handling. #3155 ... The problem was that on network error the networkError() and finishedWithError() signals both fired. To fix it, I collapse all error handing into a slot triggered by finishedWithError(). I tested the redirection case and the invalid credentials case.	2015-04-24 16:03:28 +02:00
Christian Kamm	27159104a9	Folders: Store inside account config.	2015-04-24 13:42:35 +02:00
Christian Kamm	a13a974e2d	Account: Generate shorter account ids.	2015-04-24 09:54:42 +02:00
Markus Goetz	3a52db46ad	Discovery: Fix another empty-local-directory bug	2015-04-23 16:15:13 +02:00
Christian Kamm	f184d66ea2	Save and restore multiple accounts.	2015-04-23 16:08:20 +02:00
Christian Kamm	11927d625d	Fix crash on exit by not making Account parent of AccountState.	2015-04-23 16:08:20 +02:00
Christian Kamm	abfdc574d4	Add a basic random Account::id()	2015-04-23 15:47:49 +02:00
Christian Kamm	d64373c610	Never use 'new Account' directly, prefer Account::create()	2015-04-23 15:47:49 +02:00
Christian Kamm	28306e5dfb	Move AccountState::displayName to Account.	2015-04-23 15:47:49 +02:00
Christian Kamm	89bb58ac30	Ensure 'user' is available early enough for ui in httpcreds	2015-04-23 15:47:49 +02:00
Christian Kamm	3cc2e1a968	Fix bad connect/disconnects.	2015-04-23 14:24:54 +02:00
Christian Kamm	8390b0b930	Determine right account in ownCloudGui::slotShowShareDialog	2015-04-23 14:14:28 +02:00
Christian Kamm	dbddabfcd7	Remove SelectiveSyncText ... It is unused and there were compiler warnings about it not appearing it various switch() statements.	2015-04-23 14:13:33 +02:00
Christian Kamm	0d30e01e98	Add explanations to fixmes	2015-04-23 14:13:13 +02:00
Markus Goetz	137bce6dd0	Folder: Clear _syncResult better ... I had a situation here where we were showing stale desktop notifications when a remote folder errored out and then sync finished with _syncResult data from previous sync.	2015-04-23 13:30:30 +02:00
Christian Kamm	7c1281dd06	Windows: Fix rename of finished file. #3073 ... The file was still open and therefore couldn't be renamed...	2015-04-22 14:46:04 +02:00
Christian Kamm	68bf22f469	Revert "AccountSettings: Update progress only twice per second. #3014" ... This reverts commit 0f33e266ce. The change was not meant to be merged, see discussion in #3014.	2015-04-22 11:46:00 +02:00
Christian Kamm	96ecdb866d	Time estimate: Refactor remaining time guess. #2328	2015-04-22 11:20:31 +02:00
Christian Kamm	7d68c628db	Time estimation: Use a consistent check for size dependence. #2328	2015-04-22 10:45:41 +02:00
Christian Kamm	509b83e73e	Time estimation: Avoid a progress reset before finish. #2328 ... The current algorithm doesn't care much, but resetting progress to 0 just before completing a job is confusing anyway.	2015-04-22 10:45:41 +02:00
Christian Kamm	0f33e266ce	AccountSettings: Update progress only twice per second. #3014	2015-04-22 10:45:41 +02:00
Markus Goetz	6c5ca055c4	ShareDialog: Unused/invalid forward declaration	2015-04-21 10:33:38 +02:00
Olivier Goffart	cf5100a20b	Merge remote-tracking branch 'origin/1.8'	2015-04-20 14:58:45 +02:00
Jocelyn Turcotte	ffbf2fb6ce	Fix the neon build	2015-04-20 11:31:02 +02:00
Olivier Goffart	b039c2ce86	More change to compile with 5.5 ... The problem is again that QStringList no longer include QDataStream	2015-04-20 09:47:25 +02:00
Olivier Goffart	ba65187ad3	Fix compilation with Qt 5.5 ... Because of commit 90e7cc172a7521396bb2d49720ee4ceb9a9390b3 in qtbase, we now need to explicitly include QDataStream Fixes #2809	2015-04-19 11:02:43 +02:00
Jocelyn Turcotte	12d7484b85	Pass SyncFileItems by pointer instead of by value ... Use a QSharedPointer to keep the same ownership and continue passing the SyncFileItems as a const& when ownership isn't taken. This allows sharing the same allocations between the jobs and the result vectors. This saves about 20MB of memory (off 120MB) once all jobs are created.	2015-04-18 14:26:40 +02:00
Olivier Goffart	a932eac832	Multi-account WIP	2015-04-17 17:56:17 +02:00
Jocelyn Turcotte	155c965866	Prevent another crash in ~SocketApi #3118 ... Since the QLocalServer parent of the QLocalSockets gets destroyed after the _listeners QList, onLostConnection might try to update an already destroyed list. Fix the issue by simply making sure that _localServer is destroyed first.	2015-04-17 12:42:40 +02:00
Olivier Goffart	6c73f25747	HTTP creds: Fix translation of the password input dialog ... tr() needs Q_OBJECT	2015-04-17 12:19:37 +02:00
Olivier Goffart	2da3bfb96f	Merge branch 'master' into new-ui	2015-04-16 12:50:21 +02:00
Olivier Goffart	5dffd11755	Merge branch '1.8'	2015-04-16 12:49:31 +02:00
Olivier Goffart	8bb4af067a	Propagate download: Fix restoring files for which the conflict file exists ... For issue #3106 1) Always use the actual timestamp from the file in the file system to create the conflict file. This is important because if one edit a file several time, they should have different name. Also it makes more sens to have the mtime of the modified file. 2) Give the correct size to the job so we know when the temporary file is complete in case of resuming.	2015-04-16 11:36:01 +02:00
Olivier Goffart	458f336405	PropagateDownload: Read the mtime from the file system after writing it ... Because file system like FAT only have two second accuracy and would result in a upload if the mtime in the database is not the same as the one that was downloaded Issue #3103	2015-04-15 15:50:20 +02:00
Markus Goetz	7c9cffa5ae	ConfigFile: Remove unused functions	2015-04-15 14:58:27 +02:00
Daniel Molkentin	ed80a712ab	Sort folder sizes SelectiveSyncTreeView numerically ... Fixes #3112	2015-04-14 20:00:42 +02:00
Markus Goetz	2866e56c51	LsColXMLParser: More testing 2	2015-04-14 14:56:25 +02:00
Klaas Freitag	4283ab3b44	LsColJob: Create a XML parser object for better unit testability.	2015-04-14 13:43:05 +02:00
Klaas Freitag	c579069071	LsColXMLParser: let parse return bool.	2015-04-14 13:41:51 +02:00
Markus Goetz	9ffacd4ecd	Discovery: Explicitly check for XML parser errors ... ..instead of relying that our state machine does not do anything in that case.	2015-04-13 16:04:24 +02:00
Markus Goetz	9d5f5ea3bc	Discovery: Initialize error with EIO in constructor ... This is safer, initializing it in remote_vio_opendir_hook was enough though.	2015-04-13 15:54:08 +02:00
Markus Goetz	2dbd27af76	Discovery: Initialize error with EIO	2015-04-13 15:36:07 +02:00
Markus Goetz	0634a4d0c6	Discovery: Add a sanity check when results are parsed	2015-04-13 15:10:04 +02:00
Klaas Freitag	7b99877c68	owncloudcmd: Filter out empty lines in selectivesync	2015-04-12 12:59:25 +02:00
Klaas Freitag	ec81cdefb0	Networkjobs: Only log a subset of the account url. ... This avoids disclosing of user and password in the logfile which can happen in some cases.	2015-04-12 12:37:14 +02:00
Christian Kamm	9d8fc4aa4d	ProtocolWidget: Fix adding of seconds. #2535	2015-04-10 12:11:35 +02:00
Christian Kamm	57ac1d9ea2	AuthRedirect: Use the configured DAV path. #3082	2015-04-10 09:24:25 +02:00
Christian Kamm	d9ea6936ab	Handle redirect of auth request. #3082	2015-04-10 09:18:15 +02:00
Olivier Goffart	afdd01488f	AccountManager: Move out of libsync ... The AccountManager does not belong in the libsync because it is not part of the synchronisation algorithm, but is just an helper class for the UI to maintain the account and read/save the config	2015-04-09 16:19:17 +02:00
Olivier Goffart	f3cb5f8a9d	Merge remote-tracking branch 'origin/1.8'	2015-04-09 14:24:26 +02:00
Olivier Goffart	85ff245aef	Account settings: add the progress back on the new ui	2015-04-09 12:06:47 +02:00
Christian Kamm	adcf40afc3	Discovery: Speed up initial run. #2796	2015-04-08 15:43:49 +02:00
Christian Kamm	d986011067	Sync: Fix sync of deletions during 503. #2894	2015-04-08 10:50:08 +02:00
Roeland Jago Douma	5a83636f81	Only show share dialog if we are connected.	2015-04-08 09:53:57 +02:00
Jocelyn Turcotte	4a890eae38	SyncEngine: Fix a crash caused by an invalid DiscoveryDirectoryResult::iterator #3051 ... The default constructor of the iterator points to NULL, which makes it != end() but invalid to dereference. Use an integer index instead to keep 0 as a valid default value that can always correctly be checked against size(). Also make sure that no data is shared between threads by making the csync_vio_file_stat_t copyable and passing it as const.	2015-04-08 09:35:43 +02:00
Christian Kamm	760e11bc5d	Sharedialog: Fix compiler warnings.	2015-04-08 08:59:36 +02:00
Klaas Freitag	4a6f4919d7	More GUI refinements.	2015-04-07 13:38:01 +02:00
Klaas Freitag	b98040c7d5	ShareDialog: handle resize properly with elided text	2015-04-07 13:38:01 +02:00
Klaas Freitag	1240a8163d	ShareDialog: Some GUI rework requested by Jan.	2015-04-07 13:38:01 +02:00
Olivier Goffart	e15b9b5358	Merge remote-tracking branch into 1.8	2015-04-07 10:42:27 +02:00
Olivier Goffart	1617c9d482	PropfindJob: fix xml parsing ... It would only find the first property	2015-04-07 10:35:27 +02:00
Olivier Goffart	50ba73860c	Merge remote-tracking branch into 1.8	2015-04-07 08:02:55 +02:00
Markus Goetz	750cdc1910	AbstractSslErrorHandler: Also give QSslConfiguration	2015-04-06 21:46:03 +02:00
Olivier Goffart	f4e2c84111	AccountState: Fix uninitialized memory access spotted by valgrind ... QuotaInfo's constructor uses the AccountState's _state which is initialized after	2015-04-06 16:21:05 +02:00
Olivier Goffart	71d9f23068	theme: fix compilation of libsync without QtGui	2015-04-03 11:27:06 +02:00
Markus Goetz	7f2213416a	Discovery: Add warning if returned etag is 0 ... There will be another bugfix which fixes https://gist.github.com/jturcotte/3d5a7874d26bc27b1be9 directory.	2015-04-02 16:57:53 +02:00
Markus Goetz	9b9f0bdd4d	SyncEngine: Show more timing measurements #3064	2015-04-02 15:18:46 +02:00
Jocelyn Turcotte	c2fd7d6ebd	Clean up remains of SOCKETAPI_TCP	2015-04-01 15:03:42 +02:00
Jocelyn Turcotte	4a893c5267	Fix a crash on shutdown in ~SocketApi #3057 ... Deleting the QLocalSocket while iterating the QList with qDeleteAll would trigger onLostConnection, which would modify the list mid-air and leave dangling pointers in it.	2015-04-01 15:03:42 +02:00
Jocelyn Turcotte	2473183f19	Windows: Add version information for owncloud.exe ... This should help us know what version or build number a crash report was generated with.	2015-04-01 15:03:41 +02:00
Daniel Molkentin	f2fa812b0b	Updater: Give context as to which app is about to be updated ... Fixes #3040	2015-03-30 14:44:34 +02:00
Markus Goetz	ef89582d7e	Propagator: Fix compile	2015-03-30 08:41:53 +02:00
Olivier Goffart	426d2338d9	Settings: New UI that intergate the selective sync within the account settings	2015-03-27 16:50:35 +01:00
Christian Kamm	ba0c3256fa	Remove unused HttpConfigFile.	2015-03-27 13:20:10 +01:00
Markus Goetz	b6fe5d2cff	Propagator: Debug output regarding OC-ETag ... We can remove this in some time, but currently it is interesting to see for what server setup is no ETag but an OC-ETag.	2015-03-27 13:16:11 +01:00
Markus Goetz	9123fac545	owncloudcmd: Always trail path with / ... Else the csync code vs the Qt code get confused.	2015-03-27 13:15:43 +01:00
Markus Goetz	c6bc388001	Proxy: More debug, always set returned system proxy	2015-03-27 11:53:58 +01:00
Christian Kamm	ea985a85af	ProtocolWidget: Always add seconds to the DateTime locale. #2535	2015-03-27 11:25:30 +01:00
Christian Kamm	dfd9d8725c	Merge remote-tracking branch 'origin/1.8' ... Conflicts: doc/installing.rst	2015-03-27 11:19:59 +01:00
Christian Kamm	2578832002	Fix clang warnings about deleting incomplete 'Account'.	2015-03-27 11:11:44 +01:00
Markus Goetz	cfada67aa6	Proxy: Fix compile harder	2015-03-27 11:02:19 +01:00
Christian Kamm	5483682281	CookieJar: Don't accidentally overwrite cookies. #2808 ... Calling save() in the CookieJar destructor was problematic. For instance we sometimes create a new QNAM with a new CookieJar and then call setCookieJar() on it to assign some other jar. That destroy the fresh jar and potentially overwrite cookies. Also explicitly saving the account's cookies when the account is saved is more explicit and thus more reliable than counting on the Account destructor to do it.	2015-03-27 10:49:24 +01:00
Christian Kamm	2a8c23aac3	Account: Destroy on exit. ... During shutdown we want the account object to be deleted and therefore we need to be able to remove the strong reference in AccountManager.	2015-03-27 10:43:14 +01:00
Christian Kamm	88bc96fc4c	ConValidator: Delete instance if no credentials.	2015-03-27 10:43:14 +01:00
Christian Kamm	588129d852	HttpCreds: Delete password from old location. #2186	2015-03-27 10:40:19 +01:00
Markus Goetz	5c87a35fe4	Proxy: Fix compile	2015-03-26 18:36:37 +01:00
Markus Goetz	418185af9a	Qt4: Fix compile	2015-03-26 15:17:16 +01:00
Roeland Jago Douma	4b56cc6e08	On creation of a share always retrieve the share ... This makes sure that if a default expiration date is set this is reflected in the dialog. #2889	2015-03-26 13:48:33 +01:00
Christian Kamm	3cef771868	HttpCreds: Fill pw dialog with previous password. #2848 #2879	2015-03-26 09:25:45 +01:00
Markus Goetz	e0ae34f01b	SslButton: Make menu creation lazy ... Saves ~200msec on my not-so-old MBP on OS X. For #3007 #2990	2015-03-25 15:41:23 +01:00
Christian Kamm	a9a24c96fc	Themes: Cache icons instead of rebuilding a lot.	2015-03-25 14:59:28 +01:00
Markus Goetz	a202203325	Proxy: Fix issues with previous patch ... This is for #2993 and #2802	2015-03-25 12:25:49 +01:00
Markus Goetz	83c3d76966	Proxy: Look up system proxy from different thread ... We should actually upstream this into QNAM. This is for #2993 and #2802	2015-03-25 08:52:23 +01:00
Markus Goetz	99734f8d72	Account: Unusued variable	2015-03-25 08:52:23 +01:00
Olivier Goffart	dafc2d2b73	Sync engine: Check the blacklist for the right tree ... When the operation is download, we have a INSTRUCTION_NONE for the local tree, but we should not check the blacklist just yet.	2015-03-24 12:23:04 +01:00
Olivier Goffart	9c05150c12	SSLButton: Fix a crash ... Made with danimo. Attempt to fix a crash seen on breakpad reports. (cc06b990-0c10-40eb-bcec-4d3902150320)	2015-03-23 18:30:53 +01:00
Daniel Molkentin	c7eb85ef78	Activity: Correctly restore column sizes ... Fixes: #3005	2015-03-23 18:22:25 +01:00
Olivier Goffart	4df455f2e0	Add-folder Wizard: Select the newly created folder	2015-03-23 16:50:37 +01:00
Olivier Goffart	653a00d63d	Add-folder wizard: Make sure there is a scrollbar if folder names are too long ... Fixes #2962	2015-03-23 16:32:41 +01:00
Jocelyn Turcotte	3c9acdf724	Fix a crash when accessing a dangling UploadDevice pointer #2984 ... This is largely a guess, but this is the only place where we use a QIODevice to push data through QNAM and that the QIODevice isn't a direct child of the QNetworkReply. Fix the issue by making sure that we don't go back to the event loop and possibly handle network events between the destruction of the upload QIODevice and the QNetworkReply, which might lead to QNAM dereferencing a dangling QIODevice pointer.	2015-03-23 16:14:54 +01:00
Olivier Goffart	e81d1ab9b8	application: --confdir option with invalid direcotry now exit ... Show an error and exit if an invalid directory (eg, a file) is passed to --confdir Fixes: #2453	2015-03-23 15:02:27 +01:00
Olivier Goffart	9d7cf6b852	Merge remote-tracking branch 'origin/1.8'	2015-03-23 14:37:16 +01:00
Christian Kamm	4ef0ce112c	CookieJar: Session cookies should *not* be stored in cookies.db.	2015-03-19 11:57:25 +01:00
Christian Kamm	57c14a0eba	Windows: Reset QNAM as a workaround. #2899 #2895 #2973 ... The QNetworkAccessManager is reset when we are disconnected, just before attempting to fetch the server's status.php. This may help fix the problem described in various issues where we get 'Connection closed' or timeout errors after the OS has woken from sleep.	2015-03-19 11:40:47 +01:00
Christian Kamm	89f831e7d4	Remote delete: Consider 404 a success. #2919	2015-03-19 10:04:02 +01:00
Markus Goetz	06a2f58c51	Propagator: Introduce custom property to make error soft ... This can be set by a custom credential QNAM.	2015-03-17 23:31:30 +01:00
Jocelyn Turcotte	5264a8c7f6	shell_integration: Fix disappearing context menus on Windows #2898 ... Since each new connection to the socket API would trigger a broadcast of REGISTER_PATH to all existing connections, opening the context menu would trigger a SHChangeNotify call of the root directory through the overlay icon extension, which is currently also connected to the socket API, waiting for changes. Fix the issue by sending the initial REGISTER_PATH automatic response only to the connecting socket.	2015-03-13 20:53:59 +01:00
Luca Lorenzetto	9351c5eefa	Cleaner creation of link path. Using QDir ensures that every needed / is present	2015-03-13 16:23:43 +01:00
Markus Goetz	c42c9f0002	Propagator: Add comment	2015-03-13 15:48:35 +01:00
Daniel Molkentin	457f9b587d	Merge remote-tracking branch 'origin/1.8' ... Conflicts: src/gui/sharedialog.cpp src/gui/sharedialog.h	2015-03-13 14:03:03 +01:00
Christian Kamm	95f299f865	Remote folder wizard: Add optional manual entry #2613	2015-03-13 09:52:21 +01:00
Jocelyn Turcotte	e93c1ccb73	Install the crash handler earlier during startup ... This moves the crash handler installation during the OCC::Application contruction. This still leaves a window where crashes wouldn't be caught, leaving the QtSingleApplication and theme initialization code unreported, but isn't requiring any refactoring for now. Issue #2952	2015-03-12 17:16:05 +01:00
Jocelyn Turcotte	0f84510e6f	Fix the build with GCC 4.7 ... Disable bitfields completely in SyncFileItem with that compiler.	2015-03-12 14:54:11 +01:00
Christian Kamm	1dd3488973	Uploads: Fix big seeks on Windows. #2954	2015-03-12 13:18:08 +01:00
Christian Kamm	9249d6c2f9	Logging: Print instruction when job completed.	2015-03-12 10:26:44 +01:00
Christian Kamm	d0f07ee3a9	FolderMan: fix folderSyncStateChange emission. #2896 ... It was not emitted when a removed folder finished its sync, and that left the UI in an old state sometimes. Removing the Folder explicitly is unnecessary as a QSignalMapper will automatically remove mappings for deleted QObjects.	2015-03-12 10:00:45 +01:00
Christian Kamm	3992fba168	Activity: Set a message for conflicts. #2792 ... Also show size when conflicting files are downloaded.	2015-03-12 10:00:45 +01:00
Markus Goetz	f13dfc19a0	OS X: Fix UI glitches related to sync folder ... For #2113 and #2947	2015-03-11 16:42:12 +01:00
Jocelyn Turcotte	0fccf5e50d	Completely disable the crash handler if the user disabled it ... The config currently only disable the reporter, but still leaves the crash handler installed on startup. This causes conflicts when running those builds in lldb. Work around the issue by requiring the crash reporter to be disabled in the settings before owncloud can be run in lldb. This has the negative side-effect of not covering the initial ConfigFile loading with the crash handler. Issue #2946	2015-03-11 15:49:49 +01:00
Klaas Freitag	a2aab28ba6	ShareDialog: Connect the proper DateEdit signal.	2015-03-11 15:46:05 +01:00
Klaas Freitag	8e7b7caf04	ShareDialog: If the password is empty, disable button	2015-03-11 14:57:55 +01:00
Klaas Freitag	8cc5ff0e70	ShareDialog: Consider if resharing is not allowed on a share. ... If a file or directory is shared without resharing permission, the share dialog displays an error. This is not the optimal solution, but best for now, as we do not have the permissions available for the file manager plugin. This fixes #2923	2015-03-11 14:12:08 +01:00
Klaas Freitag	9086f09fe2	SocketAPI: If filename has a trailing slash, remove it. ... The SyncJournal stores the the names of directories without trailing slash.	2015-03-11 14:11:18 +01:00
Christian Kamm	efe9f1b442	Lnk: Work around QFile::rename() #2792 ... QFile::rename() fails if the source file is a shortcut to a file or directory that does not exist.	2015-03-11 12:29:33 +01:00
Jocelyn Turcotte	db7919dc2f	Shrink sizeof(SyncFileItem) by 20% ... Move all small fields together in the struct and make them use bitfields. Also remove the unused log::_other_remotePerm field.	2015-03-11 11:49:11 +01:00
Olivier Goffart	4a01644625	Disable parallel uploads for server versions <= 8.0.2 ... Issue #2938	2015-03-11 11:31:51 +01:00
Klaas Freitag	071177cee2	Output a more sensible error message for auth errors	2015-03-10 12:14:14 +01:00
Klaas Freitag	c88742fad3	Revert "SetupW: Display proper error messages if password or user was wrong." ... This reverts commit 396f38598f. This adds redundant code and potentially breaks Shibboleth	2015-03-10 11:17:35 +01:00
Markus Goetz	3b12b9d81d	Revert "Propagator: Delete job on finish" ... Needs a bit more thinking. This reverts commit 8746914f3b.	2015-03-09 16:19:16 +01:00
Markus Goetz	31e4009737	Propagator: Use QBA for responseTimestamp instead of QString	2015-03-09 15:52:52 +01:00
Markus Goetz	8746914f3b	Propagator: Delete job on finish	2015-03-09 15:41:43 +01:00
Klaas Freitag	2fa6839ac7	Make win32 build work again.	2015-03-09 15:14:55 +01:00
Klaas Freitag	b09e08c06f	ShareDialog: Made it less "webbish" for better usability. ... - Check the share checkbox automatically on open of the dialog - Use the date picker with popping up calendar - Proper initial size - no resizing and appearing and disappearing. Fixes probably #2917, also #2764	2015-03-09 14:33:02 +01:00
Jocelyn Turcotte	99f51998f2	Fix a crash in the crash reporter on OSX ... The install_name of dependent libraries need to be updated like we do for cmd and gui.	2015-03-06 19:28:53 +01:00
Klaas Freitag	396f38598f	SetupW: Display proper error messages if password or user was wrong. ... If the password or user was wrong during setup, the client showed a ConnectionClosed error instead of a proper Username or password wrong message. This was because in HTTPCredentials::slotAuthentication, the reply is closed, and a property is set to indicate the auth problem. This patch now checks at all occurences of networkErrors if it might have been an authentication problem, and displays something useful. There is a good chance that this is a sufficient fix for owncloud/enterprise#556	2015-03-06 16:41:59 +01:00
Klaas Freitag	d2848b9c26	Theme: Return the correct version string from version()	2015-03-06 16:41:59 +01:00
Markus Goetz	b622981b23	SyncEngine: Show a debug msg only when relevant	2015-03-06 09:28:50 +01:00
Markus Goetz	668de9bf31	Propagate: Don't retry direct download on abort	2015-03-05 21:56:39 +01:00
Markus Goetz	3f712dce02	ETags: For Folder and RequestEtagJob, always use Concatenation	2015-03-05 17:49:12 +01:00
Markus Goetz	2eaeaf33fa	Discovery: Change abort code a bit ... Now pressing pause in the UI will not show an error to the user.	2015-03-05 16:50:33 +01:00
Luca Lorenzetto	4e56b0d266	Use dynamic library loading for detecting the correct path for links	2015-03-04 17:28:43 +01:00
Klaas Freitag	398bca9fe4	Add OWNCLOUDSYNC_EXPORT prefix to make windows build.	2015-03-04 13:50:55 +01:00
Olivier Goffart	46d5d22f72	PropagateUpload: also read the OC-ErrorString header from the poll job	2015-03-04 12:01:41 +01:00
Olivier Goffart	97c221d860	PropagateUpload: add a few comments	2015-03-04 12:00:55 +01:00
Jocelyn Turcotte	a5d29e6d56	Fix missing symbols on XP ... Import a fix from libcrashreporter-qt that should remove usage of symbols not available in XP's msvcrt.dll This should help solving #2907 with the crash reporter enabled.	2015-03-04 09:51:54 +01:00
Markus Goetz	131cf63d8d	Propagator: Don't use 0,0 progress signals. ... They seemed to have messed up the calculation sometimes for the last chunk.	2015-03-03 17:46:57 +01:00
Olivier Goffart	4d85f1daec	setup wizard: use a PROPFIND instead of a GET on the webdav url ... In order to initiate the conneciton, we should not send a GET on the webdav URL because that is not a valid webdav command on a collection. Issue #2911	2015-03-03 16:03:53 +01:00
Klaas Freitag	f913cd97ee	DiscoveryJob: Fix progress display. ... This fixes #2909	2015-03-03 16:01:17 +01:00
Olivier Goffart	ccbeb86140	Fix build of the legacy propagator	2015-03-03 10:05:38 +01:00
Olivier Goffart	b43e0f5ebd	Do not ask for the password when the check server job times up ... QNetworkReply::OperationCanceledError may be both because of anthentication error (because the HTTPCredentials abort the reply) or because of a timeout (the timer abort the reply). We should only ask for the password if the reply was canceled because the password was wrong.	2015-03-03 09:21:24 +01:00
Markus Goetz	fe574dbbf9	Discovery: Free some memory before propagate (#2902)	2015-03-02 15:08:21 +01:00
Markus Goetz	7595c7e697	Discovery: Free some memory on VIO dir close (#2902)	2015-03-02 14:09:01 +01:00
Olivier Goffart	bd6769a3fd	LsColJob: one must now specify the properties ... So the discovery phase don't ask for the quota, and the selective sync don't ask for all the other properties Issue #2906	2015-03-02 11:03:25 +01:00
Markus Goetz	80f3c7584b	libowncloudsync: Don't link to Qt SQL and Qt XML ... For issue #2901 ..	2015-02-27 16:20:25 +01:00
Klaas Freitag	05624e3fc8	FileSystem: Remove QFileInfo based implementations. ... QFileInfo has to be refreshed if the underlying file has been modified in between. That is dangerous so ckamm and me decided to eliminate the QFileInfo based implementations. This was triggered by a bug that the client uploaded files that it should not have.	2015-02-27 15:27:49 +01:00
Christian Kamm	e381143a8f	Ensure good sync state if in-progress folder is deleted. #2896 ... The slotFolderSyncFinished() didn't reliably trigger because the folder was being deleted before the syncFinished signal could fire.	2015-02-27 12:39:19 +01:00
Christian Kamm	b03209ccef	Inform user about ignored long files. #2882	2015-02-27 12:12:39 +01:00
Markus Goetz	ec03ebd69f	Token Auth: Allow empty token ... Just username/password. The received token will automatically be stored inside the QNetworkCookieJar.	2015-02-27 11:58:18 +01:00
Roeland Jago Douma	51c617801d	static member QFileInfo::exists is not available on 4.8	2015-02-27 08:43:33 +01:00
Klaas Freitag	8507aba9f8	SocketAPI: Append trailing slash for directories in UPDATE_VIEW. ... This fixes #2233	2015-02-26 16:41:55 +01:00
Olivier Goffart	d8b6e00fe7	Propagator: Let network propagator job understand a new header OC-ErrorString ... This allows the server to send a readable error string in many cases	2015-02-26 15:53:09 +01:00
Christian Kamm	c8167b77c9	Remove mention of allprop #2865	2015-02-26 12:36:11 +01:00
Christian Kamm	c37792f58f	Propagator: Upload files with future timestamps. #2880	2015-02-26 11:00:06 +01:00
Christian Kamm	842e5ba5e0	Sharing: Fix for folders containing &. #2892	2015-02-26 09:58:09 +01:00
Roeland Jago Douma	fba9020950	Added copyright header	2015-02-25 18:32:25 +01:00
Klaas Freitag	506cc3908a	Add proper copyright headers to some files, fixes #2869	2015-02-25 17:00:27 +01:00
Klaas Freitag	ca00b02b0a	ShareDialog: Improve some GUI, fix #2850 ... This improves some wording and fixes some show/hide issues with password setting.	2015-02-25 13:44:27 +01:00
Klaas Freitag	201075827f	Sharedialog: Add a Share button.	2015-02-25 13:44:27 +01:00
Christian Kamm	5c7fd24ea8	Handle 503 due to maintenance more gracefully. #2884	2015-02-25 12:02:10 +01:00
Christian Kamm	76ac628153	Discovery: Distinguish 503 Storage not available. #2884	2015-02-25 12:02:10 +01:00
Christian Kamm	6f71bd9353	SocketAPI: Don't mark .lnk files as ignored on windows. #2447	2015-02-25 11:55:48 +01:00
Christian Kamm	f88398e776	lnk files: Fix exists() calls. #2792	2015-02-25 11:50:32 +01:00
Christian Kamm	08c33cd1dc	Discovery: Fix handling of 503 on a folder. #2884	2015-02-25 08:09:07 +01:00
Klaas Freitag	1929040bb7	Discovery: Preserve the error message.	2015-02-24 22:02:31 +01:00
Klaas Freitag	3af936c8a1	Some minor cleanups.	2015-02-24 22:02:29 +01:00
Daniel Molkentin	f38aa698eb	Don't translate dummy strings	2015-02-20 10:12:31 +01:00
Daniel Molkentin	366f3f68b8	Activity view: Always add date ... Fixes #2223	2015-02-20 10:12:19 +01:00
Jocelyn Turcotte	03e23da6a3	Show the settings also when no arguments are passed ... sendMessage would only be called if there were options to be sent to the running application. Fix the issue by having explicitly named messages and always send the show settings message. Issue #2374	2015-02-19 16:57:16 +01:00
Jocelyn Turcotte	2ddaf5a06a	Add a NO_MSG_HANDLER cmake option ... This allows QDebug to output to stdout or OutputDebugString to ease development.	2015-02-19 16:57:16 +01:00
Olivier Goffart	5e1aa7d383	SyncEngine: Fix move would re-upload the file ... Because SyncJournalDb::postSyncCleanup was deleting the entries in the database	2015-02-19 15:00:37 +01:00
Olivier Goffart	e1871eb325	libsync: Fix qWarning in SyncEngine::slotJobCompleted saying we cannot find the sync item when moving ... We need to compare against the original file name, that's why it's there	2015-02-19 13:13:45 +01:00
Olivier Goffart	1998b602b9	SyncEngine: better merge of the renames node ... The same file is on the two sync trees under different names in case of a rename We must therefore use the rename target as the key in the _syncItemMap to ensure that the trees are correctly merged. Also use the same UTF-8 decoding for the target than for the actual file in order to catch invalid utf-8 in the rename target	2015-02-18 12:41:06 +01:00
Olivier Goffart	193fca4a8b	SyncFileItem::operator<: must return false when two items are equal ... Fixes #2852	2015-02-18 12:41:06 +01:00
Olivier Goffart	fb77cd5f7e	SyncEngine: Fix detection of the server reconfiguration ... Some files might be kept (like the default files) The files should be considered as NONE only if they are NONE on both trees issue #2847	2015-02-17 16:44:13 +01:00
Daniel Molkentin	99d674c346	Default shiboolethwebview to 900x700, remember last size ... Also add host to the title Addresses #2285	2015-02-17 15:28:14 +01:00
Daniel Molkentin	9690ca0198	Explain the "crash now" button to translators	2015-02-17 14:03:09 +01:00
Olivier Goffart	9351c7485f	Try another way to fix the build	2015-02-17 14:04:16 +01:00
Olivier Goffart	d43b82dc82	Fix compilation with clang ... The compilation error was account.h:140:113: error: expected ')' const QList< QPair<QString, QString> > &queryItems = QList< QPair<QString, QString> >()); ^ followed by more errors. The problem is because the compiler has hard time disambiguiating the comma int foo(const QPair<int, int> &p = QPair<int, int>()); ^ It is indeed quite hard for the compiler to know if this comma is a separation between complate arguments or the separation between arguments of the functions. Use the C++11 construct instead which does not need commas	2015-02-17 11:09:45 +01:00
Olivier Goffart	ce195bd599	SyncEngine: add an getter to the journal	2015-02-17 11:08:16 +01:00
Olivier Goffart	c0c8a22fa3	SyncEngine: pass a non-const reference to the SyncFileItemVector in aboutToPropagate ... That way, users of the library can change the contents of the sync item vector.	2015-02-17 11:08:16 +01:00
Jocelyn Turcotte	a955defae5	Raise the share window to make sure that the user sees it	2015-02-16 16:47:00 +01:00
Daniel Molkentin	2423aa592f	Add new icons by Jan	2015-02-16 14:47:32 +01:00
Olivier Goffart	151228b2a6	Fix build when compiling libsync without QtGui ... Utility must stay QtGui-free, move the hidpiFileName to the theme which is the only part in libsync which uses it, and already has #ifdefs	2015-02-16 10:24:42 +01:00
Volkan Gezer	bd4f68233f	some typos, grammar and sentence fixes	2015-02-14 23:47:07 +01:00
Olivier Goffart	d6bdbf9f34	Logger: use qFormatLogMessage with Qt 5.4 so it respects the Qt logging preferences	2015-02-14 14:23:01 +01:00
Christian Kamm	40dbc78407	concatUrl: Remove manual parsing, add test. #2817	2015-02-13 14:53:55 +01:00
Daniel Molkentin	957c9f060d	GeneralSettings: Add OpenSSL version number to about text	2015-02-12 23:23:47 +01:00
Daniel Molkentin	0bf0bab1eb	One more Qt4 compile fix	2015-02-12 22:13:58 +01:00
Olivier Goffart	a7c97388a9	Fix Qt4 build for another error	2015-02-12 20:16:02 +01:00
Olivier Goffart	86c480ee09	Fix Qt4 build	2015-02-12 20:10:31 +01:00
Olivier Goffart	0184a00151	PropagateDirectory: make the code a bit more readable ... Do not call slotSubJobFinished when there is are no sub jobs because no sub jobs were finished. Instead just call a finalize method	2015-02-12 20:00:04 +01:00
Olivier Goffart	b9161aa06c	libsync: Fix a case in which canceling the sync would result in some folder never being sync'ed ... The problem occurs because of the sorting of items when we have things like bigfolder bigfolder/bigsubfolder bigfolder-2 Then, because dashes come before slash in ascii, the bigfolder-2 would come before its content and the propagator would thinkg bigfolder is empty and save the etag before it is processed Should fix issue #2832	2015-02-12 20:00:04 +01:00
Daniel Molkentin	00e42d1177	More HIDPI support ... Except for the non-native activity tab icon in settings, this should fix #11	2015-02-12 19:44:40 +01:00
Klaas Freitag	d37dd040d0	Sharedialog: Use new share link from ownCloud Server 8 on. ... This is derived from pull request https://github.com/owncloud/client/pull/2813	2015-02-12 17:04:03 +01:00
Christian Kamm	a2aef04f21	ConValidator: Avoid a double auth check during startup. #2801	2015-02-12 15:25:44 +01:00
Christian Kamm	8f75434558	QuotaInfo: Ensure only one QuotaJob during startup. #2801	2015-02-12 15:25:44 +01:00
Daniel Molkentin	3dd6bcc323	Disable GUI support for TLS client certificates ... The feature needs mor work	2015-02-12 15:17:59 +01:00
Olivier Goffart	063271e978	propagateupload: Disable parallel chunk upload for owncloud < 8 ... Issue #2743	2015-02-12 14:50:42 +01:00
Olivier Goffart	438c4fe72e	Account: put the server version in the account	2015-02-12 14:50:42 +01:00
Klaas Freitag	f4144d6d38	Merge pull request #2827 from rullzer/fix_2812 ... Added push button to sharedialog to set password	2015-02-12 13:49:56 +01:00
Klaas Freitag	eada70ba44	Sharedialog: Removed Thumbnail retrieval. ... It uses an unstable API that the server does not really support. We need to postpone that. Removed for now.	2015-02-12 13:47:07 +01:00
Daniel Molkentin	3439ea395b	Remove one more mention of certDate	2015-02-12 12:43:41 +01:00
Daniel Molkentin	ba3bab8f49	Remove certificateDate property and other superfluous code	2015-02-12 12:37:42 +01:00
Christian Kamm	9ba88f6baf	Windows: Sync .lnk files correctly. #2792	2015-02-12 11:27:58 +01:00
Christian Kamm	e4fce1250b	Progress: Ensure overall progress is between 0 and 100. #2648 ... This should *already* be the case - but @dahan1999 reported that it fixed #2648.	2015-02-12 10:09:07 +01:00
Roeland Jago Douma	8523803d94	Added push button to sharedialog to set password ... Added button to explicitly set the password (makes is clear the user has to do somethign!). Patch for #2812	2015-02-11 22:14:51 +01:00
Olivier Goffart	4f202e5f4c	Fix TokenCredentials compilation	2015-02-11 18:10:01 +01:00
Christian Kamm	91ae912373	ShareDialog: Don't crash with bad response. #2811	2015-02-11 16:02:50 +01:00
Christian Kamm	5cdf448693	SyncJournal: Use DELETE journal mode on FAT filesystems. #2693	2015-02-11 14:03:55 +01:00
Christian Kamm	89c69250ef	Fix crash in discovery thread dtor. ... Occasionally on Windows ~DiscoveryMainThread() triggered a crash. Probably because the QMutableLinkedListIterator was destroyed after it's underlying data had been removed (from the map). Cleaning up the map and lists was redundant anyway, so the destructor is changed to only explicitly destroy the vio_file_stat objects.	2015-02-11 14:00:23 +01:00
Christian Kamm	e79e2b80c8	SocketApi: Fix crash on exit. #2798 ... The _listeners list is destroyed before the _localServer. And since _localServer is the parent of all generated QLocalSockets, they get destroyed in turn - which triggers onLostConnection() and thus accessed the destroyed _listeners list. To avoid that, delete all active QLocalSockets in SocketApi before its members are destructed. We also now delete sockets when we're done with them. I think disconnected sockets would otherwise linger until SocketApi destruction.	2015-02-11 09:50:10 +01:00
Christian Kamm	f8b24ac34d	Fix reconnection after long network outage #2321 ... The problem was that StatusNotFound can indicate either a transient network problem or a permanent server configuration problem.	2015-02-11 09:24:56 +01:00
Christian Kamm	51b9ec30a9	Remove connect to removed slot. ... This seems to have slipped back in, probably during a complex merge in ba8b1bbe06.	2015-02-11 08:12:09 +01:00
Klaas Freitag	d45d3892cb	Account: Fix path assembling with QUrl, add query items separately. ... Otherwise Qt does encode the delimiter between path and query items. This fixes bug #2804	2015-02-10 17:13:27 +01:00
Klaas Freitag	0bf6a220ae	Merge pull request #2807 from rullzer/sharedialog_force_password_multshare ... Reset _public_share_id after we delete the share, thanks	2015-02-10 12:18:10 +01:00
Roeland Jago Douma	c44abf4918	Reset _public_share_id after we delete the share	2015-02-10 07:53:35 +01:00
Roeland Jago Douma	d7f5e89a1d	Sharedialog: retrive thumbnail from server for shares ... Initial patch for #2726. Request a thumbnail from the server if files are to be shared.	2015-02-09 22:17:37 +01:00
Olivier Goffart	51337a10af	LSCOL job: Fix getting the list of folders when there are non-ascii ... Task #2795	2015-02-08 12:23:47 +01:00
Markus Goetz	d4132072d8	OS X: Send notification natively ... For #2728	2015-02-07 18:23:40 +01:00
Klaas Freitag	4849c31add	Sharing: Handle "Enforce password" for public shares properly. ... If a 403 is received from the attempt to create a public link, the dialog shows the password field, as this is server enforced. This fixes #2774	2015-02-06 16:27:11 +01:00
Daniel Molkentin	01bca39138	s/mirall/client in transifex & translations ... Last part of #2470	2015-02-06 15:16:55 +01:00
Olivier Goffart	6e8527e66d	Wizard: Show the remote folder name when the theme has one ... Relates to issue #2788	2015-02-06 14:50:52 +01:00
Jocelyn Turcotte	0d2b7967bc	Windows: Fix opening activity entries with a space in the name ... This fixes #2601	2015-02-06 13:44:06 +01:00
Olivier Goffart	70c8803a79	SelectiveSync: show a message in case of error or if there is no subfolder ... Usefull when the folder does not exist (for example in case the theme has a defaultServerFolder that does not yet exist, #2788) But also to avoid confusion (issue #2663)	2015-02-06 12:27:54 +01:00
Olivier Goffart	0d2fb0754c	Wizard: Fix the advanced setup page when the theme has a defaultServerFolder ... Especially the selective sync dialog Task #2788	2015-02-06 12:27:54 +01:00
Markus Goetz	1e57432aae	Propagator: Fix crash ... This crash was uncovered when testing parallel chunks when one chunk finished the upload. The propagate was then finished with the other UploadDevices still being in-flight in the QNAM.	2015-02-06 11:19:41 +01:00
Markus Goetz	7c0d3b8485	Sharing: tr()s added	2015-02-06 11:11:09 +01:00
Daniel Molkentin	46abd47bfe	Merge pull request #2787 from cmeh/patch-1 ... Orthography: "an folder" corrected to "a folder"	2015-02-06 10:31:57 +01:00
Olivier Goffart	5ec793e045	propagateupload: Save the mtime given by the server in the reply to GET ... There could be a race condition if the file was updated on the server between the discovery and the propagate phase. By taking the mtime from the server, we make sure that we do not have a race. This is tested by t6.pl with BIG3.file because the script was modifying the file between the two phases	2015-02-06 10:23:20 +01:00
cmeh	1554f41441	Orthography: "an folder" corrected to "a folder"	2015-02-06 10:22:49 +01:00
Daniel Molkentin	9e945eb471	Settings dialog: better color for separator line	2015-02-06 08:30:51 +01:00
Daniel Molkentin	c4dd1cfb69	Mac Settings Dialog: Native icons for account	2015-02-06 07:54:25 +01:00
Volkan Gezer	eaa9c4fdf8	json capital	2015-02-05 20:41:08 +01:00
Markus Goetz	94e61c3205	Notifications: Fix creation of notification (fixup2) ... For #2728	2015-02-05 17:20:52 +01:00
Markus Goetz	c4cf13bd97	Notifications: Fix creation of notification (fixup) ... For #2728	2015-02-05 16:55:32 +01:00
Markus Goetz	71e22ffe2c	Notifications: Fix creation of notification ... For #2728	2015-02-05 16:46:40 +01:00
Olivier Goffart	3169a6f170	SelectiveSync: change the wording of the dialog on the wizard ... Have different wording depending on the wizardSelectiveSyncDefaultNothing theme option Relates to #2580	2015-02-05 16:22:04 +01:00
Markus Goetz	446e2b27d7	OS X Sparkle: Fix warning	2015-02-05 15:49:46 +01:00
Olivier Goffart	856df4c5f6	libsync: Get the capabilities and store it in the account	2015-02-05 15:42:56 +01:00
Olivier Goffart	34237f604e	JsonApiJob: Refactor out of the shibbolethuserjob	2015-02-05 15:42:01 +01:00
Olivier Goffart	21345b81f1	wizard: fix the EntityExistJob URL ... We need to add the davPath in there. Otherwise there will be a redirect which will break shiboleth (We want to only enter the password once) Issue #2739 and #2780	2015-02-05 12:53:04 +01:00
Olivier Goffart	3dd8ce08b8	Parallel chunk upload: Fix a off-by-one while saving the done chunk in the DB ... We should assume that the chunk currently uploading is NOT done (hence the -1) il task 405	2015-02-04 18:52:26 +01:00
Markus Goetz	f233af04f6	Windows XP: Possible fix for #2648	2015-02-04 18:49:04 +01:00
Olivier Goffart	acb7e972ea	Merge pull request #2778 from jturcotte/master ... Allow building natively on Windows with MinGW	2015-02-04 17:11:56 +01:00
Jocelyn Turcotte	1ac523ec01	Output libocsync and libowncloudsync in the bin directory ... Windows finds DLLs using PATH or the directory of the process' executable. By outputing those dependend DLLs together with owncloud.exe, the developer only need to have OpenSSL's bin and the qtkeychain build directory in his PATH to let the dynamic linker find them. As the documentation of RUNTIME_OUTPUT_DIRECTORY points out, this only affects windows as other platforms don't consider libraries as runtime targets.	2015-02-04 15:00:22 +01:00
Olivier Goffart	ca56e5d9ca	SyncEngine: Fix crash ... We must check if 'it' is not == to begin() before doing it-1 Also i believe the logic was reversed if it was begin() Task #2765	2015-02-04 14:52:41 +01:00
Jocelyn Turcotte	43a51c1bef	Fix the MinGW build ... - qtkeychain isn't necessarily in a qt5keychain subdirectory. - Explicitly add OpenSSL to the include directories - Make sure that the USE_OUR_OWN_SQLITE3 code is initialized for csync by calling find_package.	2015-02-04 14:50:38 +01:00
Olivier Goffart	26132fd14e	owncloudconnectionmethoddialog: typo	2015-02-04 13:42:49 +01:00
Olivier Goffart	ca68ccd76a	Fix Qt4 build	2015-02-03 20:04:04 +01:00
Olivier Goffart	1f9d7c41e8	owncloudconnectionmethoddialog: Change order of buttons, fix wording, and add the URL	2015-02-03 17:55:01 +01:00
Roeland Jago Douma	48254579a2	Sharedialog: add copy button text and actually connect the button	2015-02-03 13:02:52 +01:00
Daniel Molkentin	a3106b1771	Client Dialog Support: Fix certificate dialog	2015-02-02 23:35:39 +01:00
Jeroen Hoek	227b7ccabd	Add dialog to connection wizard ... When connecting to a https:// URL fails, present the user with three choices: * Try again with a http:// URL * Configure client-side TLS certificates * Go back and enter a different URL This allows users connecting with an ownCloud server secured with client-side TLS certificates to start the certificate import wizard manually instead of relying on a custom server error message.	2015-02-02 22:29:21 +01:00
Christian Kamm	49021fd96d	SyncJournal: Reset all prepared statements. #2757 ... Makes closing of the database actually release file locks.	2015-01-30 15:35:42 +01:00
Olivier Goffart	db6214e090	SyncEngine: Do not assert when the neon session is 0 ... It can now be 0 if neon is not in used Issue #2755	2015-01-30 01:05:46 +01:00
Markus Goetz	df214cd6c1	Folder: Make debug message clearer ... The thread was actually already started in the discovery phase.	2015-01-29 20:47:45 +01:00
Klaas Freitag	d2f1e6e03e	ShareDialog: Disable sharing of external files. ... See https://github.com/owncloud/client/issues/2732 for discussion.	2015-01-29 18:11:04 +01:00
Daniel Molkentin	332601ed26	Remove noisy debug output	2015-01-29 15:37:21 +01:00
Christian Kamm	43d6dbb0f2	SQL: Add debugging options. #2693 ... OWNCLOUD_SQLITE_JOURNAL_MODE: To use something else than WAL OWNCLOUD_SQLITE_TEMP_STORE: To test with storing temporaries in memory.	2015-01-29 11:02:01 +01:00
Christian Kamm	cd0ad21132	SQL: Improve error reporting of failed exec(). #2693	2015-01-29 09:47:48 +01:00
Daniel Molkentin	6fa73e073f	Certificate Wizard: Remove dead code, cleanup style	2015-01-28 17:38:38 +01:00
Christian Kamm	5fc231cda4	Shib: Fix fetching of 'user'. #2751	2015-01-28 15:15:35 +01:00
Daniel Molkentin	1ca8ab81c7	Fix for non C++11 compilers	2015-01-28 14:19:37 +01:00
Olivier Goffart	d70e146c1f	Merge remote-tracking branch 'origin/ssl_client_cert' ... Conflicts: CMakeLists.txt csync/src/CMakeLists.txt csync/src/csync_owncloud.c	2015-01-28 14:13:40 +01:00
Daniel Molkentin	989005d616	Clientcert support: Explictly link libsync against openssl	2015-01-28 13:31:17 +01:00
Christian Kamm	2cee591b0e	Merge branch 'sharedialog_fixes' of git://github.com/rullzer/client ... Fix missing OcsShareJob constructor. Conflicts: src/gui/sharedialog.cpp	2015-01-28 12:19:40 +01:00
ckamm	8a71d7d254	Merge pull request #2730 from rullzer/filebrowser_integration ... Sharedialog: 404 is also an acceptable response when retriving shares	2015-01-28 12:09:33 +01:00
Christian Kamm	7950eb8ed6	sqlite: Update to version 3.8.8.1. #2750	2015-01-28 11:52:04 +01:00
Christian Kamm	f59515883d	FolderMan: Require 2s minimum delay. ... Otherwise we run into "can't upload because it's too recent" issues when the folder watcher triggers a sync. We used to do this, but my recent refactoring started counting the time since the last sync against this minimum delay, leading to 1ms delays in practice. This fixes the regression.	2015-01-28 11:24:47 +01:00
Daniel Molkentin	524f04f34e	Wizard: Give useful error message when server access is forbidden ... Final fix for #2607	2015-01-28 11:06:41 +01:00
Daniel Molkentin	9e7ee42eb7	Wizard Remove unused pointer	2015-01-28 11:06:41 +01:00
Daniel Molkentin	6f82e80698	Remove debug	2015-01-28 11:06:41 +01:00
Christian Kamm	37680a0909	ShareDialog: Prepare for multiaccount. #43 ... Also fix a possible bug with the share dialog when no account is configured.	2015-01-28 10:52:55 +01:00
Christian Kamm	350ad98c27	Folderwizard: Prepare for multiaccount. #43 ... Avoid accessing the global account instance and instead pass it in from the outside.	2015-01-28 10:40:32 +01:00
Olivier Goffart	b0dbb49ca8	Shib: fix broken signal/slot connections	2015-01-26 16:23:43 +01:00
Olivier Goffart	3169833cd7	gui: Still give a decent experience if there is no system tray ... Helps for tasks #1138, #2023, #2123	2015-01-26 13:00:45 +01:00
Joachim Schiele	9abc3e1333	fixes required by upstream	2015-01-23 19:22:56 +00:00
Olivier Goffart	dcba129a98	Make it compile without neon	2015-01-23 17:56:46 +01:00
Olivier Goffart	b856266e91	Remove neon link flag when not required	2015-01-23 17:35:17 +01:00
Olivier Goffart	fe51ada1e8	Don't require NEON with Qt 5.4	2015-01-23 17:11:34 +01:00
Olivier Goffart	807277c0ae	Socket API: Do not broadcast the shared menu entry on all socket when one connects to the socket API ... Now we reply to the command SHARE_MENU_TITLE	2015-01-23 16:09:38 +01:00
Markus Goetz	12ac9f9aa9	Discovery: Fix broken signal/slots	2015-01-23 15:37:36 +01:00
Markus Goetz	3885d5d706	Discovery: Report root etag from engine to folder ... For #2352	2015-01-23 15:30:44 +01:00
Markus Goetz	c54621eb19	OS X: Share menu for Finder	2015-01-23 12:00:31 +01:00
Klaas Freitag	2943b4a85a	CMake: Fixed the rpath settings to make the nighlies build again.	2015-01-23 11:50:42 +01:00
Klaas Freitag	ed0b4e48d5	Sharedialog: Fix some error display.	2015-01-23 11:50:42 +01:00
Roeland Jago Douma	f9938c90ff	Sharedialog: 404 is also an acceptable response when retriving shares ... When we try to get the shares for a file/dir that has no shares yet 404 is an acceptable response from the server.	2015-01-23 10:29:12 +01:00
Roeland Jago Douma	bcdc19f0e3	Sharedialog: Moved more logic to OcsShareJob ... To make the Sharedialog a bit cleaner and to only have the logic in one place. The postdata is now passed as a QList<QPair<QString, QString>> to the OcsShareJob.	2015-01-23 09:41:10 +01:00
Roeland Jago Douma	fb967427e8	Sharedialog: We always want json return format ... Cleanup the code a bit and set that we want json as return format for all replies.	2015-01-23 09:17:00 +01:00
Roeland Jago Douma	0b10761291	Sharedialog: emit proper error code, only show error label if there is one	2015-01-23 09:10:02 +01:00
Olivier Goffart	0f98a90858	Wizard: Add an option in the theme to default to nothing selected in the selective sync ... Issue #2580	2015-01-22 15:57:55 +01:00
Christian Kamm	094da51d82	FolderWatcher: Fix ignore list usage. ... All patterns with started with a ] were not working correctly.	2015-01-22 15:42:47 +01:00
Olivier Goffart	3c26bfa618	Propagate Remote mkdir: save the fileid to the database early ... It's important so that if we delete or rename a diectory that is being uploaded, this is properly detected	2015-01-22 15:11:04 +01:00
Olivier Goffart	168c89aba7	Wizard: fix spacing	2015-01-22 15:11:03 +01:00
Markus Goetz	0502f684e9	Discovery: Even less qDebug	2015-01-22 14:45:08 +01:00
Markus Goetz	45cb679ea7	Discovery: Less verbose debug	2015-01-22 14:37:35 +01:00
Markus Goetz	c9f9d55658	Merge branch 'qnam_csync_update' ... Conflicts: src/libsync/networkjobs.cpp	2015-01-22 14:34:36 +01:00
Markus Goetz	dde8e35785	Discovery: Put results into proper place in map ... The map is for memory management. It can later be used as a cache for the recursive PROPFIND (if we decide to activate it again)	2015-01-22 14:25:24 +01:00
Christian Kamm	fa4e6d8261	Exponential backoff for rapid follow up syncs. #2355	2015-01-22 08:55:52 +01:00
Christian Kamm	145df8ec67	Pause between sync runs (particularly long ones) #2355	2015-01-22 08:55:52 +01:00
Christian Kamm	af5cbdbed8	Folder: Add timer for sync duration.	2015-01-22 08:55:52 +01:00
Nourredine	ba8b1bbe06	adds 'SSL client certificate' support from n.octeau with qknight changes as: ... * removed broken QSsl::SslV3 default * rewrote slotHandleErrors(): no longer claim errors which are none. * hack reverted: lib64 was not the cause for NixOS issues related to libraries. * refactored csync/src/csync_owncloud.c and discovered+fixed why the dav_connect was never getting the certPath+certPassoword * cleanup of code but seems this crushed the ssl client certificate support * fixes the https://github.com/owncloud/client/issues/69#issuecomment-69358377 issue * lots of cleanup * From TODO list : translate all french comments into english * changed _pemCertificate type from QString to QByteArray	2015-01-21 23:55:11 +00:00
Olivier Goffart	f2a7e0b28f	Selective sync dialog: give a proper size by default	2015-01-21 15:37:00 +01:00
Olivier Goffart	0e86ceff73	Connection Validator: let the user cancel the password dialog ... And don't ask for the password again if this happens	2015-01-21 15:33:51 +01:00
Olivier Goffart	c91de092e5	Setup wizard: Fix the http fallback logic ... Also don't allow to go back from the advanced settings page because this break everything	2015-01-21 15:33:51 +01:00
Markus Goetz	7a173f6e62	OS X: Fix path rewrite for owncloudcmd ... It was broken after the folder restructuring (cmd/ and client/)	2015-01-21 15:17:40 +01:00
Klaas Freitag	95f7e83c5c	Sharedialog: Some more refinements after the merge of the branch. ... - Some dialog changes: Made it less vertical space comsuming - Some variable cleanups - Allow to share files that are not within the synced dir by copying them to the root of a sync dir first.	2015-01-21 15:05:23 +01:00
Olivier Goffart	d8b621d05f	LsColJob: fix getting the sizes when the path contains %-encoded chars	2015-01-21 12:04:54 +01:00
Markus Goetz	fb87ad1442	OS X: Fix path rewrite for owncloudcmd ... It was broken after the folder restructuring (cmd/ and client/)	2015-01-20 19:03:56 +01:00
Markus Goetz	c580275a01	Discovery: Delete file entries on destruction	2015-01-20 18:49:27 +01:00
Olivier Goffart	5c2298fa37	Discovery phase: fix a few warnings	2015-01-20 18:50:03 +01:00
Markus Goetz	906779c4b1	SyncEngine: Use QNAM for csync_update ... This is for #2507	2015-01-20 18:27:25 +01:00
Klaas Freitag	bd80c034ba	Merge pull request #2723 from rullzer/filebrowser_integration ... Sharedialog: link sharing from desktop	2015-01-20 17:45:34 +01:00
Daniel Molkentin	00ed37dd02	Merge pull request #2709 from rullzer/monochrome-state-info-icon ... Resepct theming when no syncs are configure	2015-01-20 08:21:42 +01:00
Daniel Molkentin	4de815ad67	Merge pull request #2710 from rullzer/sort_folder_order ... Manged folder list in the tray icon is now sorted	2015-01-19 18:56:55 +01:00
Daniel Molkentin	86eed7cb81	Fix SSL button icons	2015-01-18 15:34:48 +01:00
Roeland Jago Douma	63f18a7ebb	Sharedialog: Pass QDate around instead of QString ... Now pass a QDate object around so we only do the conversion in one place in case the API changes.	2015-01-17 09:57:17 +01:00
Roeland Jago Douma	233f0423fa	Sharedialog: Also reply on delete should be checked	2015-01-17 09:48:18 +01:00
Roeland Jago Douma	d5bddca01d	Sharedialog: More Q_FOREACH	2015-01-17 09:29:13 +01:00
Roeland Jago Douma	00cb6f71da	Sharedialog: Set correct minimum date ... The minimum date should always be the current date + 1 day.	2015-01-17 09:10:42 +01:00
Roeland Jago Douma	9ac35d5869	Sharedialog: Use arg instead of append	2015-01-17 09:01:24 +01:00
Roeland Jago Douma	bd1db30eea	Sharedialog: Minor fixes ... The server generates a new share when a password is set/deleted so we need to refetch the shares once that is done. It is not possible to set an expiration date in the past for a share. So do not allow the user to select a date in the past.	2015-01-17 08:50:28 +01:00
Roeland Jago Douma	6c3a5b1d69	Sharedialog: Do not hard code error reply messages ... The server provides error messages in the json return code. Use those error messages.	2015-01-17 08:29:20 +01:00
Roeland Jago Douma	c233baab5b	Sharedialog: grouped sharelink stuff in one widget ... A bit of grouping in the UI requiring less ->hide() and ->show() calls	2015-01-17 08:10:18 +01:00
Christian Kamm	aa6a5e4ac2	Credentials: Use the bound account everywhere. ... This is preparation for multiaccount.	2015-01-16 15:22:56 +01:00
Roeland Jago Douma	71560ace71	Sharedialog: Show general info about a share ... A start with some general share info in the share dialog.	2015-01-16 14:48:56 +01:00
Roeland Jago Douma	0fba4eee98	Sharedialog: Removed user/group sharing	2015-01-16 14:06:34 +01:00
Christian Kamm	91fce3ea73	Make public API explicit about blacklist kind. #2301 ... 'blacklist' can mean the selective sync blacklist or the error blacklist. Names in public API are now explicit about which blacklist is meant.	2015-01-16 10:17:19 +01:00
Christian Kamm	b50475bc17	SQL: Fix error reporting on prepare fail. #2697	2015-01-16 09:12:25 +01:00
Klaas Freitag	40c802b148	Download: Handle locking problems as soft errors, enterprise #455	2015-01-15 20:51:30 +01:00
Klaas Freitag	7d9f917810	Filesystem: Check more return values and more logging.	2015-01-15 20:51:30 +01:00
Klaas Freitag	a5ae1a9734	Folder: Only count error free downloads for the gui notification.	2015-01-15 20:51:30 +01:00
Klaas Freitag	506360716a	FolderMan: Removed too explicit logging that scares users.	2015-01-15 20:51:30 +01:00
Olivier Goffart	22ad34fa0e	Merge branch '1.7' ... Conflicts: admin/win/nsi/l10n/French.nsh src/mirall/propagator_qnam.cpp	2015-01-15 17:58:43 +01:00
Olivier Goffart	ce0e7e4a5d	Propagator download: Do not assume the server do not support ranges if we cannot parse the Content-Range header ... There are several reason why start==0 * The Content-Range header was not present * We can't parse it * Or it is actually 0 If we can't parse it, we cannot assume anything and must error out. So only in the first case we should discard the temporary file and continue. Issue #2708	2015-01-15 17:56:49 +01:00
Olivier Goffart	907b79d3b8	Utility: Use appropriate unit when converting from bytes to human readable units ... We must not use the SI units if we use power of 2 I believe that we should use SI units and power of 10 But since the server still use power of 2, we need to show the same numbers But at least we use the proper standard IEC unit that are explicit	2015-01-15 14:06:17 +01:00
Olivier Goffart	863731fd6a	Revert "Utility: Use SI units" ... This reverts commit 7445fa7ef7. and commit f654c53c35. The server still use wrong powers, so we still need to use the same	2015-01-15 13:56:51 +01:00
Olivier Goffart	c9f1b3229b	Add Folder Wizard: fix wording ... (Relates #2663)	2015-01-15 13:55:48 +01:00
Olivier Goffart	2b8b204cfc	SelectiveSyncDialog::estimatedSize: return qint64 because -1 in case of error	2015-01-15 13:07:16 +01:00
Olivier Goffart	264471af43	csync: cleanup some unused error code	2015-01-15 12:19:06 +01:00
Olivier Goffart	08d3ae9f02	csync_statedb: Have more granular error reporting when the loaddb fails ... In order to distiguish error from sqlite_open or from the integrity check Issue #2673	2015-01-15 11:36:24 +01:00
Roeland Jago Douma	cd0c9b2ddb	Sharedialog: More error checking	2015-01-14 19:47:25 +01:00
Roeland Jago Douma	b80bbe6587	Sharedialog: more const	2015-01-14 19:36:42 +01:00
Roeland Jago Douma	879d41bf2d	Sharedialog: Fix spinners and passwordfield ... The password field now show correct info when a password is entered etc. Maybe we should have an extra info part where we state that the user needs to press enter to submit the password	2015-01-14 19:08:04 +01:00
Roeland Jago Douma	7b1cfd69d7	Sharedialog: use QProgressIndicator ... This is a merge from the movie in the original commit (which was local) to the QProgressIndicator. However, on all connections I tested it, it did not add much since the API is in gernal pretty quick. So maybe we can just remove this.	2015-01-14 18:42:56 +01:00
Luca Lorenzetto	ef9f2a965d	Fix for issue #2703	2015-01-14 17:39:14 +01:00
Olivier Goffart	ac0e8b1fe1	Qt 4 fix	2015-01-14 16:30:10 +01:00
Olivier Goffart	da0f7317b4	Wizard: Show the size of the folders that will be downloaded ... Part of #2580	2015-01-14 16:11:07 +01:00
Roeland Jago Douma	3e81839af5	Sharedialog: Removed duplicted code ... Handling of updated shares is identical from users and groups	2015-01-14 15:27:15 +01:00
Christian Kamm	0af5574951	Propagate upload: code cleanup	2015-01-14 15:20:02 +01:00
Olivier Goffart	0ae9055ea6	Propagator upload: Fix UploadDevice::seek	2015-01-14 15:08:09 +01:00
Olivier Goffart	885aafcea3	SelectiveSync dialog: Show the sizes of the folder	2015-01-14 15:08:09 +01:00
Olivier Goffart	7445fa7ef7	Utility: Use SI units	2015-01-14 15:08:09 +01:00
Markus Goetz	a544133d73	Propagator: Guard access to BandwidthManager ... Shouls fix #2623	2015-01-14 14:28:47 +01:00
Christian Kamm	b3c02798a3	Propagator: Use FILE_SHARE_DELETE on Windows. #2070 #2597	2015-01-14 14:16:05 +01:00
Roeland Jago Douma	0bd6eb1792	Sharedialog: fix changes due to rebase	2015-01-14 13:51:02 +01:00