Jenkins for ownCloud [Sun, 25 Sep 2016 00:18:36 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 24 Sep 2016 00:18:33 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Markus Goetz [Thu, 22 Sep 2016 13:41:30 +0000 (15:41 +0200)]
ChangeLog: 2.2.4
Klaas Freitag [Mon, 12 Sep 2016 12:12:33 +0000 (14:12 +0200)]
Dolphin Plugin: Use the Application name for the socket path (#5172)
do not hardcode.
This should fix #5165
(cherry picked from commit
2d110540ee5a67d2c014fcf4258840d3aaf538ac)
Olivier Goffart [Thu, 22 Sep 2016 07:02:47 +0000 (09:02 +0200)]
SyncEngine: Fix renaming of folder when file are changed (#5195)
Two bugs:
- The change filed are not considered as move, they are re-downloaded
but the old file was not removed from the database. The change in
owncloudpropagator.cpp takes care of removing the old entries.
- Next sync would then remove the file in the server in the old folder
This was not a problem until we start reusing the sync engine, and
that the _renamedFolders map is not cleared. We were before deleting
a non-existing file. But now we delete the actual file.
Also improve the tests to be able to do move on the server.
This include support for file id.
Issue #5192
(cherry picked from commit
85b8ab178e21cf4dcaf792f68c15e55f6e0ee3c2)
Jenkins for ownCloud [Thu, 22 Sep 2016 00:18:32 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Olivier Goffart [Tue, 20 Sep 2016 09:55:43 +0000 (11:55 +0200)]
ConnectionValidator: properly handle error in status.php (#5188)
We wwer enot connecting to the right signal from the check server
job, and therefore we were not catching the condition in which the
json was invalid. We would then never terminate the ConnectionValidator job.
Note that instanceNotFound is also emited if there is a network error.
The log looked like this:
10:25:51.247 OCC::CheckServerJob::finished: status.php from server is not valid JSON!
10:25:51.248 OCC::CheckServerJob::finished: status.php returns: QMap() QNetworkReply::NetworkError(NoError) Reply: QNetworkReplyHttpImpl(0x2b6a790)
10:25:51.248 OCC::CheckServerJob::finished: No proper answer on QUrl("http://localhost/~owncloud/status.php")
10:26:23.235 OCC::AccountState::checkConnectivity: ConnectionValidator already running, ignoring "owncloud@localhost"
10:26:55.235 OCC::AccountState::checkConnectivity: ConnectionValidator already running, ignoring "owncloud@localhost"
[...]
(cherry picked from commit
ff701bd473242b417e8ef9b987d4593e1495020c)
Jenkins for ownCloud [Wed, 21 Sep 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 20 Sep 2016 07:12:39 +0000 (09:12 +0200)]
[tx-robot] updated from transifex
Olivier Goffart [Mon, 12 Sep 2016 13:02:54 +0000 (15:02 +0200)]
Revert "FolderWatcher: Act on relative paths #5116 (#5153)"
This is not sufficient as it is not working for the Socket API.
Next commit will fix it in another layer.
Also, not ignoring paths that are not inside the folder is wrong
as it might still happen if the name has a different casing
This reverts commit
d5a481f13240b50ff3993184152d3d4145ebfde0.
(cherry picked from commit
904cd46f757bf329b719bd815394ff986be99aaf)
Markus Goetz [Mon, 12 Sep 2016 12:03:11 +0000 (14:03 +0200)]
FolderWatcher: Act on relative paths #5116 (#5153)
(cherry picked from commit
d5a481f13240b50ff3993184152d3d4145ebfde0)
Christian Kamm [Tue, 5 Jul 2016 11:53:57 +0000 (13:53 +0200)]
Set discovery thread priority to low #5017
(cherry picked from commit
bd7ec196443202501d76f12db5f243e1efb7cf57)
Olivier Goffart [Sat, 10 Sep 2016 15:08:52 +0000 (17:08 +0200)]
ExcludeFiles: Fix when the folder casing is not the same in the settings and in the FS
If the folder has different case in the settings and in the FS, we should
not ignore all the files. This is important for the files system watcher.
(cherry picked from commit
98268d102fb343c103cbb4fb28dedd390f3c9ecf)
Olivier Goffart [Thu, 14 Jul 2016 07:21:28 +0000 (09:21 +0200)]
CleanupPollsJob: Fix possible leak
Missing deleteLater when the CleanupPollsJob aborts.
This is only a problem if the SyncEngine is kept alive a long time. Which is
usually not the case in the configuration where poll jobs are used.
(cherry picked from commit
34650248985914523f0684c597f0c366b703f8d7)
Christian Kamm [Tue, 6 Sep 2016 08:42:59 +0000 (10:42 +0200)]
Recall: Copy instead of move recalled file #5150
That was an unintentional change in
2662203fb7277d5d1a57cef556279f8cd3b974f5
Also expand the test case to cover this.
(cherry picked from commit
af9c4d0e2fe1a42e1faf14779ca5ef1088bd1314)
Markus Goetz [Tue, 6 Sep 2016 09:11:03 +0000 (11:11 +0200)]
Selective Sync: Fix request loop and show error in view (#5154)
I got into a situation where the model would endlessly request the directory
contents from the server because we did not notice yet that the server
is actually in maintenance mode while we were expanding the tree view when
changing the tab to the account or when just expanding it by clicking.
(cherry picked from commit
524220d0907713408298a36df18bd04635ce5563)
Christian Kamm [Wed, 17 Aug 2016 13:48:25 +0000 (15:48 +0200)]
ShareLink: Ensure the password line edit is enabled #5117
(cherry picked from commit
b541fea793a1249d6833474765e2b7a6574e492c)
Daniel Molkentin [Tue, 26 Jul 2016 14:47:44 +0000 (16:47 +0200)]
Update owner to be ownCloud GmbH
Fixes #5079
(cherry picked from commit
a83c5598e850730c277f365e38a2348b825351a9)
Christian Kamm [Mon, 12 Sep 2016 12:07:33 +0000 (14:07 +0200)]
Switch target version of this branch to 2.2.4
Jenkins for ownCloud [Tue, 6 Sep 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 5 Sep 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 4 Sep 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 3 Sep 2016 00:18:31 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 2 Sep 2016 00:18:31 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 1 Sep 2016 00:18:31 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 31 Aug 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 30 Aug 2016 00:18:35 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 29 Aug 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 28 Aug 2016 00:18:32 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 27 Aug 2016 00:18:32 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 26 Aug 2016 00:18:32 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 25 Aug 2016 00:18:31 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 24 Aug 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 23 Aug 2016 00:18:33 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 22 Aug 2016 00:18:31 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 21 Aug 2016 00:18:31 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 20 Aug 2016 00:18:31 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 19 Aug 2016 07:58:44 +0000 (09:58 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 18 Aug 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 17 Aug 2016 00:18:31 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 16 Aug 2016 00:18:31 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 15 Aug 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 14 Aug 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 12 Aug 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 11 Aug 2016 00:18:39 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 10 Aug 2016 00:18:38 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Thomas Müller [Tue, 9 Aug 2016 14:20:32 +0000 (16:20 +0200)]
[2.2] Jenkinsfile: Add win32 build (#5091) (#5115)
Jenkins for ownCloud [Tue, 9 Aug 2016 00:18:41 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Markus Goetz [Mon, 8 Aug 2016 13:39:12 +0000 (15:39 +0200)]
Update ChangeLog for 2.2.3 final
Jenkins for ownCloud [Mon, 8 Aug 2016 00:18:35 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Markus Goetz [Sun, 7 Aug 2016 20:50:49 +0000 (22:50 +0200)]
Update ChangeLog
Jenkins for ownCloud [Sun, 7 Aug 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 6 Aug 2016 00:18:34 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Markus Goetz [Fri, 5 Aug 2016 14:39:04 +0000 (16:39 +0200)]
Merge pull request #5108 from owncloud/limit_library_path
Limit Qt and OpenSSL Library pathes to the install directory
Daniel Molkentin [Fri, 5 Aug 2016 10:36:21 +0000 (12:36 +0200)]
Ensure OpenSSL config file is only read from app dir
Jenkins for ownCloud [Fri, 5 Aug 2016 12:23:25 +0000 (14:23 +0200)]
[tx-robot] updated from transifex
Daniel Molkentin [Fri, 5 Aug 2016 10:35:52 +0000 (12:35 +0200)]
Fix module loading
Jenkins for ownCloud [Fri, 5 Aug 2016 00:18:30 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Olivier Goffart [Thu, 4 Aug 2016 14:06:10 +0000 (16:06 +0200)]
SyncEngine: Fix detection of backup (#5104)
Once upon a time, the SyncEngine was instantiated once per sync. But now that
the SyncEngine is kept between sync, we need to reset all these variable between
syncs.
Jenkins for ownCloud [Thu, 4 Aug 2016 00:18:35 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jocelyn Turcotte [Wed, 3 Aug 2016 14:35:24 +0000 (16:35 +0200)]
Revert "Fix a deadlock when shutting down during discovery" (#5100)
Reverts commit
622017adcf3b1a914221acc0bb2c17e1429ea4c3
Could be the cause of #5092 and the cost is higher than the benefit if this is the case.
A network request taking more than 30 seconds isn't something unlikely in this world
and shouldn't be a good reason to abort. We should try to untangle the threads
dependencies to properly fix this if possible instead.
Jenkins for ownCloud [Wed, 3 Aug 2016 00:18:37 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 2 Aug 2016 00:18:35 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Thomas Müller [Mon, 1 Aug 2016 10:41:04 +0000 (12:41 +0200)]
Merge pull request #5069 from owncloud/Jenkinsfile-2.2
[2.2] Add Jenkinsfile (#5041)
Olivier Goffart [Tue, 12 Jul 2016 09:07:12 +0000 (11:07 +0200)]
Qt4: don't require a X server in the tests
Issue #5069
(cherry picked from commit
927a8b5071a8ee360ea4a1b24d093d8e9acacf18 and
a4310f0f5c4855c5249ffb1355c6fc039e141316)
Jenkins for ownCloud [Mon, 1 Aug 2016 00:48:18 +0000 (02:48 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 31 Jul 2016 00:50:05 +0000 (02:50 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 30 Jul 2016 00:39:29 +0000 (02:39 +0200)]
[tx-robot] updated from transifex
Thomas Müller [Tue, 12 Jul 2016 11:24:35 +0000 (13:24 +0200)]
Add Jenkinsfile (#5041)
Jenkins for ownCloud [Fri, 29 Jul 2016 00:18:35 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 28 Jul 2016 00:18:39 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 27 Jul 2016 00:18:42 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Daniel Molkentin [Tue, 26 Jul 2016 14:53:11 +0000 (16:53 +0200)]
More GmbH -> Inc Copyright header fixes
Jocelyn Turcotte [Tue, 26 Jul 2016 12:54:27 +0000 (14:54 +0200)]
shell/windows: Build 43, add missing 32 bit binaries
Also include a minor change from #5025
Jocelyn Turcotte [Tue, 26 Jul 2016 12:53:14 +0000 (14:53 +0200)]
shell/windows: Add missing Win32 configuration changes
The changes in build location were only done on the x64 configuration.
Markus Goetz [Tue, 26 Jul 2016 10:14:00 +0000 (12:14 +0200)]
ChangeLog for 2.2.3
Jenkins for ownCloud [Tue, 26 Jul 2016 00:43:40 +0000 (02:43 +0200)]
[tx-robot] updated from transifex
Klaas Freitag [Mon, 25 Jul 2016 15:47:23 +0000 (17:47 +0200)]
ShibbolethView: Open a debug windows that shows cipher info. (#5080)
It opens a window and connects to a cipher test
page, showing the output from there, that helps for debugging.
The window is enabled by setting the environment variable
OWNCLOUD_SHIBBOLETH_DEBUG
Jenkins for ownCloud [Mon, 25 Jul 2016 00:18:34 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 24 Jul 2016 00:18:36 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 23 Jul 2016 00:18:47 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 22 Jul 2016 00:18:44 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 21 Jul 2016 00:18:38 +0000 (02:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 20 Jul 2016 06:18:40 +0000 (08:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 19 Jul 2016 06:18:37 +0000 (08:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 18 Jul 2016 07:29:56 +0000 (09:29 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 18 Jul 2016 06:18:44 +0000 (08:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 17 Jul 2016 06:18:34 +0000 (08:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 16 Jul 2016 06:18:34 +0000 (08:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 15 Jul 2016 06:18:36 +0000 (08:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 14 Jul 2016 06:18:43 +0000 (08:18 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 13 Jul 2016 06:18:41 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Tue, 12 Jul 2016 12:33:28 +0000 (14:33 +0200)]
Merge pull request #5016 from owncloud/overrideurl
AccountManager: Don't force the server URL while loading the config.
Olivier Goffart [Tue, 12 Jul 2016 12:32:54 +0000 (14:32 +0200)]
Merge pull request #5025 from ArthurChiao/bugfix_#5015
fix #5015 overlay icon not show: compare folder paths with no case-se…
ckamm [Tue, 12 Jul 2016 12:25:33 +0000 (14:25 +0200)]
Sharing: Fix bug with file names containing percent encodes #5042 (#5043)
Jenkins for ownCloud [Tue, 12 Jul 2016 06:18:39 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 11 Jul 2016 06:18:33 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 10 Jul 2016 06:18:47 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 9 Jul 2016 06:18:51 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
arthurchiao [Fri, 8 Jul 2016 07:53:11 +0000 (15:53 +0800)]
be case insensitive for MacOSX, too