Olivier Goffart
fb76487e76
Merge pull request #5266 from rmekarni/patch-1
...
Fix find_library FindCMocka.cmake
2016-11-14 12:20:24 +01:00
Tobias Haeussler
0c0a3ca0a5
Add manifest file on Windows to make the application UAC aware.
2016-11-14 12:16:58 +01:00
Olivier Goffart
5377d1e283
Chunking-NG: code cleanup after review
2016-11-14 10:42:07 +01:00
Jenkins for ownCloud
676ad530e7
[tx-robot] updated from transifex
2016-11-14 02:18:26 +01:00
Jenkins for ownCloud
fbcb01ed27
[tx-robot] updated from transifex
2016-11-13 02:18:26 +01:00
Jenkins for ownCloud
c2b006e857
[tx-robot] updated from transifex
2016-11-12 02:18:26 +01:00
Jenkins for ownCloud
0e7ccea588
[tx-robot] updated from transifex
2016-11-11 02:18:27 +01:00
Jenkins for ownCloud
c16deb3e44
[tx-robot] updated from transifex
2016-11-10 02:18:27 +01:00
Jenkins for ownCloud
019544fcfd
[tx-robot] updated from transifex
2016-11-10 01:15:14 +01:00
Jonathan Kawohl
5f0167b19e
removed openssl_version variable,
2016-11-09 10:25:32 +01:00
Jonathan Kawohl
29d3c33eb2
added missing quotes
2016-11-09 08:59:14 +01:00
Jonathan Kawohl
469eca1f5f
added link to central
2016-11-09 08:59:14 +01:00
Jonathan Kawohl
0864d67a9a
fixing wrong files Revert "fix for https://github.com/owncloud/client/issues/1251 "
...
This reverts commit 4f1feab845
2016-11-09 08:59:14 +01:00
Jonathan Kawohl
e9503664f5
fix for https://github.com/owncloud/client/issues/1251
2016-11-09 08:59:14 +01:00
Jonathan Kawohl
58cee61624
added info on qtkeychain
...
added installation info on qtkeychain
2016-11-09 08:59:14 +01:00
Jonathan Kawohl
d23d07f99b
Correcting for PR comments
2016-11-09 08:59:14 +01:00
Jonathan Kawohl
d70db810dd
updated link for documentation and added more info to osx build
2016-11-09 08:59:14 +01:00
Jenkins for ownCloud
842129f99d
[tx-robot] updated from transifex
2016-11-09 02:18:28 +01:00
ckamm
36d61ef3a9
Doc: Add sync algorithm overview and comments ( #5277 )
...
* Doc: Add sync algorithm overview and comments
2016-11-08 16:10:55 +01:00
Christian Kamm
f1f27221a7
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.
2016-11-08 14:47:51 +01:00
Christian Kamm
eb012d26ee
FolderStatusModel: Minor cleanups.
2016-11-08 14:01:07 +01:00
Christian Kamm
9ee8187083
Sort folder list alphabetically #5299
2016-11-08 14:01:07 +01:00
Christian Kamm
b0c45cfc89
Test: Don't fail when DST change is near #5284
2016-11-08 11:13:19 +01:00
Christian Kamm
90cea69692
Network: Add "Accept" header for some firewalls #5298
2016-11-08 11:01:49 +01:00
Jenkins for ownCloud
155bdfbffe
[tx-robot] updated from transifex
2016-11-08 02:18:26 +01:00
Christian Kamm
0e2782d369
Terminate sync when pausing from context menu #5290
2016-11-07 12:50:06 +01:00
Jenkins for ownCloud
6b3d0e69aa
[tx-robot] updated from transifex
2016-11-07 02:18:26 +01:00
Jenkins for ownCloud
f30aee6d4e
[tx-robot] updated from transifex
2016-11-06 02:18:34 +01:00
Jenkins for ownCloud
82f86eb019
[tx-robot] updated from transifex
2016-11-05 02:18:29 +01:00
Olivier Goffart
9573c5e64d
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
2016-11-04 16:51:58 +01:00
Olivier Goffart
15f2b911d9
ChunkingNG: remove stale files when resuming
2016-11-04 16:43:01 +01:00
Jenkins for ownCloud
f5aff70398
[tx-robot] updated from transifex
2016-11-04 16:41:40 +01:00
Olivier Goffart
e3a4c3989a
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
2016-11-04 16:30:58 +01:00
Jenkins for ownCloud
3e954bc17f
[tx-robot] updated from transifex
2016-11-04 02:18:27 +01:00
Jenkins for ownCloud
2527569bb8
[tx-robot] updated from transifex
2016-11-03 02:18:27 +01:00
Jenkins for ownCloud
1e197531cb
[tx-robot] updated from transifex
2016-11-02 02:18:28 +01:00
Jenkins for ownCloud
8b876576eb
[tx-robot] updated from transifex
2016-11-01 02:18:29 +01:00
Piotr Mrówczyński
a2287c9657
Merge pull request #5274 from owncloud/reduce_loops_dirjob
...
Cache the value of last unfinished job in the PropagateDerectory scheduleNextJob
2016-10-31 22:07:50 +01:00
Piotr M
34c59ba9ed
reduce number of loops
2016-10-31 19:45:24 +01:00
Olivier Goffart
c8014a0afd
ChunkingNG: Add Test
2016-10-31 15:16:53 +01:00
Olivier Goffart
456d82715e
Fix compile after merge
2016-10-31 11:29:33 +01:00
Olivier Goffart
8ca3eb7883
Merge remote-tracking branch 'origin/master' into chunking-ng
2016-10-31 11:09:12 +01:00
Jenkins for ownCloud
c110745330
[tx-robot] updated from transifex
2016-10-31 02:18:27 +01:00
Jenkins for ownCloud
19521863a0
[tx-robot] updated from transifex
2016-10-30 02:18:24 +01:00
Jenkins for ownCloud
c256896165
[tx-robot] updated from transifex
2016-10-30 02:18:26 +02:00
Jenkins for ownCloud
ef922f60fa
[tx-robot] updated from transifex
2016-10-29 02:18:28 +02:00
Jenkins for ownCloud
733ea90e6b
[tx-robot] updated from transifex
2016-10-28 02:18:28 +02:00
Jenkins for ownCloud
a4e1fa9dcf
[tx-robot] updated from transifex
2016-10-27 02:18:30 +02:00
Jenkins for ownCloud
1a1684ca2a
[tx-robot] updated from transifex
2016-10-26 02:18:34 +02:00
Gilbert Röhrbein
9c8572e335
nautilus integration: refactored _connectToSocketServer, removed superfluous check
2016-10-25 21:45:47 +02:00
