Christian Kamm
4abaee7736
Recall: Copy instead of move recalled file #5150
...
That was an unintentional change in
2662203fb7af9c4d0e2f
2016-09-12 14:09:12 +02:00
Markus Goetz
3cdcd8dea0
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 524220d090
2016-09-12 14:09:12 +02:00
Christian Kamm
cb19ebc9e3
ShareLink: Ensure the password line edit is enabled #5117
...
(cherry picked from commit b541fea793
2016-09-12 14:09:12 +02:00
Daniel Molkentin
37adaa7872
Update owner to be ownCloud GmbH
...
Fixes #5079
(cherry picked from commit a83c5598e8
2016-09-12 14:09:12 +02:00
Christian Kamm
9d93afb2a1
Switch target version of this branch to 2.2.4
2016-09-12 14:07:33 +02:00
Jenkins for ownCloud
7c24ed769e
[tx-robot] updated from transifex
2016-09-06 02:18:30 +02:00
Jenkins for ownCloud
65110f7a91
[tx-robot] updated from transifex
2016-09-05 02:18:30 +02:00
Jenkins for ownCloud
c33abd468d
[tx-robot] updated from transifex
2016-09-04 02:18:30 +02:00
Jenkins for ownCloud
584b205bd5
[tx-robot] updated from transifex
2016-09-03 02:18:31 +02:00
Jenkins for ownCloud
b75f50d62c
[tx-robot] updated from transifex
2016-09-02 02:18:31 +02:00
Jenkins for ownCloud
14457e93e6
[tx-robot] updated from transifex
2016-09-01 02:18:31 +02:00
Jenkins for ownCloud
9c0ecad420
[tx-robot] updated from transifex
2016-08-31 02:18:30 +02:00
Jenkins for ownCloud
85b5fdb3d3
[tx-robot] updated from transifex
2016-08-30 02:18:35 +02:00
Jenkins for ownCloud
f2c6669224
[tx-robot] updated from transifex
2016-08-29 02:18:30 +02:00
Jenkins for ownCloud
d8f9bf3a0b
[tx-robot] updated from transifex
2016-08-28 02:18:32 +02:00
Jenkins for ownCloud
d5fa8faa91
[tx-robot] updated from transifex
2016-08-27 02:18:32 +02:00
Jenkins for ownCloud
d1a1b95926
[tx-robot] updated from transifex
2016-08-26 02:18:32 +02:00
Jenkins for ownCloud
ee2a67e332
[tx-robot] updated from transifex
2016-08-25 02:18:31 +02:00
Jenkins for ownCloud
7362575d64
[tx-robot] updated from transifex
2016-08-24 02:18:30 +02:00
Jenkins for ownCloud
6a9b6c1167
[tx-robot] updated from transifex
2016-08-23 02:18:33 +02:00
Jenkins for ownCloud
8e00fd66de
[tx-robot] updated from transifex
2016-08-22 02:18:31 +02:00
Jenkins for ownCloud
ef035ea7f9
[tx-robot] updated from transifex
2016-08-21 02:18:31 +02:00
Jenkins for ownCloud
77b5c5e963
[tx-robot] updated from transifex
2016-08-20 02:18:31 +02:00
Jenkins for ownCloud
687549c455
[tx-robot] updated from transifex
2016-08-19 09:58:44 +02:00
Jenkins for ownCloud
677c34fbf8
[tx-robot] updated from transifex
2016-08-18 02:18:30 +02:00
Jenkins for ownCloud
465639af82
[tx-robot] updated from transifex
2016-08-17 02:18:31 +02:00
Jenkins for ownCloud
583f9586aa
[tx-robot] updated from transifex
2016-08-16 02:18:31 +02:00
Jenkins for ownCloud
573d942969
[tx-robot] updated from transifex
2016-08-15 02:18:30 +02:00
Jenkins for ownCloud
02df088843
[tx-robot] updated from transifex
2016-08-14 02:18:30 +02:00
Jenkins for ownCloud
cd9335e043
[tx-robot] updated from transifex
2016-08-12 02:18:30 +02:00
Jenkins for ownCloud
20531e57a8
[tx-robot] updated from transifex
2016-08-11 02:18:39 +02:00
Jenkins for ownCloud
e2e16aeaaa
[tx-robot] updated from transifex
2016-08-10 02:18:38 +02:00
Thomas Müller
a46a69f250
[2.2] Jenkinsfile: Add win32 build ( #5091 ) ( #5115 )
2016-08-09 16:20:32 +02:00
Jenkins for ownCloud
3187a22300
[tx-robot] updated from transifex
2016-08-09 02:18:41 +02:00
Markus Goetz
9626021a63
Update ChangeLog for 2.2.3 final
2016-08-08 15:39:49 +02:00
Jenkins for ownCloud
b72a19ad64
[tx-robot] updated from transifex
2016-08-08 02:18:35 +02:00
Markus Goetz
2ae37c6beb
Update ChangeLog
2016-08-07 22:51:16 +02:00
Jenkins for ownCloud
f8f376ac03
[tx-robot] updated from transifex
2016-08-07 02:18:30 +02:00
Jenkins for ownCloud
632d231435
[tx-robot] updated from transifex
2016-08-06 02:18:34 +02:00
Markus Goetz
fc868d89f3
Merge pull request #5108 from owncloud/limit_library_path
...
Limit Qt and OpenSSL Library pathes to the install directory
2016-08-05 16:39:04 +02:00
Daniel Molkentin
5a57e4a7a6
Ensure OpenSSL config file is only read from app dir
2016-08-05 16:38:08 +02:00
Jenkins for ownCloud
70a1671dc1
[tx-robot] updated from transifex
2016-08-05 14:23:25 +02:00
Daniel Molkentin
7de70516f1
Fix module loading
2016-08-05 12:35:52 +02:00
Jenkins for ownCloud
50bd4b8f4f
[tx-robot] updated from transifex
2016-08-05 02:18:30 +02:00
Olivier Goffart
4a7f3cb486
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.
2016-08-04 16:06:10 +02:00
Jenkins for ownCloud
b7663d00b9
[tx-robot] updated from transifex
2016-08-04 02:18:35 +02:00
Jocelyn Turcotte
b307f2b65c
Revert "Fix a deadlock when shutting down during discovery" ( #5100 )
...
Reverts commit 622017adcf#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.
2016-08-03 16:35:24 +02:00
Jenkins for ownCloud
6c94d56b53
[tx-robot] updated from transifex
2016-08-03 02:18:37 +02:00
Jenkins for ownCloud
c51a80bffa
[tx-robot] updated from transifex
2016-08-02 02:18:35 +02:00
Thomas Müller
87f4f70abb
Merge pull request #5069 from owncloud/Jenkinsfile-2.2
...
[2.2] Add Jenkinsfile (#5041 )
2016-08-01 12:41:04 +02:00
