Christian Kamm
acb155503b
Ensure the 'Sync paused' state is used after pausing #5290
2016-11-29 09:56:45 +01:00
Jenkins for ownCloud
4cb80b08a2
[tx-robot] updated from transifex
2016-11-29 02:18:28 +01:00
Jenkins for ownCloud
cd85b7c6d7
[tx-robot] updated from transifex
2016-11-28 02:18:33 +01:00
Olivier Goffart
109056e676
owncloudcmd: Don't put the password in the URL
...
As the URL might be print on the logs.
Also don't change the scheme from http to owncloud.
This was required before when we were using neon through csync, but now that
we use QNAM for everything we don't need it. The credentials from the account
are used.
2016-11-26 12:57:44 +01:00
Jenkins for ownCloud
51a1bea5de
[tx-robot] updated from transifex
2016-11-26 02:18:36 +01:00
Christian Kamm
68f99bcc27
AccountSettings: Add a "Force sync now" context menu option
2016-11-25 14:23:56 +01:00
Christian Kamm
276985f6c3
Fix perl tests for sync journal db name
2016-11-25 13:21:34 +01:00
Jenkins for ownCloud
7523db354d
[tx-robot] updated from transifex
2016-11-25 02:18:27 +01:00
Jenkins for ownCloud
4919c9e7b1
[tx-robot] updated from transifex
2016-11-24 02:18:38 +01:00
Christian Kamm
045498c71a
Account: Rename user() to davUser()
...
Avoids potential confusion with credentials->user()
2016-11-23 17:08:17 +01:00
Christian Kamm
49f8143f00
Bugfixes for sync journal name generation and usage
...
* Use 'user' value for journal name generation
* Save journal name in settings
* Make owncloudcmd choose the right db
2016-11-23 16:48:15 +01:00
Christian Kamm
bea7241910
Don't wipe each journal on each start
2016-11-23 16:48:15 +01:00
Christian Kamm
61b4da944c
Split folders configuration locations for backwards compatibility
2016-11-23 16:48:15 +01:00
Christian Kamm
6fe1868693
Always migrate .csync_journal to ._sync_xxx
2016-11-23 16:48:15 +01:00
Christian Kamm
9641c7a1e7
Rename sync journal to ._sync_xxx.db.
...
The added underscore means that older clients will also ignore the
file.
2016-11-23 16:48:15 +01:00
Christian Kamm
3e59a9b316
Merge branch 'master' into dbjournal_per_account
2016-11-23 16:47:56 +01:00
Markus Goetz
679ac0d26a
Wizard: Show if server asks for client certificate #2799 #69 ( #5261 )
...
This also nicely displays the 'Untrusted domain' message of oC.
The link to add a trusted domain (via web browser) is clickable.
2016-11-23 11:43:15 +01:00
Markus Goetz
2e3a3bcf84
Folder: Make folder only accessible by user #5282 ( #5315 )
...
Because on OS X the parent folder might not protect
against access.
2016-11-23 11:05:41 +01:00
Jonathan Kawohl
ad437a49f9
Merge branch 'Kawohl-master'
...
fix conflict
2016-11-23 11:01:52 +01:00
Jonathan Kawohl
6b2282bf0d
Merge branch 'master' of https://github.com/owncloud/client into Kawohl-master
...
fix conflict
2016-11-23 10:59:18 +01:00
Jonathan Kawohl
42aed56a5a
Merge branch 'master' of https://gthub.com/Kawohl/client into Kawohl-master
...
fix conflict
2016-11-23 10:56:29 +01:00
Jonathan Kawohl
ca9ec46253
fixed note
2016-11-23 09:17:33 +01:00
Jonathan Kawohl
a92eec160a
fixed review https://github.com/owncloud/client/pull/5259#pullrequestreview-9743725
2016-11-23 09:10:58 +01:00
Jenkins for ownCloud
cc91c42dfa
[tx-robot] updated from transifex
2016-11-23 02:18:37 +01:00
Olivier Goffart
d22d0e7e30
Propagator: don't use dynamic_cast for QObject
...
qobject_cast is better. (no need to use RTTI when we have QMetaObject
2016-11-22 17:37:41 +01:00
Samuel
4998303c42
Fixing a typo on a message
...
This refers to the message shown when copying the list of unsynced items on the activity tab
2016-11-22 12:14:03 +01:00
Christian Kamm
ceef2f2d46
FolderMan: Never schedule paused folders #5290
...
Previously the last folder in the queue was scheduled, regardless
of whether it was paused or not.
2016-11-22 10:53:15 +01:00
Jenkins for ownCloud
8b18600d7e
[tx-robot] updated from transifex
2016-11-22 02:18:29 +01:00
Jonathan Kawohl
6cc63462b3
adjusted minimum version.
2016-11-21 13:53:59 +01:00
Olivier Goffart
a1dc4069c9
libsync: Don't store the remote URI in the csync or in the SyncEngine
...
We are going to change the webdav path depending on the capabilities.
But the SyncEngine and csync might have been created before the capabilities
are retrieved.
The main raison why we gave the path to the sync engine was to pass it to csync.
But the thing is that csync don't need anymore this url as everything is done by the
discovery classes in libsync that use the network jobs that use the account for the urls.
So csync do not need the remote URI.
shortenFilename in folderstatusmodel.cpp was useless because the string is the
_file of a SyncFileItem which is the relative file name, that name never
starts with owncloud://.
All the csync test creates the folder because csync use to check if the folder
exists. But we don't need to do that anymore
2016-11-21 08:09:11 +01:00
Jenkins for ownCloud
86846af59d
[tx-robot] updated from transifex
2016-11-21 02:18:27 +01:00
Jenkins for ownCloud
5bfa02602d
[tx-robot] updated from transifex
2016-11-20 02:18:28 +01:00
Jenkins for ownCloud
9be23984eb
[tx-robot] updated from transifex
2016-11-19 02:18:35 +01:00
Christian Kamm
eb8de8e3c0
Enable clicking on 'not synced' items #5306
2016-11-18 16:19:36 +01:00
ckamm
ec7333a4bf
Merge pull request #5272 from owncloud/licensefix-pending
...
License: Adjust license of GPLv2 source files to GPLv2+
2016-11-18 15:14:47 +01:00
Christian Kamm
e485c5c008
Always send a progress message at the end of a sync #5290
...
Some listeners detect whether a sync is finished by checking
for isUpdatingEstimates and completedFiles >= totalFiles. But
if a sync didn't transfer any files we never sent signal
with these values. Now we do.
2016-11-18 12:33:44 +01:00
Christian Kamm
6451eb3ade
Tray: Add a 'New account...' action if no account is configured #5307
...
Useful when left-clicking the tray icon isn't working for some reason.
2016-11-18 12:17:05 +01:00
Jenkins for ownCloud
01528427b5
[tx-robot] updated from transifex
2016-11-18 02:18:35 +01:00
Jenkins for ownCloud
cec4d7b9ff
[tx-robot] updated from transifex
2016-11-17 02:18:43 +01:00
Olivier Goffart
efa7821dd2
Revert "Discovery: consider also the "shared by me" as shared"
...
This reverts pull request 5313 (commit
2d6e473a402f3db04e87
2016-11-16 17:45:40 +01:00
Markus Goetz
89f55cf9df
Folder: Add comments after discussion about pre-selected selective sync
2016-11-16 14:08:05 +01:00
Markus Goetz
52552a4204
Merge pull request #5102 from owncloud/chunking-ng
...
Chunking ng
2016-11-15 15:56:52 +01:00
Olivier Goffart
2f3db04e87
Rename SyncFileStatus::sharedWithMe to shared
...
Last commit for issue #4788 made the meaning to be simply shared
(with the user or from the user)
2016-11-15 14:32:20 +01:00
Olivier Goffart
2d6e473a40
Discovery: consider also the "shared by me" as shared
...
The "S" in the permission is only for the "Shared with me" files.
It is only used to show the shared status in the overlay icons.
But we also wish to show the shared status for files that are shared
"by" the users. We can find that out using the 'share-types' webdav
property. If set, then we are sharing the object.
We fake a 'S' in the permission as for our purpose, they mean the same.
Issue #4788
2016-11-15 14:32:20 +01:00
Olivier Goffart
92027e8692
SyncEngineTestUtils: Do don't allocate a buffer for the whole file
...
As the file can be some hunreds of megabytes, allocating such big arrays may
cause problems.
Also make the timeout a bit bigger so the test can rununder valgrind.
2016-11-15 11:39:40 +01:00
Olivier Goffart
2723cd225e
FolderStatusDelegate: Fix compiler warning.
...
QStyleOptionProgressBarV2 is deprecated in Qt5.
2016-11-15 10:16:41 +01:00
Jenkins for ownCloud
acd151102c
[tx-robot] updated from transifex
2016-11-15 02:18:36 +01:00
Olivier Goffart
77e790d2ee
Merge pull request #5304 from owncloud/Kawohl-linktocentral
...
documnetation.
2016-11-14 12:43:10 +01:00
Olivier Goffart
899c675f0a
Merge pull request #5267 from payload/fix_4608
...
nautilus integration: "share" extension for syncing folders
2016-11-14 12:35:18 +01:00
Olivier Goffart
fb76487e76
Merge pull request #5266 from rmekarni/patch-1
...
Fix find_library FindCMocka.cmake
2016-11-14 12:20:24 +01:00
