Markus Goetz
4c9bc42b69
Revert libqsqlite changes for now
...
QtWebKit depends on it unfortunately
2015-10-20 13:04:33 +02:00
Markus Goetz
24a801dfd3
CMake/NSIS: We don't need QtSql (more)
2015-10-19 13:56:36 +02:00
Markus Goetz
af79bc9211
CMake/NSIS: We don't need QtSql
...
The NSIS change also had a redundant libsqlite3 DLL entry
2015-10-19 13:46:46 +02:00
Klaas Freitag
a3904f4d32
Theme: Revert logic of singleAccount switch.
...
To use the same logic as the other clients and unify ownBrander
implementations, the switch is now called multiAccount() rather
than singleAccount() with a reverse logic.
Desktop Client stays with the default of having multiaacount
enabled.
Note that existing brandings need to rename the switch.
https://github.com/owncloud/ownbrander/issues/443
2015-10-19 12:26:42 +02:00
Klaas Freitag
546cab3f62
Config: Use monochrome icons per default on MacOSX.
2015-10-16 18:55:07 +02:00
Olivier Goffart
0c59c85127
SyncEngine: Folders with ignored files should not count when counting none files
...
If there is a any none files, we do not show the dialog saying that all
files have been removed. If a directory contiains ignored files, we still
want to show this message box even if the directory will not be deleted
2015-10-16 11:43:52 +02:00
Markus Goetz
0d5f2b5d31
Propagator: Reset upload blacklist if a chunk suceeds
...
For #3934
2015-10-16 10:06:45 +02:00
Olivier Goffart
87fa1794a1
Updater: remove unused function
...
It was even throwing a warning because it is an infinite recursion
2015-10-16 09:56:26 +02:00
Olivier Goffart
81e30cd8d2
Merge pull request #3695 from owncloud/nomkpath3692
...
Folder: Do not create the sync folder if it does not exist #3692
2015-10-16 09:21:15 +02:00
Markus Goetz
983671c8cb
Shibboleth: Add our base user agent to WebKit
...
For #3913
2015-10-16 09:15:47 +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
Christian Kamm
3cbd63a77a
Propagation: Try another sync on 423 Locked #3387
...
(cherry picked from commit 24c41ed0da
)
2015-10-02 14:49:38 +02:00
Christian Kamm
62eeed5201
Propagation: Make 423 Locked a soft error #3387
...
(cherry picked from commit 20ea9015ca
)
2015-10-02 14:49:30 +02:00
Christian Kamm
7bf31e56ab
Ignores: Sync after update #3876
2015-10-01 15:39:28 +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
Christian Kamm
ef0ab93e05
Propagator: Simplify sub job finished counting #3844
2015-09-17 10:12:23 +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
c2431f2c3b
ConnectionValidator: Fix warning
2015-09-15 21:10:21 -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
Daniel Molkentin
f1a9e669b4
SyncEngine: fix typo
2015-09-14 13:57:51 +02:00
Markus Goetz
5a791ec11e
Merge pull request #3818 from owncloud/phil-davis-patch-1
...
OCUpdater description text
2015-09-14 00:46:55 +02:00
Markus Goetz
cb6522e735
ConnectioNValidator: Fix redundant error message
...
For #3794
2015-09-12 20:57:49 -04: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
Markus Goetz
1de4d96ab1
Account: Also display non-standard port in tray menu
...
For #3658
2015-09-10 19:27:16 -04:00
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
8c2b5af7f0
Account: Fixed typo in comment.
2015-09-10 17:44:20 +02:00
Klaas Freitag
9004fd6d11
Utility: Fix the size display back to JEDEC standard.
...
Also updated the test.
2015-09-10 17:36:28 +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
93e1ad088c
Account: Make sure that davPath() always comes with trailing slash.
2015-09-10 15:38:40 +02:00