Jocelyn Turcotte [Tue, 6 Dec 2016 13:55:49 +0000 (14:55 +0100)]
Don't try to deploy the mng image format plugin on macOS
Qt now only build it if the system library is available since libmng
isn't active enough to make its security reliable enough. We don't
use that image format ourselves anyway.
Jocelyn Turcotte [Tue, 6 Dec 2016 13:54:05 +0000 (14:54 +0100)]
Rebase Qt patches on 5.6 #3449
Also get rid of the list of different version. We always only support one Qt version
for macOS and Windows, and the list of patches will be based on that supported
version.
Jenkins for ownCloud [Wed, 7 Dec 2016 01:18:34 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
ckamm [Tue, 6 Dec 2016 09:55:58 +0000 (10:55 +0100)]
Merge pull request #5045 from owncloud/dbjournal_per_account
Allow a folder to be synced to several accounts. This changes the path of the sync journal file!
Jenkins for ownCloud [Tue, 6 Dec 2016 01:18:34 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Mon, 5 Dec 2016 16:21:36 +0000 (17:21 +0100)]
libsync: Clear the upload info after several retries (#5345)
Issue #5344
Jenkins for ownCloud [Mon, 5 Dec 2016 01:18:32 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 4 Dec 2016 01:18:28 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 3 Dec 2016 01:18:25 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 2 Dec 2016 01:18:35 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 1 Dec 2016 01:18:28 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 30 Nov 2016 01:18:34 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Felix Tiede [Sun, 20 Nov 2016 15:54:41 +0000 (16:54 +0100)]
Generate .desktop file with OEM name directly.
Instead of renaming the .desktop file at install time it is now
generated with its OEM name during configure time.
Felix Tiede [Sat, 19 Nov 2016 09:48:06 +0000 (10:48 +0100)]
Fix file installation source path.
By default the file is copied from the source and not the build
directory which will fail with the configure-time built file.
Felix Tiede [Sat, 19 Nov 2016 08:33:49 +0000 (09:33 +0100)]
Extend OEM configurability to dolphin desktop file.
OEM configurability creates binaries with OEM names which the .desktop
file doesn't take into account and thus dolphin integration does not
work if OEM changes the binary's name(s).
These changes are now integrated into the .desktop file at compile time.
Olivier Goffart [Wed, 16 Nov 2016 08:30:29 +0000 (09:30 +0100)]
libsync: use the new webdav url if the server reports it
The rules to select the webdav url are now:
- If the server reports that the new chunking algorithm is working,
always use remote.php/dav/files/<username>
This capability can be overriden with an environment variable
- Otherwise, use the dav path provided by the theme, which defaults to
remote.php/webdav
This means that with the newer server, the branding can no longer override
the webdav URL. If there is still an usecase for the branding to do so, we
need to find another way to override it. But it is now more complicated to
configure as might need include the username and need different endpoint
depending on the operations (chunks or not)
Issue #4007
Christian Kamm [Tue, 29 Nov 2016 09:39:20 +0000 (10:39 +0100)]
FolderWizard: pass AccountPtr by const&
For review of #5045
Christian Kamm [Tue, 29 Nov 2016 09:38:47 +0000 (10:38 +0100)]
Fix compilation with Qt < 5.1
For review of #5045
Christian Kamm [Tue, 29 Nov 2016 08:56:45 +0000 (09:56 +0100)]
Ensure the 'Sync paused' state is used after pausing #5290
Jenkins for ownCloud [Tue, 29 Nov 2016 01:18:28 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 28 Nov 2016 01:18:33 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Fri, 25 Nov 2016 17:47:37 +0000 (18:47 +0100)]
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.
Jenkins for ownCloud [Sat, 26 Nov 2016 01:18:36 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Christian Kamm [Fri, 25 Nov 2016 13:23:56 +0000 (14:23 +0100)]
AccountSettings: Add a "Force sync now" context menu option
Christian Kamm [Fri, 25 Nov 2016 12:21:34 +0000 (13:21 +0100)]
Fix perl tests for sync journal db name
Jenkins for ownCloud [Fri, 25 Nov 2016 01:18:27 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 24 Nov 2016 01:18:38 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Christian Kamm [Wed, 23 Nov 2016 16:08:17 +0000 (17:08 +0100)]
Account: Rename user() to davUser()
Avoids potential confusion with credentials->user()
Christian Kamm [Wed, 23 Nov 2016 09:40:17 +0000 (10:40 +0100)]
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
Christian Kamm [Tue, 22 Nov 2016 15:12:28 +0000 (16:12 +0100)]
Don't wipe each journal on each start
Christian Kamm [Tue, 22 Nov 2016 14:30:12 +0000 (15:30 +0100)]
Split folders configuration locations for backwards compatibility
Christian Kamm [Tue, 22 Nov 2016 13:20:08 +0000 (14:20 +0100)]
Always migrate .csync_journal to ._sync_xxx
Christian Kamm [Tue, 22 Nov 2016 12:17:04 +0000 (13:17 +0100)]
Rename sync journal to ._sync_xxx.db.
The added underscore means that older clients will also ignore the
file.
Christian Kamm [Tue, 22 Nov 2016 12:09:56 +0000 (13:09 +0100)]
Merge branch 'master' into dbjournal_per_account
Markus Goetz [Wed, 23 Nov 2016 10:43:15 +0000 (11:43 +0100)]
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.
Markus Goetz [Wed, 23 Nov 2016 10:05:41 +0000 (11:05 +0100)]
Folder: Make folder only accessible by user #5282 (#5315)
Because on OS X the parent folder might not protect
against access.
Jonathan Kawohl [Wed, 23 Nov 2016 10:01:52 +0000 (11:01 +0100)]
Merge branch 'Kawohl-master'
fix conflict
Jonathan Kawohl [Wed, 23 Nov 2016 09:59:18 +0000 (10:59 +0100)]
Merge branch 'master' of https://github.com/owncloud/client into Kawohl-master
fix conflict
Jonathan Kawohl [Wed, 23 Nov 2016 09:56:29 +0000 (10:56 +0100)]
Merge branch 'master' of https://gthub.com/Kawohl/client into Kawohl-master
fix conflict
Jonathan Kawohl [Wed, 23 Nov 2016 08:17:33 +0000 (09:17 +0100)]
fixed note
Jonathan Kawohl [Wed, 23 Nov 2016 08:10:58 +0000 (09:10 +0100)]
fixed review https://github.com/owncloud/client/pull/5259#pullrequestreview-
9743725
Jenkins for ownCloud [Wed, 23 Nov 2016 01:18:37 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Tue, 22 Nov 2016 16:25:42 +0000 (17:25 +0100)]
Propagator: don't use dynamic_cast for QObject
qobject_cast is better. (no need to use RTTI when we have QMetaObject
Samuel [Tue, 22 Nov 2016 09:15:21 +0000 (10:15 +0100)]
Fixing a typo on a message
This refers to the message shown when copying the list of unsynced items on the activity tab
Christian Kamm [Tue, 22 Nov 2016 09:53:15 +0000 (10:53 +0100)]
FolderMan: Never schedule paused folders #5290
Previously the last folder in the queue was scheduled, regardless
of whether it was paused or not.
Jenkins for ownCloud [Tue, 22 Nov 2016 01:18:29 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jonathan Kawohl [Mon, 21 Nov 2016 12:53:59 +0000 (13:53 +0100)]
adjusted minimum version.
Olivier Goffart [Tue, 15 Nov 2016 17:47:04 +0000 (18:47 +0100)]
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
Jenkins for ownCloud [Mon, 21 Nov 2016 01:18:27 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 20 Nov 2016 01:18:28 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 19 Nov 2016 01:18:35 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Christian Kamm [Fri, 18 Nov 2016 15:19:36 +0000 (16:19 +0100)]
Enable clicking on 'not synced' items #5306
ckamm [Fri, 18 Nov 2016 14:14:47 +0000 (15:14 +0100)]
Merge pull request #5272 from owncloud/licensefix-pending
License: Adjust license of GPLv2 source files to GPLv2+
Christian Kamm [Fri, 18 Nov 2016 11:30:41 +0000 (12:30 +0100)]
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.
Christian Kamm [Fri, 18 Nov 2016 11:17:05 +0000 (12:17 +0100)]
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.
Jenkins for ownCloud [Fri, 18 Nov 2016 01:18:35 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 17 Nov 2016 01:18:43 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Wed, 16 Nov 2016 16:42:25 +0000 (17:42 +0100)]
Revert "Discovery: consider also the "shared by me" as shared"
This reverts pull request 5313 (commit
2d6e473a4044ea4cadd3cf1d043a447790b87222 and
2f3db04e87a4e3edff389389d46d1c7a5a3e0d03)
The problem is that this loads the server too much.
Markus Goetz [Wed, 16 Nov 2016 13:08:05 +0000 (14:08 +0100)]
Folder: Add comments after discussion about pre-selected selective sync
Markus Goetz [Tue, 15 Nov 2016 14:56:52 +0000 (15:56 +0100)]
Merge pull request #5102 from owncloud/chunking-ng
Chunking ng
Olivier Goffart [Tue, 15 Nov 2016 12:58:18 +0000 (13:58 +0100)]
Rename SyncFileStatus::sharedWithMe to shared
Last commit for issue #4788 made the meaning to be simply shared
(with the user or from the user)
Olivier Goffart [Mon, 14 Nov 2016 17:47:58 +0000 (18:47 +0100)]
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
Olivier Goffart [Tue, 15 Nov 2016 10:39:40 +0000 (11:39 +0100)]
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.
Olivier Goffart [Tue, 15 Nov 2016 09:14:50 +0000 (10:14 +0100)]
FolderStatusDelegate: Fix compiler warning.
QStyleOptionProgressBarV2 is deprecated in Qt5.
Jenkins for ownCloud [Tue, 15 Nov 2016 01:18:36 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Mon, 14 Nov 2016 11:43:10 +0000 (12:43 +0100)]
Merge pull request #5304 from owncloud/Kawohl-linktocentral
documnetation.
Olivier Goffart [Mon, 14 Nov 2016 11:35:18 +0000 (12:35 +0100)]
Merge pull request #5267 from payload/fix_4608
nautilus integration: "share" extension for syncing folders
Olivier Goffart [Mon, 14 Nov 2016 11:20:24 +0000 (12:20 +0100)]
Merge pull request #5266 from rmekarni/patch-1
Fix find_library FindCMocka.cmake
Tobias Haeussler [Sat, 29 Oct 2016 20:06:03 +0000 (22:06 +0200)]
Add manifest file on Windows to make the application UAC aware.
Olivier Goffart [Mon, 14 Nov 2016 09:42:07 +0000 (10:42 +0100)]
Chunking-NG: code cleanup after review
Jenkins for ownCloud [Mon, 14 Nov 2016 01:18:26 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 13 Nov 2016 01:18:26 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 12 Nov 2016 01:18:26 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 11 Nov 2016 01:18:27 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 10 Nov 2016 01:18:27 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 10 Nov 2016 00:15:14 +0000 (01:15 +0100)]
[tx-robot] updated from transifex
Jonathan Kawohl [Wed, 9 Nov 2016 09:25:32 +0000 (10:25 +0100)]
removed openssl_version variable,
Jonathan Kawohl [Wed, 9 Nov 2016 07:51:50 +0000 (08:51 +0100)]
added missing quotes
Jonathan Kawohl [Mon, 24 Oct 2016 13:45:40 +0000 (15:45 +0200)]
added link to central
Jonathan Kawohl [Mon, 24 Oct 2016 13:16:06 +0000 (15:16 +0200)]
fixing wrong files Revert "fix for https://github.com/owncloud/client/issues/1251"
This reverts commit
4f1feab845462a6448626806a39eef44a2c6900e.
Jonathan Kawohl [Mon, 24 Oct 2016 13:09:25 +0000 (15:09 +0200)]
fix for https://github.com/owncloud/client/issues/1251
Jonathan Kawohl [Mon, 24 Oct 2016 07:00:07 +0000 (09:00 +0200)]
added info on qtkeychain
added installation info on qtkeychain
Jonathan Kawohl [Thu, 20 Oct 2016 11:05:56 +0000 (13:05 +0200)]
Correcting for PR comments
Jonathan Kawohl [Wed, 19 Oct 2016 09:12:11 +0000 (11:12 +0200)]
updated link for documentation and added more info to osx build
Jenkins for ownCloud [Wed, 9 Nov 2016 01:18:28 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
ckamm [Tue, 8 Nov 2016 15:10:55 +0000 (16:10 +0100)]
Doc: Add sync algorithm overview and comments (#5277)
* Doc: Add sync algorithm overview and comments
Christian Kamm [Tue, 8 Nov 2016 10:22:53 +0000 (11:22 +0100)]
Conflicts: Use the local mtime for the conflict file name #5273
Otherwise local conflict files may be overridden in a restore
situation. See ticket for details.
Christian Kamm [Tue, 8 Nov 2016 12:57:03 +0000 (13:57 +0100)]
FolderStatusModel: Minor cleanups.
Christian Kamm [Tue, 8 Nov 2016 12:30:18 +0000 (13:30 +0100)]
Sort folder list alphabetically #5299
Christian Kamm [Tue, 8 Nov 2016 10:13:19 +0000 (11:13 +0100)]
Test: Don't fail when DST change is near #5284
Christian Kamm [Tue, 8 Nov 2016 10:01:49 +0000 (11:01 +0100)]
Network: Add "Accept" header for some firewalls #5298
Jenkins for ownCloud [Tue, 8 Nov 2016 01:18:26 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Christian Kamm [Mon, 7 Nov 2016 11:49:29 +0000 (12:49 +0100)]
Terminate sync when pausing from context menu #5290
Jenkins for ownCloud [Mon, 7 Nov 2016 01:18:26 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 6 Nov 2016 01:18:34 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 5 Nov 2016 01:18:29 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Fri, 4 Nov 2016 15:51:58 +0000 (16:51 +0100)]
Merge remote-tracking branch '2.2' into master
For the reanslation. Now transifex should be updated to update master.
This should normally be the last merge from 2.2
Conflicts:
mirall.desktop.in
translations/client_sl.ts
translations/client_th.ts
Olivier Goffart [Mon, 31 Oct 2016 16:44:00 +0000 (17:44 +0100)]
ChunkingNG: remove stale files when resuming
Jenkins for ownCloud [Fri, 4 Nov 2016 15:41:40 +0000 (16:41 +0100)]
[tx-robot] updated from transifex
Olivier Goffart [Fri, 21 Oct 2016 08:32:19 +0000 (10:32 +0200)]
SyncEngine: disable heuristics for backup restoration for server >= 9.1
The ownCloud 9.1 server has a data-fingerprint property that the admin must
change in case of backup restoration. When this change, the client understands
that a backup was restored, and will generate conflict files and re-upload
new files.
The heuristics based system checks that there is at least two files wose mtime
is put back in the past and no files that goes forward. In that case we ask the
user before creating the conflicts.
This commit disable the heuristics for newer server that have the data-fingerpint.
And change the heuristics to two hours because we want to avoid false positive due
to some clock error, and that 2 hours of lost due to backup restoration is probably
not so bad.
We only ask the user in the heuristics based aproach so in practice this mean that
the "backup-detected" dialog will no longer appear with newer server.
Relates issues #5260, #5109