1427 commits

Author	SHA1	Message	Date
Roeland Jago Douma	4441053b1c	Thumbnailjob fixes ... * Comments * Use the path of the abstractnetworkjob	2015-10-15 22:18:22 +02:00
Roeland Jago Douma	a34b663828	Now add parameters in a less crappy way	2015-10-15 21:58:16 +02:00
Roeland Jago Douma	db1f4d4016	OCSJob -> OcsJob and more docs	2015-10-15 20:54:52 +02:00
Roeland Jago Douma	3ea944d1b3	Added setPublicUpload to OcsShareJob	2015-10-15 20:34:56 +02:00
Roeland Jago Douma	b293aa762c	Split sharing code ... There is now a generic OCSJob which must be inherited by other jobs. This is in prepartion for the other OCS job that will come (for the Sharee API endpoint for example). More logic is moved from the sharedialog to the OcsShareJob. So in the GUI code we now only say what we want (a new share, set the password etc). And the code in libsync will make that happen. Error handling is for now still done in the GUI part. For now the ocsjob and ocssharejob live in gui but probabaly we should create a libshare or libocs at some point.	2015-10-15 20:05:47 +02:00
Markus Goetz	b5e75afc17	General settings: Align checkbox #3758	2015-10-15 19:15:50 +02:00
Markus Goetz	027a865fbc	Account Settings: Show selective sync buttons after list load ... Especially nice when having a slower network. For #3839	2015-10-15 18:52:16 +02:00
Markus Goetz	132b5f5130	Account Settings: Expand selective sync on show #3585	2015-10-15 17:27:38 +02:00
Markus Goetz	c3754e1fdd	folderstatusmodel.h: Fix warning	2015-10-15 17:27:29 +02:00
Christian Kamm	c418d67920	Merge remote-tracking branch 'origin/2.0'	2015-10-15 15:54:09 +02:00
Markus Goetz	745cf55abb	SelectiveSync: Increase folder list timeout to 60 ... Already done for 2.1 in 05eee16959 For #3524	2015-10-15 14:43:11 +02:00
Olivier Goffart	e1c634d000	Don't show the settings if another instance is started less than 10 secs after the apps. ... Issue #3273 isSessionRestored was not set correctlty so ignore it	2015-10-15 14:25:23 +02:00
Roeland Douma	df2418d9c5	Merge pull request #3661 from rullzer/public_upload ... Allow setting of public upload on link shares	2015-10-14 15:34:25 +02:00
Roeland Jago Douma	2fdae6d72f	Allow setting op public upload on link shares	2015-10-14 15:30:28 +02:00
Christian Kamm	05eee16959	SelectiveSync: Show in-progress label #3524 ... We now show 'Fetching data...' after a second. This also increased the timeout to 60s, making the error condition much less likely.	2015-10-14 13:05:53 +02:00
Roeland Douma	a752eadd0f	Merge pull request #3923 from owncloud/check_shareapi_available ... Provide information about share availablity for files	2015-10-14 12:38:03 +02:00
Roeland Jago Douma	028dc8d6c3	Add SHARE_STATUS socketAPI command ... This command allows to retrieve the share status of a file. In other words if it can be shared.	2015-10-14 12:36:32 +02:00
Roeland Jago Douma	4a7242c8f9	Extended capabilities API ... * Naming of capabilities is now a bit more consistent	2015-10-14 11:45:34 +02:00
Christian Kamm	efdb29d2f9	AccountSettings: Show disabled 'Add Folder' tooltip on click #3645	2015-10-14 11:34:30 +02:00
Christian Kamm	51a2e6c580	Exclusion: Fix confusion with relative and absolute paths	2015-10-13 12:53:38 +02:00
Christian Kamm	7fe03c715d	SelectiveSync: Don't adjust removed path	2015-10-13 12:37:27 +02:00
Klaas Freitag	419d18c128	FileSystem: Reuse the FileInfo object that is created in the caller. ... With that, a lot of stats can be avoided, ie. in SocketAPI	2015-10-09 13:02:02 +02:00
Klaas Freitag	74a7755ad9	SocketAPI: String concat optimization as learned on QtWS.	2015-10-08 18:26:30 +02:00
Klaas Freitag	a8eb913535	SyncLogDialog: Do not delete SyncLogDialog after close. ... Keep one instance for the lifetime of the generalsettings widget.	2015-10-07 18:59:48 +02:00
Phil Davis	b8ccbbc72a	GUI comment and message typos for master	2015-10-05 10:06:19 +05:45
Christian Kamm	d610693af1	SelectiveSync: Apply excludes #3876	2015-10-02 15:56:39 +02:00
Christian Kamm	7d1886684e	FolderWatcher: Use csync exclude code #3805 ... Introduce a global ExcludedFiles instance to avoid loading the global exclude lists several times. One could still add per-folder exclude lists by checking these after the global ones.	2015-10-02 15:56:39 +02:00
Christian Kamm	95fc792745	Tray: Change texts #3657	2015-10-02 15:48:44 +02:00
Christian Kamm	efefc2d986	Merge branch '2.0' ... Conflicts: doc/images/menu.png doc/images/settings_network.png	2015-10-02 15:44:50 +02:00
Klaas Freitag	afd081f40b	Settings: Move synclog widget to a seperate dialog. ... This a first step to integrate the server activity view, see #3732	2015-10-01 16:57:37 +02:00
Christian Kamm	7bf31e56ab	Ignores: Sync after update #3876	2015-10-01 15:39:28 +02:00
Klaas Freitag	0c148025a3	SyncLog Dialog WIP	2015-09-30 12:02:05 +02:00
Christian Kamm	d0c2ce276a	Application: Fix crash on early shutdown #3898	2015-09-30 11:40:33 +02:00
Klaas Freitag	440687af21	AccountSettings: Disable context menu of sync folders when not connected. ... This is the second part to fix #3860	2015-09-29 18:19:26 +02:00
Klaas Freitag	77a9b28e14	SetupWizard: Removed unused member variables.	2015-09-29 09:30:40 +02:00
Markus Goetz	641dece89a	Linux: Don't show settings dialog always when launched twice ... For #3273 #3771 #3485 See also d503221b2e	2015-09-28 23:00:19 +02:00
Markus Goetz	574c699382	GUI: Change tray menu order #3657	2015-09-26 00:25:06 +02:00
Klaas Freitag	b72e2b146d	AccountSettings: only expand root elements on single click. ... Also, toggle expanding on single click for root elements.	2015-09-25 13:57:44 +02:00
Klaas Freitag	a1421ff74f	AccountSettings: Do not allow to expand the folder list when disconnected. ... This is supposed to fix #3860	2015-09-25 12:22:51 +02:00
Christian Kamm	c1045af500	FolderMan: Fix for removing a syncing folder #3843 ... We can't schedule the next folder if we aren't notified that the removed folder has finished syncing...	2015-09-18 14:34:40 +02:00
Christian Kamm	c5c1a7a1c3	ConnectionMethodDialog: Don't be insecure on close #3863	2015-09-18 12:12:53 +02:00
Christian Kamm	4144d4672f	Updater: Ensure folders are not removed #3747	2015-09-18 11:59:49 +02:00
Christian Kamm	68947525a0	Settings: Add debug output #3820	2015-09-17 13:49:00 +02:00
Christian Kamm	8f8bf98ca6	Folder settings: Ensure path is cleaned #3811 ... Paths with a trailing backslash lead to a failing sync beforehand. These paths can appear in some migration scenarios.	2015-09-17 12:31:37 +02:00
Markus Goetz	c09b4e1477	Share dialog: Hide settings dialog before showing #3783	2015-09-16 11:17:00 -04:00
Markus Goetz	ca95276298	UI: Only expand 1 level in folder list #3585	2015-09-16 11:06:32 -04:00
Markus Goetz	15e4d9e317	UI: Allow folder expanding from button click #3585	2015-09-15 21:10:14 -04:00
Markus Goetz	ef607e29de	UI: Expand folder treeview on single click #3585	2015-09-15 20:59:27 -04:00
Daniel Molkentin	abfd97949d	Merge pull request #3810 from owncloud/phil-davis-remove-all ... Remove all files text edit	2015-09-14 14:06:56 +02:00
Daniel Molkentin	5347a991cf	Merge pull request #3806 from owncloud/phil-davis-sync-remove ... Adjust message box text for sync removal	2015-09-14 14:05:39 +02:00
Phil Davis	d0aef138c3	OCUpdater decription text ... Make it say something understandable. Looking at previous versions with git blame, the word "not" fits here.	2015-09-12 07:25:59 +05:45
Phil Davis	6058b507c8	Remove all files text edit	2015-09-11 15:04:53 +05:45
Phil Davis	1aff9bca95	Adjust message box text for account removal ... Since the context menu text was changed to "Remove Account" it seems sensible to also change the title of this message box to match. https://github.com/owncloud/client/issues/3793	2015-09-11 08:46:53 +05:45
Phil Davis	d76f76f429	Adjust message box text for sync removal ... Since the context menu text was changed to "Remove Sync" it seems sensible to also change the title of this message box to match. https://github.com/owncloud/client/issues/3745	2015-09-11 08:42:02 +05:45
Klaas Freitag	eb154de2a1	Merge pull request #3802 from owncloud/alt_webdav_url2 ... Branding option: Alternative WebDAV URL	2015-09-10 17:44:46 +02:00
Klaas Freitag	5f660bf080	GUI: Replace term "sign in" with "Log in" and friends. ... Also with doc changes.	2015-09-10 17:36:28 +02:00
Klaas Freitag	9eec45f9c4	SetupPage: Fix crash caused by uninitialized Account object. ... Since the webdav path is read from account now, it needs to be initialized first thing.	2015-09-10 16:03:22 +02:00
Klaas Freitag	cf7726353a	Always use the webdav path from the Account object. ... The Account object has the themed webdav path if it is branded.	2015-09-10 15:39:37 +02:00
Klaas Freitag	16d6418d10	Use a themable WebDAV path all over. ... This is needed for enterprise#481	2015-09-10 13:04:26 +02:00
Daniel Molkentin	c0f8ff1030	Account: Display non-standard port as part of the hostname ... Addresses #3658	2015-09-10 10:17:31 +02:00
Daniel Molkentin	be3529ebcb	Adjust strings in settings dialogs ... Implements #3745 & #3793	2015-09-10 01:46:28 +02:00
Phil Davis	613736aa41	Coin the term 'folder sync connection' ... Proposed wording for issue https://github.com/owncloud/client/issues/3757	2015-09-10 01:35:58 +02:00
Daniel Molkentin	d823809021	Merge pull request #3781 from phil-davis/FSC ... Coin the term 'folder sync connection'	2015-09-10 01:35:25 +02:00
Daniel Molkentin	b83c723e3f	Allow (partial) translations even when run from build dir ... Makes it easier to catch translation issues earlier	2015-09-10 01:25:16 +02:00
Individual IT Services	6b222c3db7	fix unicode issue #3753 ... fixes the unicode issue #3753 I don't know much CPP and Qt but after some google research I found this http://wiki.qt.io/Strings_and_encodings_in_Qt it does mention trUtf8() that has done the trick for me on Linux with Gnome 3.16. Haven't tested it on other systems	2015-09-10 01:24:11 +02:00
Klaas Freitag	088c0d471a	AccountSettings: Do not prepend the folder alias to the undecided folders ... This fixes bug #3685	2015-09-09 17:52:39 +02:00
Klaas Freitag	98e6d61d1b	General settings: Set left margin of layout to zero. ... This fixes the vertical alignment of the checkboxes, see bug #3758	2015-09-09 15:52:22 +02:00
Phil Davis	fdfab07d07	Coin the term 'folder sync connection' ... Proposed wording for issue https://github.com/owncloud/client/issues/3757	2015-09-08 17:22:57 +05:45
Individual IT Services	cc5f8e5122	fix unicode issue #3753 ... fixes the unicode issue #3753 I don't know much CPP and Qt but after some google research I found this http://wiki.qt.io/Strings_and_encodings_in_Qt it does mention trUtf8() that has done the trick for me on Linux with Gnome 3.16. Haven't tested it on other systems	2015-09-08 13:59:43 +05:45
Olivier Goffart	21dbf97a02	Merge remote-tracking branch 'origin/2.0'	2015-09-07 10:32:16 +02:00
Daniel Molkentin	66f340734c	Consistency: Use folder instead of directory in user visible strings	2015-09-07 08:51:40 +02:00
Christian Kamm	c6794afc3a	Tray: Enable workaround for Qt5 only #3765	2015-09-07 07:44:07 +02:00
Olivier Goffart	39bff056a6	Merge remote-tracking branch 'origin/2.0'	2015-09-05 18:14:30 +02:00
Jocelyn Turcotte	128d46e19a	Remove *Credentials::_fetchJobInProgress ... Now that fetchFromKeychain is solely called from AccountState::slotInvalidCredentials and that this one already protects the fetch call using _waitingForNewCredentials, we can remove that extra check.	2015-09-05 16:00:45 +02:00
Jocelyn Turcotte	6d027ebd40	Separate the credential dialog from their fetch #3350 ... This moves the responsibility of asking the user or not for credentials from the Credentials classes back to the AccountState. fetch() now only extract credentials from the keychain, reports the result to the AccountState which then decides if askFromUser() should be called or not. The result is once more reported to the AccounState. This also replaces the HttpCredentials::queryPassword virtual which now lets HttpCredentialsGui and HttpCredentialsText do it the way that they prefer.	2015-09-05 16:00:45 +02:00
Jocelyn Turcotte	89f69209dd	Simplify the authentication code paths #3350 ... The AccountState is now the only class responsible for triggering credentials fetching from the keychain or from the user. With the ShibbolethRefresher out of the question it's possible to remove the invalidateAndFetch virtual and manually call invalidateToken. This also allows us to move that code from Account to AccountState. In the end this also allows us to move the fetch() call from the ConnectionValidator and use the same code path as for invalid credentials.	2015-09-05 16:00:45 +02:00
Jocelyn Turcotte	94a57fe8d5	Get rid of ShibbolethRefresher ... This is only for neon and not necessary if we want to show a notification instead of a login window when the network reports invalid credentials.	2015-09-05 15:45:54 +02:00
Christian Kamm	699acc99e4	Tray: Don't use the tray workaround with the KDE theme #3706 ... That just triggers another bug...	2015-09-04 15:31:36 +02:00
Christian Kamm	90338499d3	ShareDialog: Fix folder display #3659 ... Sometimes having a double starting / broke the display logic.	2015-09-04 15:16:25 +02:00
Christian Kamm	641f56664e	FolderStatus: Show 'waiting for other folder' #3619 ... We monitor the scheduling queue and show messages like "Waiting for 5 other folders...".	2015-09-04 10:42:21 +02:00
Christian Kamm	419deff861	AccountSettings: Restore from legacy only once #3565 ... And also introduce a Accounts/version int at the same time. That may make future account settings migrations easier to manage.	2015-09-04 09:25:12 +02:00
Olivier Goffart	e49a8a9ffe	SSL Certificate Error Dialog: show account name #3729 ... Change the wording of the certificate error dialog to include the account URL and be a bit more accurate. (Do not mention "SSL" in user facing messages)	2015-09-03 16:19:53 +02:00
Christian Kamm	7bfbc21770	Settings: Allow adding at least one account #3721 ... We always show the 'Add Account' button when no account exists, even When the 'singleAccount' option is enabled.	2015-09-03 06:14:49 +02:00
Olivier Goffart	d853b4f083	FolderDefinition: Escape the alias of a folder before writing to the config ... Issue #3707	2015-09-02 16:07:34 +02:00
Christian Kamm	d8939184db	Tray: Clicks work even with Qt 5.5.0 workaround #3722	2015-09-02 15:51:23 +02:00
Jocelyn Turcotte	dcb687929f	Show a notification instead of a login window on startup #3350 ... The original problem is that showing a popup not originated from the main settings window while it's focused won't be shown in front to the user. This try not to highjack the user's attention of the user by showing a notification when checking the connection for valid credentials, and require the user to sign in through the UI. There are still issues with showing that popup from the tray icon, but the user will most likely be looking for the popup in that case. The new sign in button directly in the settings account works properly.	2015-09-01 18:40:20 +02:00
Jocelyn Turcotte	bcfc16c0f6	Add a sign in button in the settings window ... It's not obvious for users that they should sign in through the tray icon, especially if they were automatically signed out.	2015-09-01 18:40:20 +02:00
Olivier Goffart	3ba5e27d02	Merge branch '2.0'	2015-09-01 17:57:56 +02:00
Olivier Goffart	0fa4353841	Remove the accountmigrator.cpp It is not used ... This was used to convert the config from the community client to the branded client. But we don't need this feature anymore https://github.com/owncloud/client/issues/3515#issuecomment-133394443	2015-09-01 17:03:58 +02:00
Jocelyn Turcotte	688aaadb60	Don't show a sync success status toolip when signed out	2015-09-01 15:35:10 +02:00
Olivier Goffart	f77ae28ed1	AccountSettings: Fix coverity warning ... FolderMan::folder might return null	2015-09-01 11:39:55 +02:00
Olivier Goffart	0d08bbec74	AccountSettings: remove unused member ... Fix a coverity warning	2015-09-01 11:37:47 +02:00
Olivier Goffart	ebee6f0bc2	Settings dialog: remove the close button #3713	2015-09-01 11:32:59 +02:00
Olivier Goffart	db8f9586cb	Tray notification: Don't show a message about modified folder #3613	2015-09-01 11:29:37 +02:00
Olivier Goffart	950bc578d0	Merge branch '2.0'	2015-08-31 14:34:04 +02:00
Jocelyn Turcotte	c48c5b9286	Move the progress bar to the right of the quota label ... Also change the label to show the free space and show the used and total space only on a tooltip of the bar. Related to #3644	2015-08-31 12:33:21 +02:00
Olivier Goffart	9172a5fc4c	FolderStatusModel: add a function to get a QModelIndex from the path ... Will be usefull to solve #3704	2015-08-31 10:14:58 +02:00
Olivier Goffart	1a0d0c0a31	Account Settings: rework the toolbar ... Modifications ask by Jan: - Elide the label in the actions - Minimum sizes for the actions - No separatcions between the accounts Issue #3516	2015-08-30 15:31:13 +02:00
Olivier Goffart	8fb4adf40d	AccountWizard: fix when the theme specify a override URL #3699	2015-08-29 18:51:27 +02:00
Jocelyn Turcotte	cb1bcdc8e0	Tweak the settings UI ... - Move the cancel and apply buttons side by side - Hide the notification label when empty - Clamp elements at the top together a bit	2015-08-28 15:51:11 +02:00
Olivier Goffart	1f43c47861	Folder: Do not create the sync folder if it does not exist #3692	2015-08-28 14:40:45 +02:00
Jocelyn Turcotte	f38deb44fb	Don't disable the selective sync cancel button ... This makes its interaction more consistent versus other kinds of dialogs or versus when the selective sync config has been changed or not.	2015-08-28 12:14:56 +02:00
Christian Kamm	ed28a21cb0	Tray: Hide while modifying menus #3656 #3672 ... This may help workaround the dbus tray issue in Qt 5.5.0.	2015-08-25 09:46:03 +02:00
Christian Kamm	035e57cf37	AddFolder: Improve remote path selection error handling #3573	2015-08-24 15:08:35 +02:00
Christian Kamm	92f6134ed3	AccountSettings: Adjust quota info design #3644 #3651	2015-08-24 15:06:11 +02:00
Christian Kamm	a0f9b834b6	Adjust buttons on remove folder/account questions #3654	2015-08-24 15:05:40 +02:00
Christian Kamm	6cf1caeaf3	Theme: Fix wizardSelectiveSyncDefaultNothing #3671	2015-08-24 12:55:44 +02:00
Christian Kamm	3414b58b99	Systray: Workaround for issue with Qt 5.5.0 #3656	2015-08-21 09:45:02 +02:00
Christian Kamm	7aae5e494a	AccountSettings: Fix margins on 'Add folder' button #3650	2015-08-20 13:25:19 +02:00
Christian Kamm	0711a2fc12	SettingsDialog: Fix typo in showFirstPage()	2015-08-20 11:57:44 +02:00
Olivier Goffart	92fc902e0c	Account Settings: Hide the add folder button when Theme::singleSyncFolder is set	2015-08-19 18:00:11 +02:00
Christian Kamm	791c550a8e	FolderStatusDelegate: Add margin to button #3650	2015-08-19 16:58:27 +02:00
Christian Kamm	344d3565f8	Another account deletion wording update #3649	2015-08-19 15:55:29 +02:00
Christian Kamm	73785d0473	SettingsDialog: Activate the first page on startup	2015-08-19 15:51:48 +02:00
Christian Kamm	b155503fa2	FolderStatusModel: Undo accidental debug change	2015-08-19 15:05:30 +02:00
Christian Kamm	2c011dcae6	FolderStatusModel: Fix typo in error message #3524	2015-08-19 15:04:39 +02:00
Christian Kamm	0e0af1da07	FolderStatusModel: No italic text #3524	2015-08-19 15:02:08 +02:00
Christian Kamm	a7d0f0cdd4	Adjust wording of delete account/folder message #3643	2015-08-19 10:59:34 +02:00
Olivier Goffart	38aa4cf304	Folder Model: add an error item when one cannot fetch the list of folders #3524	2015-08-18 13:21:02 +02:00
Olivier Goffart	0638f99b79	Selective Sync dialog: add the quota-used-bytes to the request ... Mentioned in https://github.com/owncloud/client/issues/3524#issuecomment-132144532	2015-08-18 12:26:52 +02:00
Olivier Goffart	f0e6864639	FolderModel: Refresh the tree when new folder are added or removed. #3570	2015-08-17 12:50:22 +02:00
Markus Goetz	6c57d71ca4	Settings dialog: Move more common hostname prefixes in toolbar ... For #3577	2015-08-17 12:39:32 +02:00
Olivier Goffart	64bd6b204b	Folder Wizard: always make an alias that does not conflict with anything	2015-08-17 11:54:01 +02:00
Olivier Goffart	7ca8040788	Show a shortened version of the path in the account settings and activity ... Issue #3576, #3567	2015-08-17 11:43:30 +02:00
Olivier Goffart	0da6184f84	Setup Wizard: adjust the layout #3588	2015-08-14 14:01:01 +02:00
Markus Goetz	1ad80878b2	Account: Additional on top fix for #3617	2015-08-14 12:37:19 +02:00
Olivier Goffart	81c19232a5	Account Settings: Remove the ability to select	2015-08-14 12:12:16 +02:00
Olivier Goffart	dcfa6b97e3	Account Settings: add more margin on the overall text ... Attempt to fix https://github.com/owncloud/client/issues/3584#issuecomment-131009787	2015-08-14 12:01:28 +02:00
Olivier Goffart	593016718d	Account Settings: Align the progressbar with the icon #3567	2015-08-14 11:52:09 +02:00
Olivier Goffart	2dbe822972	Account Settings: remove the storage use label #3567	2015-08-14 11:52:09 +02:00
Markus Goetz	38b8508f15	Account: Save accepted SSL certs immediatly #3617	2015-08-14 11:31:01 +02:00
Markus Goetz	2a14c121db	Account settings: Make version selectable/copyable #3600	2015-08-13 17:27:18 +02:00
Markus Goetz	01855302a0	Shibboleth: Use sslErrors() handler of rest of client #3593	2015-08-13 17:09:39 +02:00
Olivier Goffart	5c9b865cec	Setup wizard: remove some spacing in the result page #3588	2015-08-13 15:22:43 +02:00
Olivier Goffart	5f832b5b39	Account Settings: Reorder the options in the context menu #3584	2015-08-13 15:07:51 +02:00
Olivier Goffart	b75b5a5a0c	Account Settings: remove the down arrow in the 'more' button #3584 ... It's ugly on mac	2015-08-13 14:11:13 +02:00
Olivier Goffart	f32c8d0570	Account settings: add a button to show the context menu #3584	2015-08-13 12:34:22 +02:00
Olivier Goffart	b49e9e8f30	Account Settings: rename and re-order the options in the context menu	2015-08-13 12:32:59 +02:00
Olivier Goffart	bf20a0d2f8	Account Settings: remove unused signals	2015-08-13 11:55:51 +02:00
Olivier Goffart	6fcb48a0c7	Account settings: Double click no longer open in the file browser #3585 ... Add a separate option in the context menu for it	2015-08-13 11:53:00 +02:00
Olivier Goffart	5685aa7ff0	Setup Wizard: add more space in the result page: #3588	2015-08-13 11:27:41 +02:00
Olivier Goffart	3238d61ef6	SocketApi: fix small leak (found with valgrind) #3369	2015-08-13 10:42:54 +02:00
Olivier Goffart	299faae830	Fix compiler warning	2015-08-13 10:26:35 +02:00
Olivier Goffart	6b003f96f5	Theme: add a method to hide the 'add account' button #3517	2015-08-13 09:39:44 +02:00
Markus Goetz	ace847d177	ShareDialog: Improve UX #3526 ... Don't spin progress while user needs to set a password. Have password input as Call To Action.	2015-08-12 18:22:51 +02:00
Markus Goetz	dc44ebf41b	UI: Fix up 6152ce4187 #3595	2015-08-12 09:08:30 +02:00
Daniel Molkentin	aa6c09d942	Rename "Sync all files with" to "Sync selected files with" ... as per discussion with Jan	2015-08-12 08:31:54 +02:00
Daniel Molkentin	a9acb185a0	SettingsDialog: Fixup default action setting ... This broke silently when switching from pure actions to widgets	2015-08-11 21:45:27 +02:00
Daniel Molkentin	3267c15aff	SettingsDialog: Use separator instead of custom spacer ... ... and make sure to hide if when there are no accounts	2015-08-11 21:44:35 +02:00
Daniel Molkentin	f25df3311c	Remove debug output	2015-08-11 21:42:30 +02:00
Daniel Molkentin	379beb268f	More improvements for high contrast themes ... - Invert icon color depending on the darkness of the theme - Ensure icons and colors are changed when theme or colors get changed during application run Final patch for #3582	2015-08-11 17:56:11 +02:00
Christian Kamm	5bd631e8e7	Rename jobCompleted -> itemCompleted. ... Because that's what's going on. A job can 'complete an item' or 'finish'. Note that several jobs could complete the same item: a new directory will complete on the PropagateRemoteMkdir and the PropagateDirectory jobs.	2015-08-11 15:19:09 +02:00
Christian Kamm	fe42c1a818	Activity: Skip PropagateDirectory jobs #3580 ... Previously, PropagateDirectory jobs didn't emit the completed() signal. Now that they do, we need to make sure to not add extra lines to the protocol widget for them. To accomplish that, the jobCompleted() signal now also contains the job that completed the item.	2015-08-11 15:19:09 +02:00
hefee	a87602af3f	use SHAREDIR for i18n ... SHAREDIR is used in src/gui/application.cpp and should also use that in CMakeLists.txt.	2015-08-11 15:14:59 +02:00
Markus Goetz	6152ce4187	UI: Avoid showing folder alias #783 #3576	2015-08-11 15:12:43 +02:00
Markus Goetz	bd71fdc388	SslButton: Fix harder #3534 #3536	2015-08-11 12:18:25 +02:00
Christian Kamm	0dd20ccf3b	Remove deleted accounts from tool bar #3583	2015-08-11 11:33:04 +02:00
Daniel Molkentin	9698324c4e	More color scheme adjustments	2015-08-11 11:32:00 +02:00
Daniel Molkentin	fad9a3056c	Settings dialog: Try to improve adherance to high contrast schemes ... Adresses #3582	2015-08-11 07:42:52 +02:00
Christian Kamm	0176ffd25d	FolderWatcher win: Skip unneeded notifications #3353	2015-08-10 14:59:05 +02:00
Daniel Molkentin	385c3882a7	Fix regression in PassiveUpdateNotifier ... When overriding backgroundCheckForUpdates(), also call the original implementation.	2015-08-10 14:26:57 +02:00
Christian Kamm	85f5424a13	SocketAPI: Show excluded hidden files as ignored #2086	2015-08-10 13:41:19 +02:00
Christian Kamm	3c82f66219	Windows: Limit tray tooltip length #3412	2015-08-10 13:23:31 +02:00
Christian Kamm	a6d70c9c63	IgnoreEditor: Rename confusing checkbox ... The label was the negation of its name.	2015-08-10 11:15:39 +02:00
Christian Kamm	c2c924931b	Ignore hidden: Default to enabled #2086 ... It was 'false' for migrated folders and folders created by the OC setup wizard.	2015-08-10 11:15:39 +02:00
Daniel Molkentin	6b4a9d9cd9	Settings dialog: improve layout a bit	2015-08-10 10:51:05 +02:00
Jocelyn Turcotte	55e55b0806	Windows: Fix the progress bar with high contrast themes #2654 ... Setting the palette seems to interfere with Qt's Windows Vista theme and this isn't set on the QStyleOptionProgressBarV2 by QProgressBar.	2015-08-10 09:55:31 +02:00
Olivier Goffart	b967359a74	Account setting: properly disable the 'add account' button #3571 ... When upgrading from 1.8 and syncing the whole account, then the remote folder is empty	2015-08-07 14:32:51 +02:00
Olivier Goffart	ae7b2509a5	Selective sync: When applying selective sync, put new folder that were just checked in the white list ... Issue #3560 Otherwise the just checked folder will be chacked again for their size. We do not want that.	2015-08-07 13:37:52 +02:00
Olivier Goffart	8b52a121bb	AccountSettings: Show the wizard to add an account when the last account was deleted #3564	2015-08-07 13:15:02 +02:00
Daniel Molkentin	ecf545a0b9	Updater: update Linux updater code to work with changes in master ... master moved much of the responsibility of the updating process to the updater class. This also fixes a build failure	2015-08-06 19:34:23 +02:00
Markus Goetz	b5edc635a1	Windows: Don't use UTF-8 arrows #3095	2015-08-06 18:08:05 +02:00
Daniel Molkentin	6a20ea5e73	Merge pull request #3472 from owncloud/linux_restart_on_new_version ... On Linux restart if new version is found on disk	2015-08-06 17:47:10 +02:00
Markus Goetz	1feb74981e	Progress: Show real speed and all filenames #3403 #3095	2015-08-06 15:25:16 +02:00
Olivier Goffart	7202bbcf5d	Fix Qt4 build	2015-08-06 13:58:03 +02:00
Markus Goetz	aee20e0ed3	1.8 Migration: Fix password overwrite #3539	2015-08-06 12:49:18 +02:00
Daniel Molkentin	72b2c52e15	Merge branch 'master' into linux_restart_on_new_version ... Conflicts: src/gui/application.cpp src/gui/owncloudsetupwizard.cpp	2015-08-06 11:11:52 +02:00
Markus Goetz	7985c0d7f1	Merge pull request #3531 from jturcotte/master ... Remove need for UPDATE_VIEW to refetch the status #2340	2015-08-06 11:03:28 +02:00
Olivier Goffart	dc299b0bf9	Account settings: Fix a label ... The feature is for all folder, not only shared folder	2015-08-05 16:12:58 +02:00
Olivier Goffart	952c249039	Selective sync: on the first sync, do not ask confirmation for every folders ... Since we already confirmed a previous selective sync dialog	2015-08-05 16:11:59 +02:00
Olivier Goffart	ba896eabfb	FolderStatusModel: do not expand the unconfimred folder themselfs	2015-08-05 15:33:51 +02:00
Olivier Goffart	646890abb3	SettingsDialog: use the same short display name on Win/Linux than on Mac ... Issue #3516	2015-08-05 15:33:51 +02:00
Markus Goetz	9a9cefbcc5	SslButton: Improve reliability and usefulness #3534 #3536	2015-08-05 13:04:30 +02:00
Olivier Goffart	38da1b7de1	AccountSettings: automatically refresh and expands the undecided folders #3541	2015-08-05 12:51:49 +02:00
Olivier Goffart	b470d0f7b8	Folderman: make the backup number starts with 2: #3512	2015-08-05 10:46:33 +02:00
Aputsiaĸ Niels Janussen	cd19ee5020	Minor typo: Ingored -> Ignored ... Issue raised by user 'kant' in Transifex on the 1st of August.	2015-08-03 17:35:58 +02:00
Markus Goetz	7da4a081d3	Startup: Don't notify other instance when session restored #3070	2015-08-03 17:32:41 +02:00
Jocelyn Turcotte	26d137cac6	SocketApi: Remove an unneeded emit syncItemDiscovered ... The signal is emitted in this case if the instruction is NONE but in the only ultimately connected slot to this signal, SocketApi::slotSyncItemDiscovered, we return early according to the same condition. The emission of the same signal at the end of treewalkFile remains and take care of the normal cases.	2015-07-31 21:59:58 +02:00
Markus Goetz	d51bd94447	FolderMan: Fix up previous commit #3528	2015-07-31 18:31:54 +02:00
Markus Goetz	a501bf5b83	FolderMan: Use sync() on config after migration #3528	2015-07-31 17:10:12 +02:00
Markus Goetz	0a93dc5e63	OS X Settings Dialog: Two-lined account name #3516	2015-07-31 14:56:14 +02:00
Klaas Freitag	6992631c4c	cmake: rather use SHAREDIR than DATADIR define. ... DATADIR is a reserved structure name in win32, using it like us here leads to very nifty compile problems. SHAREDIR is clean.	2015-07-30 16:38:30 +02:00
Markus Goetz	48dac23b0f	Folder: Version debug at end ... Often users send us parts of logs with this information missing.	2015-07-30 14:40:24 +02:00
Markus Goetz	7f8e9a0e70	Sparkleupdater: Use qDebug not qWarning ... Else QT_FATAL_WARNINGS triggers.	2015-07-30 14:40:24 +02:00
Olivier Goffart	795922e2a0	Fix compilation with old GCC ... that does not understand nullptr Note that we can't just replace nullptr by 0 in createIndex otherwise it would be ambiguious. So leave it commented to show that your intention is to create it with a null pointer (which is the default because of the default parameter)	2015-07-30 10:44:07 +02:00
Olivier Goffart	3b261bc612	Wizard: Make the name of the backup folder more user friendly ... Issue #3512	2015-07-29 12:23:33 +02:00
Olivier Goffart	07ddf18b3b	Account Capabilities: style fixup ... - Remove the copy constructor. The default constructor is fine. Having a user defined copy constructor inhibit the move constructor. - Pass QVariantMap arguments via const references - Do not return a pointer to Capabilities from the account. It is a value type and should not be used by pointer.	2015-07-29 12:07:57 +02:00
Jürgen Weigert	0642e63246	Merge pull request #3232 from flocke/master ... [Unix] Install architecture-independent files to DATADIR. DATADIR is already used elsewhere. So this even adds consistency! Thanks!	2015-07-29 12:00:48 +02:00
Markus Goetz	dccaba98af	Merge pull request #3439 from rullzer/use_caps ... Use server capabilities for share dialog	2015-07-29 11:50:35 +02:00
Klaas Freitag	b07ab14c31	Merge pull request #3470 from rullzer/use_ocs_url ... If the OCS Share API returns an url use that	2015-07-28 14:26:23 +02:00
Klaas Freitag	c95bbe27e7	Merge pull request #3495 from rullzer/dont_share_root ... Don't allow sharing of the root folder	2015-07-28 14:00:38 +02:00
Olivier Goffart	ec86d1a151	Wizards: allow adding a folder in a non-existing directory and create that folder ... The owncloud wizard already created the directory, but the recent addition of FolderMan::checkPathValidityForNewFolder stopped allowing unexisting directories. So change FolderMan::checkPathValidityForNewFolder to allow non existing directory and whange the FolderWizard to create the directory if it does not exist. Issue #3492	2015-07-28 12:14:52 +02:00
Roeland Jago Douma	6c8ff7c61a	Added capabilities class	2015-07-28 12:04:24 +02:00
Olivier Goffart	4016e0863f	Fix warning	2015-07-28 11:20:22 +02:00
Olivier Goffart	ff6c11f126	Confirm feature: tray noticiation message when a new folder need to be confirmed ... Issue #3148	2015-07-27 10:33:05 +02:00
Olivier Goffart	0ccaae9a22	Confirm feature: Confirm for any folder, not only shared ones ... issue #3148	2015-07-27 09:54:20 +02:00
Roeland Jago Douma	6f498aea3b	Do not open the share dialog if the user tries to share the root folder	2015-07-24 10:10:41 +02:00
Roeland Jago Douma	a2f9ba47fb	If the OCS Share API returns an url use that ... To avoid us having to construct the URL for public shares just rely on the server to do it. This makes it easier to maintain. For example if (in the not do distat future) the index.php part is removed the server would just server this new url.	2015-07-23 21:10:53 +02:00
Markus Goetz	fea997c84a	Bandwidth Limit: Fix new "Automatic Download" setting #1485	2015-07-23 13:46:42 +02:00
Klaas Freitag	316427c801	Merge branch 'regular_update_check' ... Conflicts: src/gui/application.cpp src/gui/application.h src/gui/updater/ocupdater.h	2015-07-23 11:34:12 +02:00
Klaas Freitag	c34641f4f7	Updater: Added a class UpdaterSchedule. ... It schedules the regular update checks. Keeps Application and other classes easy.	2015-07-22 13:44:19 +02:00
Markus Goetz	59a7ae56d4	UI: Add more tooltips #3385	2015-07-20 19:06:40 +02:00
Markus Goetz	a58cb049b2	OS X: Fix layout of quota info in SettingsDialog	2015-07-20 18:43:18 +02:00
Markus Goetz	a6f493ff94	OS X Overlay Icons: Use waitForFinished() with timeout	2015-07-20 18:32:02 +02:00
Markus Goetz	afed400ac6	SettingsDialog: Make bigger and more native on OS X ... On OS X, the width of the dialog must not change, only its height.	2015-07-20 18:16:33 +02:00
Klaas Freitag	89b8555aa7	PassiveUpdateNotifier: Fix condition on when to show the update.	2015-07-20 15:33:44 +02:00
Klaas Freitag	320cc1c7dd	Updater: Avoid to show the update notification to often. ... If the update is only available through the system, the notification is only shown once.	2015-07-20 15:33:17 +02:00
Klaas Freitag	0a08a51a41	Updater: really do not forget to start the updater timer.	2015-07-20 15:32:27 +02:00
Klaas Freitag	b22e284191	Application: Remove unused connection to updater.	2015-07-20 15:32:00 +02:00
Klaas Freitag	adc239c9d0	UpdateCheck: Clean up Application class and move most to updater. ... Add the update timer also to the update class and remove all the proxy slots from the Application class.	2015-07-20 12:17:31 +02:00
Olivier Goffart	a9dfcdd463	FolderDefinition: fix uninitialized variable	2015-07-19 11:33:17 +02:00
Christian Kamm	5d9e752c71	HttpCreds: Add keychain failure hint. #3268	2015-07-17 14:39:43 +02:00
Christian Kamm	44870fae9f	Proxy auth: Fix cred invalidation on Windows.	2015-07-17 13:00:16 +02:00
Klaas Freitag	92513207eb	Application: On Linux, restart the app if a different version is on HD. ... Together with the updater timer, check on linux, if the version on the disk has still the same version string as the one that is running. If not, restart if nothing is currently syncing.	2015-07-17 12:12:00 +02:00
Klaas Freitag	2cebd8bc2e	SetupWizard: remove unused variable defintion.	2015-07-17 12:09:16 +02:00
Christian Kamm	9acc9d2d44	Fix Qt4 build. ... QMap::first is new in Qt 5.2	2015-07-17 12:07:48 +02:00
Christian Kamm	2124098f84	System proxy: Ask for credentials if needed. ... The proxyAuthenticationRequired() signal now goes to the ProxyAuthHandler class. That class will try to read the proxy settings from the keychain or ask the user about them. We won't ask the user for credentials for explicitly configured proxies. It also does not change how the credentials for explicitly configured proxies are stored. (see #261)	2015-07-17 11:54:46 +02:00
Olivier Goffart	0a6aa88d72	Merge remote-tracking branch 'origin/hidden_file_handling'	2015-07-17 09:32:29 +02:00
Roeland Douma	bc542a4b80	Merge pull request #3426 from rullzer/thumbnail ... Sharedialog show thumbnail of file (if available)	2015-07-17 08:58:06 +02:00
Roeland Jago Douma	7e79a78901	Use already available password field	2015-07-16 20:55:54 +02:00
Klaas Freitag	d284b48db4	Application: Add a new command line switch --version. ... It simply prints the version of the client and exists.	2015-07-16 18:12:45 +02:00
Daniel Molkentin	724c0c2953	Win32: Do not silent-update if the application is already up-to-date ... Fixes #3368	2015-07-16 17:26:53 +02:00
Klaas Freitag	4ad9b7d72d	Change default check frequency to every ten hours.	2015-07-16 14:19:02 +02:00
Markus Goetz	3d55191573	OS X: Fix settings dialog after multi-account introduction ... For #3459 #3386 #3401	2015-07-16 14:11:06 +02:00
Markus Goetz	55e1f8a060	OS X Overlay Icons: Don't use waitForReadyRead() ... Somehow this sometimes glitched for me and hanged.	2015-07-16 14:08:45 +02:00
Christian Kamm	031d35de03	Network: Fix enabling of proxy auth text fields.	2015-07-16 10:27:15 +02:00
Klaas Freitag	a5528b7cd4	AccountSettings: When adding a new folder, set ignore hidden flag. ... The value is taken from existing folder definitions, or defaults to true.	2015-07-15 15:54:41 +02:00
Klaas Freitag	cfe5150037	IgnoreListEditor: handle the ignore hidden files checkbox. ... Write the setting of the checkbox to all folder definitions.	2015-07-15 15:54:41 +02:00
Klaas Freitag	7195e40ffa	FolderMan: Set ignore hidden files in the folder watcher. ... The flag is read from the folder configuration and passed on to the folder watcher so that it ignores events to hidden files accordingly.	2015-07-15 15:54:41 +02:00
Klaas Freitag	3ba6e20f66	Folder: Getter and Setter for ignore hidden files for folder config. ... With these, the ignore hidden files flag can be set and get from the folder configuration file.	2015-07-15 15:54:41 +02:00
Klaas Freitag	711ae1d347	FolderWatcher: Add flag to ignore hidden files (or not).	2015-07-15 15:54:41 +02:00
Klaas Freitag	a4336092f6	Hidden Files: Add a setting to ignore hidden files or not. ... This setting goes to the folder definition. By default, no hidden files are synced.	2015-07-15 15:54:41 +02:00
Christian Kamm	65a3847a35	Tray menu: Make sign in/out actions more consistent. ... In particular: * It's always possible to sign out, even if there's currently a network problem or the service is unavailable. * You can only sign in when you explicitly signed out before.	2015-07-15 15:07:23 +02:00
Roeland Douma	3344249297	Merge pull request #3425 from rullzer/sharedialog_wait_for_con ... Wait until we retrieved shares before showing checkbox	2015-07-15 14:38:38 +02:00
Roeland Jago Douma	b686a3dbdb	Sharedialog show thumbnail of file (if available)	2015-07-15 14:33:04 +02:00
Roeland Jago Douma	454e9d9906	Wait until we retrieved shares before showing checkbox ... If we have a slow connection we do now want to show the share checkbox until we have retrieved the shares (so we know the state). Else we might try to enable sharing on an already shared file.	2015-07-15 14:20:35 +02:00
Christian Kamm	908881cbf7	AccountSettings: Fix label for ServiceUnavailable state.	2015-07-15 14:02:45 +02:00
Christian Kamm	2ac8646320	AccountSettings: Improve error reporting. #3084 ... Previously the errors were only visible in the tray icon tooltip!	2015-07-15 12:04:44 +02:00
Olivier Goffart	92dc3047d0	Qt4 SelectiveSyncDialog: Give a better size to the column by default ... Issue #3239 The feature to dynamically resize the column only came with Qt5, But give a better default size of the name column so we can read the contents.	2015-07-14 15:18:55 +02:00
Olivier Goffart	cdb88d621c	Qt4 build: Qt::ItemNeverHasChildren was added in Qt 5.1	2015-07-14 15:01:33 +02:00
Olivier Goffart	b485e8f97f	AccountSettings: disable the add folder button when syncing the entire owncloud #3438	2015-07-14 11:03:25 +02:00
Olivier Goffart	ab23368764	FolderStatusModel: init all private members	2015-07-14 10:15:19 +02:00
Olivier Goffart	6030b4416d	Account Settings: hide the [add folder] button when syncing the entire owncloud #3438	2015-07-13 16:29:01 +02:00
Olivier Goffart	aabad22cef	Wizard: show an error if the folder already exists ... Issue #3444	2015-07-13 15:37:01 +02:00
Olivier Goffart	247771fbba	Wizard: remove the configExists state ... The wizard is now only used to create new account, not update existing ones	2015-07-13 15:21:18 +02:00
Olivier Goffart	e5568b5d13	Wizard: remove the check for mutliple folders ... It does not make sens now that we have multi account	2015-07-13 14:52:24 +02:00
Olivier Goffart	4dbe0693df	FolderMan::checkPathValidityForNewFolder ... factorize the function to check the validity of a new folder out of the folder wizard to the FolderMan. There is even a test for it now. That way we can also use it in the normal wizard	2015-07-13 14:35:19 +02:00
Roeland Jago Douma	c052f6d4c9	Use capabilities to not allow removing of expiredate and password ... If the server admin has enforced the expiration date and the password our UI should not give the user the option to remove those.	2015-07-10 15:50:01 +02:00
Roeland Jago Douma	7f893aa676	Fore password request if required by capabilities	2015-07-10 15:26:26 +02:00
Olivier Goffart	992d375e90	owncloudGui: Do not reset folders when login in or out. ... This made no sens. Folders are setup when the account is setup. Also this had the bad side effect to shut the sync engine too early, leaving the SyncEngine::_syncRunning to true, and leading to ASSERT later Issue #3427	2015-07-09 13:25:27 +02:00
Olivier Goffart	644486871b	owncloudGui: Fix crash when sign in ... The sign in action from within that menu might change the account state and call setupContextMenu. We must not delete the menu from there Issue #3427	2015-07-09 12:17:27 +02:00
Olivier Goffart	08fcf650eb	Fix Qt4 build	2015-07-08 19:48:57 +02:00
Klaas Freitag	e28fab0c61	Folder: let path() always end on "/" rather than on platform spec. delim.	2015-07-08 18:13:41 +02:00
Klaas Freitag	bb1b1ab7e3	FolderWatcher Win: Use proper lang path handling in folder watcher.	2015-07-08 18:13:40 +02:00
Olivier Goffart	68668e25bd	FolderStatusModel: uses int64 for the sizes to prevent overflow ... Issue #3420 (The change in Utility just make sure never to use the scientific notation, even if it should never happen)	2015-07-08 14:52:58 +02:00
Olivier Goffart	d1bfc7a636	Settings: fix broken signal/slot connection: ... No such slot OCC::GeneralSettings::slotForceRemoteDiscoveryOnFolders() (sender name: 'OCC__IgnoreListEditor') (receiver name: 'OCC__GeneralSettings') The slot was in another settings page (because the button 'edit ignored files' was moved. Move the actual code to IgnoreListEditor where it logically belong. Add a comment on the why this code is there.	2015-07-07 20:46:39 +02:00
Olivier Goffart	41111541c5	Confirm feature: Add an option for it	2015-07-07 16:28:48 +02:00
Olivier Goffart	f87d0139e1	AccountState: fix Sing-in of a connected account ... Issue #3413 There was two problem: - First, when singing in we were setting an account that was connected to disconnected (AccountState::State) - Second, while getting the result from the ConnectionValidator, we would not set the state to connected if the previous call to ConnectionValidator was ConnectionValidator::Connected, regardless of the old state of the account	2015-07-07 14:44:16 +02:00
Olivier Goffart	ceddbe248e	FolderStatusDelegate: style the Add Folder button	2015-07-06 16:04:06 +02:00
Olivier Goffart	ef1f2d2b79	FolderStatusDelegate: Fix identation and remove empty functions	2015-07-06 14:44:53 +02:00
Olivier Goffart	9c9ff886c9	Fix qt4 build ... Qt5 automatically declares many types as QMetaType. Qt4 needs them manually declared	2015-07-06 11:04:17 +02:00
Markus Goetz	ed0fb76cd7	Merge pull request #3404 from owncloud/fix-2702 ... Command Line: clear error hint with wrong command line options	2015-07-04 12:56:06 +02:00
Arthur Schiwon	263fa5882b	clear error hint went wrongly use command line options	2015-07-03 16:01:24 +02:00
Christian Kamm	ae69ff032b	Folders: Show as disconnected when account is disconnected. ... Previously you could get a green folder icon even when the account was signed out or disconnected for another reason.	2015-07-03 15:03:18 +02:00
Christian Kamm	1a58e6606c	TrayMenu: Show submenus per account. ... This addresses the inability to sign out from one account while keeping the other active. See #3399, #3400, #3379	2015-07-03 14:54:20 +02:00
Christian Kamm	e390c22f96	FolderStatusModel: Minor cleanup.	2015-07-03 14:28:04 +02:00
Christian Kamm	7053f76d1e	Password dialog: Include account name. ... Users with accounts on multiple servers could easily use the same username on both servers. The password dialog did not tell users what server the password is for. I added the account name to the dialog.	2015-07-03 11:39:44 +02:00
Christian Kamm	030d1e636b	Progress UI: Properly reset bar after a sync.	2015-07-03 11:26:03 +02:00
Christian Kamm	9ad79cfc52	TrayMenu: Ensure it updates when accounts are added or removed.	2015-07-03 11:13:19 +02:00
Olivier Goffart	76903fb55a	Settings: Aling the non-accounts button on the right	2015-07-03 11:04:03 +02:00
Olivier Goffart	0b8163fae1	Folder: the limit for the confirm featur is 100MB, not 100kB	2015-07-03 10:42:20 +02:00
Daniel Molkentin	0fb43dbc3a	Merge pull request #3397 from owncloud/uselibcpp ... OS X: Force linkage against libc++	2015-07-02 14:26:55 +02:00
Daniel Molkentin	0610d3ea8d	Merge pull request #3347 from jturcotte/shell_integration_findersync ... shell_i: Add a FinderSync-based implementation #2340	2015-07-02 14:20:24 +02:00
Christian Kamm	ba613a152a	FolderStatusModel: Always update on sync state change. ... Previously the icon and progress report could easily get somewhat stale and go out of sync with the tray icon.	2015-07-02 14:17:38 +02:00
Daniel Molkentin	a1b6571d53	Revert "Do not use std::unique_ptr" ... This reverts commit 2db7ab5c46.	2015-07-02 13:31:42 +02:00
Olivier Goffart	2db7ab5c46	Do not use std::unique_ptr ... The class is not existing on all platform we support (namely macos 10.7)	2015-07-02 12:55:54 +02:00
Christian Kamm	bf183f425d	SslConfig: Reset when QNAM is reset. #3394 ... It seems running a CheckServerJob with the existing ssl config after resetting QNAM will produce a ssl config without a cert chain.	2015-07-02 11:28:40 +02:00
Christian Kamm	1b31f45435	SslButton: Only show menu when info is available. ... For unencrypted connections there used to be a small arrow indicating that more information was available, but clicking the button had no effect. That indicator is now gone because we unset the SslButton's menu for these cases.	2015-07-02 10:49:18 +02:00
Christian Kamm	4420d52919	QuotaInfo: Ensure label fits into progress bar. #3393	2015-07-02 10:28:33 +02:00
Christian Kamm	8aeb3cc8d2	Improve account connectivity tooltips. #3200 ... * Show connection errors for all failing accounts in the tooltip. * Don't hide the 'service unavailable' state. We don't want intrusive pop ups, but we don't want to pretend we're syncing when we aren't. * Show sync-running icon also for SyncPrepare state. In my tests I very rarely saw the sync-running icon before.	2015-07-01 14:53:07 +02:00
Christian Kamm	2fa00168cf	Sync scheduling: fix per-account scheduling. #3379 ... application.cpp still had a global folder syncing on/off switch when an account connected or disconnected. That couldn't work with multiaccount. Instead FolderMan listens to accountStateChanged messages and schedules or de-schedules the folders for accounts that change state.	2015-07-01 14:53:07 +02:00
Olivier Goffart	4a541a9ab4	Merge remote-tracking branch 'origin/maser'	2015-06-30 13:52:38 +02:00
Daniel Molkentin	66e8aaeabc	Use doxygen style everywhere	2015-06-29 18:56:09 +02:00
Daniel Molkentin	eff4daa00b	Merge remote-tracking branch 'origin/master' into doxygenify ... Conflicts: src/gui/quotainfo.h	2015-06-29 18:45:55 +02:00
Daniel Molkentin	0735aa1fbd	Structure developer documentation ... - rename target "doc-dev" - group into modules - move to doc/dev	2015-06-29 18:43:21 +02:00
Olivier Goffart	076f8ea105	Merge pull request #3097 from owncloud/translatable-remaining-time ... make the remaining time string translatable and support plural forms	2015-06-29 18:30:44 +02:00
Markus Goetz	ef1e6add4f	Settings: Auto download bandwidth limit #1485	2015-06-29 17:43:25 +02:00
Olivier Goffart	ec3fc50e0e	FolderMan: store folders in a QMap instead of a QHash so they are kept in order ... Issue #1529	2015-06-29 15:49:47 +02:00
Olivier Goffart	7a324ff25b	Utility: improve the function to conver a duration to string ... - Make it translatable - Make use of the %n so that it supports plurals (but this will only take effect if we have an english translation) - Only put two units. eg: "5 years 7 months" instead of "5 years 7 months 12 days 34 minutes 23 seconds" Even when it is "2 hours 23 minutes" the amount of second does not matter, especially since the estimation is likely to be boggus anyway Issues #2672 and #3097	2015-06-29 14:59:28 +02:00
Olivier Goffart	23ccaa2821	QuotaInfo: add a comment about long running job ... To document the change made two commits ago	2015-06-29 10:57:32 +02:00
Olivier Goffart	51c10de672	QuotaInfo: make sure that we always check the quota every 30 seconds	2015-06-26 18:04:27 +02:00
Olivier Goffart	236951d9b3	QuotaInfo: allow only one job at the same time	2015-06-26 16:58:34 +02:00
Olivier Goffart	e7d7646151	QuotaInfo: only request the quota when the UI is visible	2015-06-26 15:43:19 +02:00
Olivier Goffart	7757886ebc	SystemTray menu: remove the quota information ... It makes no sens anymore with multi account and users will see it from the dialog anyway.	2015-06-26 13:32:02 +02:00
Christian Kamm	77941b5ba7	IgnoreEditor: Make UI more explicit. #3172 ... People were mistaking the checkbox for something that enables and disables specific ignore patterns. Now it's much more explicit.	2015-06-26 10:46:13 +02:00
Christian Kamm	10aaf18129	FolderMan: Make folderSyncStateChange() signal reliable. #3354	2015-06-26 10:09:03 +02:00
Olivier Goffart	db87d2a18e	QuotaJob: remove and use a PropfindJob instead ... This remove code duplication because the QuotaJob was just a duplication of the propfind jobs with the properties hardcoded.	2015-06-25 14:39:48 +02:00
Olivier Goffart	29fecb029e	Merge remote-tracking branch 'origin/1.8' ... Conflicts: VERSION.cmake src/gui/accountsettings.cpp src/gui/accountsettings.h	2015-06-25 12:30:52 +02:00
Jocelyn Turcotte	9797782682	shell_i: Build the extension with the '-' identity by default ... This allows developers to build and run the extension by default. Official packages bundles will be re-signed after the build, we The SocketApi prefix can be set at configure time through cmake and should match the key that will be used to sign the whole .app bundle (including the embedded FindexSync .appex bundle).	2015-06-22 13:55:19 +02:00
Christian Kamm	deb5e68e15	Ignores: Force a remote discovery after ignore list change #3172 ... The problem was that the modified ignore pattern was not applied to the parts of the remote tree we simply retrieve from the db because the folder etag didn't change. Even worse, if one removed an ignore pattern, the un-ignored files would not be synced correctly. With this change, a modification to the ignore list always results in a full remote discovery. This guarantees that we find un-ignored files.	2015-06-19 14:58:47 +02:00
Olivier Goffart	bb85db6cc5	Fix windows build	2015-06-18 10:24:40 +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
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
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	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	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	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
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	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
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	10d9e53159	Confirm feature: Use selective sync in the database	2015-05-26 12:34:07 +02:00
Olivier Goffart	6b27d2e703	Merge remote-tracking branch 'origin/1.8'	2015-05-26 12:28:31 +02:00
Christian Kamm	0af2f7e5ed	ConValidator: Always run with new credentials. #3266	2015-05-22 09:38:44 +02:00
Olivier Goffart	aebadfcda2	FolderWizard: Add missing Q_OBJECT which prevent translations from working	2015-05-21 12:53:55 +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
Olivier Goffart	d7fa03cf2e	Systray menu: consider multiple account to choose the status	2015-05-13 13:10:14 +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
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
Olivier Goffart	dd5a49bc78	Application: Disable to workaround of QLockFile bug for Qt versions that are fixed	2015-05-12 17:26:32 +02:00
Olivier Goffart	299fa2dee6	FolderMan: fix a #warning in the migration path	2015-05-12 16:49:37 +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
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
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
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
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
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	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	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
Daniel Molkentin	bfba6f752c	Remove dead code	2015-05-05 10:23:59 +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
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	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
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	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	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	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
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
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	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
Daniel Molkentin	ed80a712ab	Sort folder sizes SelectiveSyncTreeView numerically ... Fixes #3112	2015-04-14 20:00:42 +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
Roeland Jago Douma	5a83636f81	Only show share dialog if we are connected.	2015-04-08 09:53:57 +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	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
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
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	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	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
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
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
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
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
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	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
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
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
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
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	31e4009737	Propagator: Use QBA for responseTimestamp instead of QString	2015-03-09 15:52:52 +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
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
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
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
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
Klaas Freitag	8507aba9f8	SocketAPI: Append trailing slash for directories in UPDATE_VIEW. ... This fixes #2233	2015-02-26 16:41:55 +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	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
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
Daniel Molkentin	9690ca0198	Explain the "crash now" button to translators	2015-02-17 14:03:09 +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
Christian Kamm	40dbc78407	concatUrl: Remove manual parsing, add test. #2817	2015-02-13 14:53:55 +01:00
Daniel Molkentin	0bf0bab1eb	One more Qt4 compile fix	2015-02-12 22:13:58 +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	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
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	ba3bab8f49	Remove certificateDate property and other superfluous code	2015-02-12 12:37:42 +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
Christian Kamm	91ae912373	ShareDialog: Don't crash with bad response. #2811	2015-02-11 16:02:50 +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	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
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	7c0d3b8485	Sharing: tr()s added	2015-02-06 11:11:09 +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
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	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
Markus Goetz	f233af04f6	Windows XP: Possible fix for #2648	2015-02-04 18:49:04 +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
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
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
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
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	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	b856266e91	Remove neon link flag when not required	2015-01-23 17:35:17 +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	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	168c89aba7	Wizard: fix spacing	2015-01-22 15:11:03 +01:00
Markus Goetz	c9f9d55658	Merge branch 'qnam_csync_update' ... Conflicts: src/libsync/networkjobs.cpp	2015-01-22 14:34:36 +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
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	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
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	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
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
Olivier Goffart	885aafcea3	SelectiveSync dialog: Show the sizes of the folder	2015-01-14 15:08:09 +01:00
Roeland Jago Douma	0bd6eb1792	Sharedialog: fix changes due to rebase	2015-01-14 13:51:02 +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	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
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
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	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
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	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
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
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	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
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	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
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	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
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	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	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
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	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
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
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	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
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
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	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
Daniel Molkentin	f25d175b5d	Merge remote-tracking branch 'origin/1.7'	2014-11-06 19:54: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
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
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
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
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
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
Dominik Schmidt	1aca22b5f8	Make crash reporter executable branded	2014-08-30 10:46:09 +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
Dominik Schmidt	38ff7d87c8	Hide crashreporter config option if not build with crashreporter enabled	2014-08-29 17:07:31 +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
Dominik Schmidt	439bf7641e	Use include path for libcrashreporter-qt instead of lengthy relative include	2014-08-28 11:11:42 +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
Dominik Schmidt	2b4849a2fa	Add crash reporter using libcrashreporter-qt	2014-08-26 18:15:13 +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
Daniel Molkentin	4fc044d368	Merge branch 'master' into move_lib_to_sep_dir ... Conflicts: cmake/modules/NSIS.template.in src/CMakeLists.txt src/creds/shibboleth/authenticationdialog.cpp src/creds/shibboleth/authenticationdialog.h src/gui/owncloudgui.cpp src/libsync/creds/shibboleth/authenticationdialog.cpp src/libsync/creds/shibboleth/authenticationdialog.h src/libsync/mirallaccessmanager.cpp src/mirall/authenticationdialog.cpp src/mirall/authenticationdialog.h	2014-08-12 21:08:44 +02:00
Daniel Molkentin	bb32831a60	Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir ... Conflicts: src/gui/folderman.cpp	2014-07-17 11:31:45 +02:00
Daniel Molkentin	3c2e43d883	Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir	2014-07-14 10:50:53 +02:00
Daniel Molkentin	5041880854	Try to handle BUILD_LIBRARIES_ONLY correctly ... Also, try to fix OS X build	2014-07-11 12:36:01 +02:00
Daniel Molkentin	2c904afd04	OS X explicitly requires the neon include path to be set	2014-07-11 12:11:04 +02:00
Daniel Molkentin	2cc13fb74a	Fix includes in mac specific headers	2014-07-11 11:38:01 +02:00
Daniel Molkentin	df3c3bca02	Split into three separate projects: library, gui and cmd	2014-07-11 11:07:31 +02:00