Olivier Goffart
3f2a2cb14b
FolderDelegate: put the progressbar in place of the remote or local folder #3403 #3569
...
So the size of the delegate does not change
2015-10-27 12:52:33 +01:00
Olivier Goffart
fac00348d9
Use the term folder sync connection in more places #3757
2015-10-27 12:12:21 +01:00
Olivier Goffart
3c93fd4fb7
AccountSettings: don't disable pause when offline ( #4010 )
2015-10-27 10:32:33 +01:00
Klaas Freitag
6b71273380
Discovery: Fix detection of hidden files.
...
In the discovery phase we want to detect that dot-files are hidden
on Linux and Mac.
This fixes strange behaviour seen in issue #3980
2015-10-26 14:24:05 +01:00
Olivier Goffart
dccf4e9c34
Download: Soft errors for error while resuming ( #4000 )
2015-10-26 12:31:07 +01:00
Olivier Goffart
39289a3164
SocketAPI: don't trim the command #3297
2015-10-26 10:15:50 +01:00
Olivier Goffart
84f1bdbc87
Folder::wipe: We need to shut the socket API down before removing the DB
...
Because the DB stays open and locked.
Should fix #3824
2015-10-23 17:43:01 +02:00
Olivier Goffart
c93defc82d
SyncEngine: remove unused functions
2015-10-23 17:11:19 +02:00
Olivier Goffart
bd39c64798
Delete all files: make the 'Keep' on by default
...
On windows, we need to specify at least one AcceptRole.
Otherwise the DestructiveRole might become the default
Issue #3824
2015-10-23 17:06:14 +02:00
Olivier Goffart
42a6b242c7
SettingsDialog: use QWidgetAction for the toolbar so the extension works
...
When the toolbar is full because there is no enough room, make the extension
of the toolbar work, by using QWidgetAction::createWidget instead of
QToolBar::insertWidget
There should not be prolem when the window is too narrow.
Relates #3832
2015-10-23 16:23:37 +02:00
Joas Schilling
6d87bd15cd
Make returncode 0 for --version and --help
2015-10-23 15:17:29 +02:00
Olivier Goffart
d657c00b11
FolderStatusModel: fix getting the size of the folder in the selective sync ( #3986 )
...
Regressed since d610693af1
. The problem
is that the _size vector contains the pathToRemove and that it was removed
before.
Reorganize a bit the code so there is only one loop that has still all the
information.
2015-10-23 15:13:15 +02:00
Olivier Goffart
6a0633083d
Network Settings: Adjust the bandwidth limit option with old Qt
...
- Disable the whole group box
- Add a tooltip explaining why it is disabled
- Make sure it is disabled in the settings in case of upgrade
- Do a runtime check in case the running Qt is greater
2015-10-22 17:57:34 +02:00
Daniel Molkentin
899f52be4f
Revert "Settings dialog: remove the close button #3713 "
...
This reverts commit ebee6f0bc2
.
Unix window managers do not have a reliable way of hinting buttons,
so we need the close button.
2015-10-22 16:20:59 +02:00
Olivier Goffart
a608b4e9e0
Folder: set csync verbosity to 0 if the Logger is not there
...
csync_log was still accounting for 8% of the local discovery (because
of vsnprintf and asprintf)
2015-10-22 01:13:35 +02:00
Olivier Goffart
f6a543ada3
Logger: speedup the sync discovery when the log is innactive
...
The sync throw a lot of log message, and QDateTime::fromCurrentTime is
quite expensive. So don't call it if it's not needed.
2015-10-22 00:22:25 +02:00
Daniel Molkentin
c7bf09c3d4
Merge remote-tracking branch 'origin/2.0'
2015-10-21 18:49:58 +02:00
Olivier Goffart
c80e72da83
Sharing: change coding style of enum
...
From all upper case to camel case
This hopefully fix the Windows build which fails because DELETE seems
to be a macro
2015-10-21 18:40:04 +02:00
Roeland Douma
ec351e00ad
Merge pull request #3773 from owncloud/split_sharedialog
...
Split sharedialog code
2015-10-21 16:55:59 +02:00
Olivier Goffart
cf242871ea
SyncEngine: keep a static pointer to the codec
...
The QTextCodec for UTF-8 is not going to change during the application life time.
So no need to look it up for every file
2015-10-21 16:38:26 +02:00
Olivier Goffart
597d36dcf2
csync_statedb: Use the index in csync_statedb_get_below_path
...
Make an index from the path, and make a query that uses the index
2015-10-21 16:38:26 +02:00
Olivier Goffart
9c388787bb
csync_update: Don't fetch the etag in the local discovery from the DB
...
We don't need it, and it's slow.
This saves a lot of DB queries
(Also replaced a strlen>0 with a faster check)
2015-10-21 16:38:26 +02:00
Markus Goetz
f739d8fdd3
sqlite: Update to version 3.9.1
...
For OS X and Windows.
This is in line with the tests/benchmarks Olivier is doing on ArchLinux.
2015-10-21 15:55:41 +02:00
Markus Goetz
c8590c4468
Remove legacy propagator and neon
...
The code was already uneeded/unbuilt on Windows and OS X.
2015-10-20 17:57:43 +02:00
Markus Goetz
98b966d274
OS X: Use Cocoa Pasteboard instead of QClipBoard #3300
2015-10-20 15:42:43 +02:00
Olivier Goffart
674b6f2373
Account Settings: clear the focus of the "Sign In" button when clicked
...
So that the focus does not go to the "Remove Account" button instead
which would be wierd
2015-10-20 13:56:35 +02:00
Olivier Goffart
407ff0a99d
Theme: cache the QIcon::fromTheme
...
We are calling that every time we draw the folder delegate.
Which is a lot when the sync is runing and the progress bar is moving
2015-10-20 13:24:11 +02:00
Olivier Goffart
0b6d21e3d5
Logger: don't call qFormatLog when unessesary
...
That's a lot of string operations that can be avoided if the log window
is not shown
2015-10-20 13:22:48 +02:00
Markus Goetz
4c9bc42b69
Revert libqsqlite changes for now
...
QtWebKit depends on it unfortunately
2015-10-20 13:04:33 +02:00
Olivier Goffart
557b704069
Fix compilation warning
...
shibbolethcredentials.h:59:10: warning: 'askFromUser' overrides a member
function but is not marked 'override' [-Winconsistent-missing-override]
2015-10-20 11:35:25 +02:00
Olivier Goffart
4369e31a49
Folder Model: don't try to fetch data if the account is disconnected
...
Now that it expands automatically, it would do lots of query to the
server when the account is disconnected. (all resulting in 401)
2015-10-19 18:32:34 +02:00
Olivier Goffart
23b5a74c17
Account Settings: Don't expand while clicking on the '...' button
2015-10-19 18:23:56 +02:00
Olivier Goffart
ee69ab2021
Account Settings: Don't disable double click expanding for sub folders
...
The root folder open on simple click, but the sub folder don't, so keep
this behaviour which is the native behaviour
2015-10-19 18:12:49 +02:00
Olivier Goffart
374f29c4d3
Account Settings: Fix crash for acocunts withour folder
...
Was broken by 027a865fbc
2015-10-19 18:08:11 +02:00
Markus Goetz
67910e7d60
Discovery: Call it "Checking for changes in" in UI
...
For #3431
2015-10-19 15:59:16 +02:00
Markus Goetz
ccec186b98
ETagJob: Depth 0 for server >= 8.1 #3730
2015-10-19 15:31:27 +02:00
Klaas Freitag
c66c259447
SettingsDialog: Add new widet called ActivityWidget.
...
This is the new widget to display server activity.
2015-10-19 14:41:53 +02:00
Klaas Freitag
4ad165ce26
Utility: add method fileNameForGuiUse(), pimp up filename for GUI
...
Currently, this one only replaces colons by / on Mac platform. This makes
the function resuseable.
2015-10-19 14:36:55 +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
Olivier Goffart
5cac90b3eb
SelectiveSyncTreeView: show the size for the root item ( #3755 )
2015-10-19 10:58:54 +02:00
Olivier Goffart
df135a0bb2
Merge branch '2.0'
...
Conflicts:
src/gui/folder.cpp
2015-10-19 10:57:37 +02:00
Klaas Freitag
546cab3f62
Config: Use monochrome icons per default on MacOSX.
2015-10-16 18:55:07 +02:00
Roeland Jago Douma
4a04dc1a3e
Typos
2015-10-16 12:51:24 +02:00
Roeland Jago Douma
0e97fbb730
Use overloaded functions
2015-10-16 12:48:48 +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
Roeland Jago Douma
40ab3ee751
Now only 1 constructor to ocssharejob
...
* Pass the share_id to the functions that need it
2015-10-16 08:28:13 +02:00
Roeland Jago Douma
f95fea9866
Move permissions to OcsShareJob
2015-10-16 08:09:57 +02:00
Roeland Jago Douma
03719334ea
Remove unused members
2015-10-15 22:27:55 +02:00
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
Christian Kamm
67e9a06d30
Progress estimation: Adjust low-transfer detection #3942
...
Progress estimation is usually based on transfer speed. That makes no
sense when we're doing operations like deletes, that need very little
data transfer but nevertheless take a long time.
This hack attempts to detect this case better and switches to a
different estimate.
We should rewrite this to maintain and update estimates for the
transfer speed, per-file overhead and chunk-assembly overhead each
time an item finishes. Then we could provide more consistent progress
estimates without ad-hoc fixes like this one.
Also, there's an issue where resuming a partial download will lead
to exaggerated transfer speed estimates.
2015-10-15 15:04:11 +02:00
Christian Kamm
abd63035c1
ETag: Allow parsing of weak tags #3946
2015-10-15 14:57:34 +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
Roeland Jago Douma
05471d0acd
Also parse capabilitie for public uploads
2015-10-14 15:30:23 +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
c1ba927b37
Propagatorjobs: Removed superflous semicolon.
2015-10-08 16:20:42 +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
Klaas Freitag
6d6903ef62
Merge pull request #3919 from phil-davis/libsynctypos
...
libsync comment and message typos for master
2015-10-06 14:49:54 +02:00
Phil Davis
b8ccbbc72a
GUI comment and message typos for master
2015-10-05 10:06:19 +05:45
Phil Davis
f0e17fd9c0
libtypos comment and message typos for master
2015-10-05 09:05:09 +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
Christian Kamm
9f8d109a7e
Network errors: Use exception name, if message is empty #2718
2015-10-02 15:25:34 +02:00
Christian Kamm
cf9e5ffb0b
Remove dead code
...
no_recursive_propfind does not exist anymore.
2015-10-02 15:17:19 +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
1383023b2e
Fix the Qt4 build.
2015-10-02 11:05:15 +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
Christian Kamm
3812fd0866
Checksums: Prepare 'supported checksums' capability #3735
...
It currently always returns the empty list and thus has no effect.
2015-10-01 15:00:33 +02:00
Christian Kamm
24c41ed0da
Propagation: Try another sync on 423 Locked #3387
2015-10-01 13:05:07 +02:00
Christian Kamm
36e8e9ebf5
Propagator: Download disk space checks #2939
...
* There's a critical 50 MB threshold under which syncs abort
(OWNCLOUD_CRITICAL_FREE_SPACE)
* The sync client always keeps 250 MB free
(OWNCLOUD_FREE_SPACE)
2015-10-01 12:59:05 +02:00
Christian Kamm
12dc372b21
Sync: An initial diskspace check #2939
...
* Before each sync, check that there are at least
250 MB of space available and abort otherwise.
* Can be overridden with OWNCLOUD_MIN_FREE_SPACE
2015-10-01 10:25:35 +02:00
Christian Kamm
20ea9015ca
Propagation: Make 423 Locked a soft error #3387
2015-09-30 14:00:53 +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
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
Phil Davis
b490be2267
cmd and crashreporter minor typos
...
nothing important here
2015-09-10 17:34:26 +05:45
Klaas Freitag
16d6418d10
Use a themable WebDAV path all over.
...
This is needed for enterprise#481
2015-09-10 13:04:26 +02:00
Klaas Freitag
995b42d0fc
Units: Back to the "usual" mix units.
...
Now we display units again numerically wrong (based on 1024) but back
to how it was before in ownCloud.
2015-09-10 12:08:20 +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
Klaas Freitag
df534753b1
csync_update: Handle permission denied as soft error in discovery.
...
For that, treat the not accessible directory as if it were ignored.
This will fix #3767
2015-09-09 14:12:13 +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
Olivier Goffart
e54253d845
PropagateLocalRemove: remove entries from the DB even if there was an error.
...
Previously, in case of an error while deleting a directory, we would not
remove the entries from the local db, despite most of the files would
be deleted.
Which means that if the files re-appear on the server with the same etag,
we would think the file were deleted from the client and propagate the change.
In 1.8.0 we had this bug that we would not see some directory in the server in
some cases. This would lead us to delete the file on the client. Normaly the
files are deleted from the local database and next sync would re-download the files.
But in the cases where there was an error deleting one of the file (for example
if it was locked) we would then propagate the delete to the server.
Fix this by always deleting from the database the files that we deleted.
Issue #3206
2015-09-02 15:26:50 +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
628957de21
Remove the _readPwdFromDeprecatedPlace codepath
...
This was introduced in 1.6.2 to read the password from earlier versions.
People upgrading from 1.5 to 2.1 will sadly need to re-enter their password.
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
Felix Böhm
3ebc422bb5
Fix qtmacgoodies submodule
...
* was broken by 514372db6b
2015-08-30 17:51:43 +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
6c5328e4ca
Utility: Fix constants for 32-bit arch #3670
2015-08-24 13:56:10 +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
Olivier Goffart
ab52c8bcd7
Merge #3611
2015-08-14 13:32:48 +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
Klaas Freitag
76ce5adbf0
Abort the request and reset the QNAM if user does not ACK a new cert.
...
This is supposed to fix bug #3283
(cherry picked from commit 75b38d1a2f
)
2015-08-14 10:31:20 +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
Kirill Bychkov
1fe82ac70c
define OpenBSD
2015-08-13 09:54:53 +03:00
Kirill Bychkov
7786f1f9a9
Fix linking with libinotify on OpenBSD.
2015-08-13 09:44:55 +03: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
9c63740d26
Fix compilation on Windows
2015-08-11 18:15:46 +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
3b59960fb3
Fix Qt4 build (SSL sessionTicket())
2015-08-11 13:53:21 +02:00
Markus Goetz
bd71fdc388
SslButton: Fix harder #3534 #3536
2015-08-11 12:18:25 +02:00
Markus Goetz
6110a99afc
SyncEngine: Fix previous cherry-pick
2015-08-11 11:35:12 +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
Olivier Goffart
9dcce01e54
csync: ignore files/folder for which stat fails
...
instead of pretending it suicceed and not recursing in it.
This fixes a bug in which a folder with a too long name would be properly
created, then removed on the server in the next sync.
(cherry picked from commit 4bbf7669091cde7ec726b1708d8c54427b68f016)
Conflicts:
csync/src/csync.h
csync/src/csync_exclude.h
csync/src/csync_update.c
2015-08-11 11:17:20 +02:00
Christian Kamm
e0cf5c3920
Progress: Robust against bad 'completed' values #3579
...
Increasing the 'total' for bogus values of 'completed' is a bad idea.
2015-08-11 10:44:27 +02:00
Christian Kamm
3ab49143e1
Progress: Guard against decreasing progress #3579
...
Ensure that progress going backwards won't lead to outrageous
transfer speeds.
2015-08-11 10:38:04 +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
Lukas Reschke
9bbf9b86b7
Use HTTPS links
...
No need to have an additional redirect
2015-08-10 12:30:33 +02:00
Lukas Reschke
f74053f8ed
Use HTTPS links
...
No need to have an additional redirect
2015-08-10 12:15:45 +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
b906c70a86
ownSql: Do not use sqlite3 method not present in older version
...
Was only used for debug output anyway and broke RHEL/CentOS6
2015-08-07 11:14:14 +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
7c52e925b9
Propagator: Use fetchAndAddAcquire to get parallelism
2015-08-06 18:13:48 +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
2d49f4c844
AbstractNetworkJob: Make sure to print URL on timeout
2015-08-06 17:33:33 +02:00
Markus Goetz
049d49eba8
OwnSql: Show potential error on close #3421
2015-08-06 15:47:38 +02:00
Markus Goetz
593aa003d6
Propagator: Re-order statement of previous commit
...
The user should be allowed to override.
For issue #3382
Will also help for #3095
2015-08-06 15:28:50 +02:00
Olivier Goffart
29d7903c22
Propagator: do not use parallelism when we have bandwidth limit
...
When user wants to limit the bandwidth, he does not care about speed
anymore. And parallelism on slow network might cause problems.
For issue #3382
Will also help for #3095
(cherry picked from commit b20f29f22797367c7aa92bd74389c99b10c852a4)
2015-08-06 15:27:18 +02:00
Markus Goetz
1feb74981e
Progress: Show real speed and all filenames #3403 #3095
2015-08-06 15:25:16 +02:00
Olivier Goffart
2cf29352b8
SyncJournalDB: clear all the prepared query when closing the database
...
Not closing it may keep the file open (issue #3421 )
2015-08-06 14:28:02 +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
Jocelyn Turcotte
a9858d4ed2
Revert "Use dynamic library loading for detecting the correct path for links"
2015-08-06 10:41:33 +02:00
Olivier Goffart
8ec4d0f19b
Utility: use SI units for the sizes in bytes
2015-08-05 16:22:09 +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
0e3262b181
Theme: add a settings for configuring the default of newBigFolderSizeLimit
2015-08-05 15:33:51 +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
Markus Goetz
f6cd2c79d5
CSync: Proper error for invalid filenames #2777 #3128 #2240
2015-08-04 22:13:38 +02:00
Phil Davis
8216727553
Notify of big folders that are greater than or equal to the limit
...
This should allow for the case when a user has set the limit to 0 and a new empty folder appears on the server. The folder will have size 0 (no files in it). Doing the >= test here will mean that the user will be prompted about the new folder, which I think is the behaviour they would expect.
The side-effect of this change is that if the user has a limit of, for example, 10,000,000 and a new folder comes along with exactly 10,000,000 of content then they will now be prompted about it. Before the change such a new folder would have been auto-synced without prompting the user. I do not think this is a big deal - I cannot believe that users will be counting exact bytes for this limit, they are just setting a rough number of MB at the UI.
Should fix https://github.com/owncloud/client/issues/3542
2015-08-04 19:28:23 +05:45
Markus Goetz
514372db6b
Exclude list: Add entries from other sync programs #2814
2015-08-04 09:40:53 +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
48624fe033
SocketApi: Force fowarding an OK STATUS for all parent directories
...
This fixes a few issues with the new FinderSync integration on OSX which
can't easily clear its status cache when receiving an UPDATE_VIEW message
except by unregistering the folder, but which causes flickering.
This fix should also make the regeneration of the cache unnecessary on other
platforms through possibly expensive RETRIEVE_FILE_STATUS commands.
2015-07-31 21:59:58 +02:00
Jocelyn Turcotte
78b63c34cb
Do not add all remote directories to the SyncItemVector
...
To allow forwarding all OK states of sync jobs to the socket API
we need to make sure that the vector doesn't contain unneeded items.
This initially was intended to force updating the metadata for parent
folders, but since then the should_update_metadata flag check was
added both here and in PropagateDirectory::finalize where the metadata
is actually updated for parent folders. We can safely remove the inclusion
of all remote directory items.
2015-07-31 21:59:58 +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
Markus Goetz
eafc45d83c
CheckServerJob: Only show SSL ticket warning when actually suceeded
2015-07-30 18:16:37 +02:00
Vincent Petry
79d895ed9e
cmd: properly initialize random seed to avoid transferid collisions #3522
2015-07-30 18:08:28 +02:00
Markus Goetz
fd5330b469
Propagator: Log chunk transferid
2015-07-30 17:47:06 +02:00
Klaas Freitag
817a165da7
utility: Put the config include to top of includes.
2015-07-30 16:38:30 +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
7fc7925d17
Propagator: Don't corrupt file with broken webserver #3373
2015-07-30 14:40:24 +02:00
Markus Goetz
f01b7bb5db
Propagator: More debug output for downloads/uploads
2015-07-30 14:40:24 +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
Klaas Freitag
527fd1ac47
Capabilities: Add macro to make win compile again.
2015-07-30 11:04:49 +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
Jocelyn Turcotte
73209717ec
Update the qtmacgoodies submodule
...
Include a fix for an assert.
2015-07-28 15:19:09 +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
d9c52f6316
owncloudcmd: fix --httpproxy
...
It was only used for csync, but not for QNAM
Issue #3465
2015-07-28 13:33:58 +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
Olivier Goffart
22013eb528
ConfigFile: remove some unused functions
2015-07-28 12:05:34 +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
45b598cacb
Confirm feature: default to 500MB
...
Issue #3148
2015-07-27 10:04:53 +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
Klaas Freitag
21f7cea609
ConfigFile: Let updateCheckInterval return int instead of quint64.
...
QTimer wants that in setInterval()
2015-07-22 13:42:54 +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
Klaas Freitag
681466213f
ConfigFile: Return proper type for update check interval.
2015-07-20 12:10:30 +02:00
Klaas Freitag
cb4bfd8060
ConfigFile: Fix spelling.
2015-07-20 12:10:00 +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
944564258c
Fix the Utility Test
...
1 should be printed as "1" and not as "1.00"
2015-07-17 10:27:03 +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
Daniel Molkentin
59f93b77c3
Merge pull request #3468 from owncloud/3368
...
Win32: Do not silent-update if the application is already up-to-date
2015-07-16 23:02:06 +02:00
Roeland Jago Douma
7e79a78901
Use already available password field
2015-07-16 20:55:54 +02:00
Klaas Freitag
2f2ae09190
Utility: Added function versionOfInstalledBinary()
...
It calls the binary with param --version and returns the first line of
the output. For owncloud, that is the version string.
2015-07-16 18:16:16 +02:00
Olivier Goffart
b59fc39d13
Fix warnings about unused parametters
2015-07-16 18:15:07 +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
Olivier Goffart
bdf5029d47
HTTP cred: properly forget the password when signing out #3462
...
QNAM do not sign out by itself, it keeps the password in cache.
Qt5 has a function to clear the cache. On Qt4 we reset the QNAM
2015-07-16 17:00:14 +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
1aa17cdb69
owncloudcmd: add option to not ignore hidden files.
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
Klaas Freitag
3a5f66e976
SyncEngine: Remove bogus logging.
2015-07-15 15:54:41 +02:00
Klaas Freitag
9461e4ccd1
Sync: Only copy the hasIgnoredFlag for the remote side.
...
Also added some documentation about the handling.
2015-07-15 15:53:58 +02:00
Klaas Freitag
7b8dc9777e
Sync: Rename ignored file member to _serverHasIgnoredFiles.
...
This should make it more obvious that only the server state about
ignored files is stored in the db.
2015-07-15 15:51:15 +02:00
Klaas Freitag
b0aedef4b0
Sync: Store information about ignored files on the server in database.
...
That allows better handling of remove requests that should not be done
because the directory is not empty on the remote side (as it contains
ignored files).
2015-07-15 15:49:27 +02:00
Klaas Freitag
da87a47eaf
discovery: handle dot files on server as hidden.
2015-07-15 15:20:46 +02:00
Klaas Freitag
7aa2b50828
csync_update: Handling hidden files as excluded files, as intended.
2015-07-15 15:20:46 +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
Christian Kamm
7edb57e46c
Fix error message for invalid chars in filename #3432
2015-07-15 10:38:33 +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
45180a024d
Rename should_update_etag to should_update_metadata
...
This should avoid some confusion
2015-07-09 15:05:37 +02:00