Jenkins for ownCloud [Thu, 10 Nov 2016 00:15:14 +0000 (01:15 +0100)]
[tx-robot] updated from transifex
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
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
Jenkins for ownCloud [Fri, 4 Nov 2016 01:18:27 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 3 Nov 2016 01:18:27 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 2 Nov 2016 01:18:28 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 1 Nov 2016 01:18:29 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Piotr Mrówczyński [Mon, 31 Oct 2016 21:07:50 +0000 (22:07 +0100)]
Merge pull request #5274 from owncloud/reduce_loops_dirjob
Cache the value of last unfinished job in the PropagateDerectory scheduleNextJob
Piotr M [Tue, 25 Oct 2016 11:21:03 +0000 (13:21 +0200)]
reduce number of loops
Jenkins for ownCloud [Mon, 31 Oct 2016 01:18:27 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 30 Oct 2016 01:18:24 +0000 (02:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 30 Oct 2016 00:18:26 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 29 Oct 2016 00:18:28 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 28 Oct 2016 00:18:28 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 27 Oct 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 26 Oct 2016 00:18:34 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Christian Kamm [Tue, 25 Oct 2016 10:04:08 +0000 (12:04 +0200)]
Account: Rearrange for readability
Christian Kamm [Tue, 25 Oct 2016 10:04:22 +0000 (12:04 +0200)]
Move concatUrl and settingsWithGroup to Utility
There was little reason to keep them cluttering Account.
Christian Kamm [Tue, 25 Oct 2016 09:42:03 +0000 (11:42 +0200)]
Account: Remove wasMigrated/setMigrated
It was unused since early in the multi-account work:
a932eac832b442cca763197240f036905dd284da
Christian Kamm [Tue, 25 Oct 2016 09:33:38 +0000 (11:33 +0200)]
Remove unused functions
Account::changed and AbstractCredentials::changed have not been needed
in a long while.
Christian Kamm [Wed, 19 Oct 2016 09:03:13 +0000 (11:03 +0200)]
FolderMan: Clean up API
Many public slots didn't need to be public or slots.
Christian Kamm [Tue, 18 Oct 2016 14:04:25 +0000 (16:04 +0200)]
FolderMan: Document and clean up folder scheduling
Jenkins for ownCloud [Tue, 25 Oct 2016 00:18:32 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Marcus Hoffmann [Mon, 24 Oct 2016 13:36:23 +0000 (15:36 +0200)]
Add script to create a caja plugin. (#5262)
Caja is a fork of nautilus maintained by the Mate project.
This adds a script to create a caja plugin from the nautilus plugin.
It replaces all occurences of nautilus with caja (case sensitive).
This is done in the same way the nemo plugin is generated from the nautilus one.
Jenkins for ownCloud [Mon, 24 Oct 2016 00:18:28 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 23 Oct 2016 00:18:28 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 22 Oct 2016 00:18:28 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Olivier Goffart [Fri, 21 Oct 2016 08:27:33 +0000 (10:27 +0200)]
Merge remote-tracking branch 'origin/2.2' into master
Jenkins for ownCloud [Fri, 21 Oct 2016 00:18:31 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 20 Oct 2016 00:18:28 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 19 Oct 2016 00:18:33 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Christian Kamm [Tue, 18 Oct 2016 10:29:52 +0000 (12:29 +0200)]
Progress: Reset lastCompletedItem #5256
Otherwise progress listeners think it's still the last-completed
item when the next sync starts. This lead to spurious entries in
the "Recent Changes" list.
Christian Kamm [Tue, 18 Oct 2016 09:15:13 +0000 (11:15 +0200)]
Force a remote discovery when upgrading to this version #5242
A remote discovery will fix up any lingering problems caused by #5190.
Christian Kamm [Wed, 12 Oct 2016 08:44:38 +0000 (10:44 +0200)]
Remove stale commented code
These functions don't even exist anymore.
Olivier Goffart [Wed, 12 Oct 2016 16:23:31 +0000 (18:23 +0200)]
SyncEngine: Permission error in subfolder of a folder that cannnot be added is a SoftError
Issue #5059
Jenkins for ownCloud [Mon, 17 Oct 2016 00:18:29 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 16 Oct 2016 23:15:13 +0000 (01:15 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 16 Oct 2016 00:18:28 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 15 Oct 2016 00:18:29 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Markus Goetz [Fri, 14 Oct 2016 12:26:31 +0000 (14:26 +0200)]
OS X: Use monochrome tray icon by default (#5229)
Markus Goetz [Fri, 14 Oct 2016 12:23:55 +0000 (14:23 +0200)]
Propagator: Also upload more in parallel (#5230)
Fix for https://github.com/owncloud/client/issues/4986#issuecomment-
227071801
This is before we have bundling at some point.
Jenkins for ownCloud [Fri, 14 Oct 2016 00:18:29 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Klaas Freitag [Thu, 13 Oct 2016 14:22:54 +0000 (16:22 +0200)]
Add a note that the source repositories need to be enabled. (#5239)
* Add a note that the source repositories need to be enabled.
* Fix typo, is => are.
Olivier Goffart [Thu, 13 Oct 2016 10:02:15 +0000 (12:02 +0200)]
QProgressIndicator: update copy from upstream
Update from commit
05ce8a23cdc12e825532dc6de06c267fb8d48b4f from
https://github.com/dragotin/QProgressIndicator
Which itself is forked from commit
e5ba0fd09bfd43b067ee3646d70b294c7efcb558 from
upstream, with additional license header.
It was relicensed to MIT according to
https://github.com/mojocorp/QProgressIndicator/commit/
14bb9d10e29407175fdf4b9f03ed9cc7bb124f93
Relates to issues #5180 and #5184
Jenkins for ownCloud [Thu, 13 Oct 2016 00:18:28 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Markus Goetz [Wed, 12 Oct 2016 17:10:56 +0000 (19:10 +0200)]
Fixup previous commit
Thanks @ogoffart for spotting.
Jenkins for ownCloud [Wed, 12 Oct 2016 00:18:34 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Markus Goetz [Tue, 11 Oct 2016 18:28:14 +0000 (20:28 +0200)]
Auto Start: Only set on first account setup, not all later ones
Markus Goetz [Tue, 11 Oct 2016 18:06:43 +0000 (20:06 +0200)]
sqlite: Update bundled version to 3.14.2
For OS X and Windows.
Olivier Goffart [Mon, 10 Oct 2016 14:55:31 +0000 (16:55 +0200)]
SyncEngine: Fix renaming a folder should keep the selective sync state
Issue #5224
Two problems:
- In the discovery phase, we need to check the selective sync entries of
the source path in case of renames.
- When the rename is done, we need to actually update the black list in the
database.
Olivier Goffart [Tue, 11 Oct 2016 09:55:20 +0000 (11:55 +0200)]
TestFolderMan: don't pollute user's settings
Olivier Goffart [Tue, 11 Oct 2016 09:46:51 +0000 (11:46 +0200)]
AccountManager: do not load invalid account
Some tests (such as FolderManTest) can polute the config file with invalid
accounts.
(That's because most of the code, (even in libsync) always instentiate a ConfigFile)
Olivier Goffart [Tue, 11 Oct 2016 08:55:02 +0000 (10:55 +0200)]
Remove usused variable
Olivier Goffart [Tue, 11 Oct 2016 07:51:14 +0000 (09:51 +0200)]
SyncJournalDB: check the return value of the prepare statements in checkConnect
Relates to #5199
Olivier Goffart [Tue, 11 Oct 2016 08:29:24 +0000 (10:29 +0200)]
Theme: Fix compiler warning
Relates #5227
Jenkins for ownCloud [Tue, 11 Oct 2016 00:18:32 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Olivier Goffart [Mon, 10 Oct 2016 10:47:59 +0000 (12:47 +0200)]
AccoutWizard: Change the set policy of a radio button
In an attempt to make sure the button next to it don't get too small.
Issue #5209
Olivier Goffart [Thu, 22 Sep 2016 09:25:27 +0000 (11:25 +0200)]
OwnSQL: avoid crashing in SqlQuery::reset_and_clear_bindings
The crash reporter shows a lot of crashes in sqlite3_clear_bindings
which seems to indicate that _stmt is null. We should guard against
a null value in order to avoid crashing.
This should only happen if the prepare call fails. We don't usually
check the return value of the prepare call, but if _stmt is null, the
exec call should return false, not true. We check the result of the
exec call, so this should then abort the sync with an error, rather
than crashing.
Jenkins for ownCloud [Mon, 10 Oct 2016 00:18:29 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 9 Oct 2016 00:18:27 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 8 Oct 2016 00:18:33 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Christian Kamm [Fri, 7 Oct 2016 11:32:42 +0000 (13:32 +0200)]
Tray: Fix crash on startup for non-OSX oses
Christian Kamm [Fri, 7 Oct 2016 11:22:43 +0000 (13:22 +0200)]
Doc: Remove mention of "F5 to reset database" #5130
Tommy Sparber [Thu, 6 Oct 2016 15:18:51 +0000 (17:18 +0200)]
Improve macOS SysTray/StatusBar monochrome icon (#5227)
- Use a white icon if the context menu is visible.
- Enable `QIcon::setIsMask` if compiled on Qt >= 5.6 to allow automatic
macOS color handling.
- No changes if the colored icons are used.
Markus Goetz [Thu, 6 Oct 2016 12:45:04 +0000 (14:45 +0200)]
503: Also parse other server error message (#5228)
From https://github.com/owncloud/core/pull/26145
Jenkins for ownCloud [Thu, 6 Oct 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 5 Oct 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 4 Oct 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 3 Oct 2016 00:18:39 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 2 Oct 2016 00:18:29 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 1 Oct 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 30 Sep 2016 23:15:17 +0000 (01:15 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 30 Sep 2016 00:18:34 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Christian Kamm [Wed, 28 Sep 2016 11:09:15 +0000 (13:09 +0200)]
Package: Fix nautilus plugin name collision when branded
As suggested by @olifre in #5183
Christian Kamm [Wed, 28 Sep 2016 11:00:52 +0000 (13:00 +0200)]
ShareDialog: Remove context help button
Ticket #5203
Christian Kamm [Wed, 28 Sep 2016 10:07:45 +0000 (12:07 +0200)]
Merge remote-tracking branch 'origin/2.2'
Jenkins for ownCloud [Wed, 28 Sep 2016 00:18:31 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Markus Goetz [Tue, 27 Sep 2016 16:21:55 +0000 (18:21 +0200)]
VERSION.cmake: We're at 2.2.5
Markus Goetz [Tue, 27 Sep 2016 08:52:18 +0000 (10:52 +0200)]
2.2.4: Set release date
Markus Goetz [Mon, 26 Sep 2016 13:45:30 +0000 (15:45 +0200)]
Wizard: Do the system proxy lookup in a thread (#5160)
This is analogous to the code in ConnectionValidator.
ckamm [Fri, 23 Sep 2016 11:47:57 +0000 (13:47 +0200)]
Improve the "new big folder" UI #5202 (#5204)
Instead of using the regular selective-sync UI (where it's unclear what
the "Cancel" button would even mean in this context), provide a
different set of buttons that allow the user to quickly synchronize
all pending big folders, none of them, or perform manual changes
as usual.
ckamm [Fri, 23 Sep 2016 08:44:54 +0000 (10:44 +0200)]
Tray: Workaround collection (#5179)
Tray: Workaround collection
* QDBus workaround for Qt 5.5.0 only, there were reports of the tray
working fine with 5.5.1. #5164
* OWNCLOUD_FORCE_QDBUS_TRAY_WORKAROUND to force the workaround on an off
* OWNCLOUD_TRAY_UPDATE_WHILE_VISIBLE to enable or disable updating of
the menu while it's visible - disable by default due to problems on OSX and Xubuntu.
* Track the visibility of the tray menu with aboutToShow/aboutToHide
only on OSX - the aboutToHide signal doesn't trigger reliably on linux
* Refactor such that setupContextMenu is different from updateContextMenu
* Don't use on-demand updating of the tray menu when the qdbus workaround
is active, instead to occasional (30s) updates of the tray menu.
Olivier Goffart [Thu, 22 Sep 2016 13:03:15 +0000 (15:03 +0200)]
Missing Inc -> GmbH (#5181)
Christian Kamm [Thu, 22 Sep 2016 12:16:58 +0000 (14:16 +0200)]
Warning if mailto url fails #5142
Christian Kamm [Thu, 22 Sep 2016 11:50:42 +0000 (13:50 +0200)]
Fix Windows build with WITH_UNIT_TESTING
Olivier Goffart [Thu, 22 Sep 2016 08:29:21 +0000 (10:29 +0200)]
owncloudcmd: fix --silent
We ignored csync log, but we also need to silent Qt debug output.
We need to ignore it at the very begining because there might be
qDebug also in account creation.
Issue #5196
Christian Kamm [Thu, 22 Sep 2016 07:57:42 +0000 (09:57 +0200)]
Add log messages for LockWatcher use #5190