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
Gilbert Röhrbein
e675a34fbb
nautilus integration: use os.path.join, os.sep and tempfile.gettempdir instead of string concats
2016-10-25 20:15:17 +02:00
Christian Kamm
5f47c01346
Account: Rearrange for readability
2016-10-25 13:20:23 +02:00
Christian Kamm
10644d3568
Move concatUrl and settingsWithGroup to Utility
...
There was little reason to keep them cluttering Account.
2016-10-25 12:05:28 +02:00
Christian Kamm
9ee3144358
Account: Remove wasMigrated/setMigrated
...
It was unused since early in the multi-account work:
a932eac832
2016-10-25 11:43:06 +02:00
Christian Kamm
cf48ea2e00
Remove unused functions
...
Account::changed and AbstractCredentials::changed have not been needed
in a long while.
2016-10-25 11:33:38 +02:00
Christian Kamm
db24f60ae3
License: Adjust license of GPLv2 source files to GPLv2+
...
See #5180
2016-10-25 11:06:54 +02:00
Christian Kamm
6026148692
FolderMan: Clean up API
...
Many public slots didn't need to be public or slots.
2016-10-25 09:44:34 +02:00
Christian Kamm
a2222228c9
FolderMan: Document and clean up folder scheduling
2016-10-25 09:44:34 +02:00
Jenkins for ownCloud
9e2d3f5bc7
[tx-robot] updated from transifex
2016-10-25 02:18:32 +02:00
Marcus Hoffmann
fe984b61d7
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.
2016-10-24 15:36:23 +02:00
Jonathan Kawohl
ffac3f6213
fixing wrong files Revert "fix for https://github.com/owncloud/client/issues/1251 "
...
This reverts commit 4f1feab845
2016-10-24 15:16:06 +02:00
Jonathan Kawohl
4f1feab845
fix for https://github.com/owncloud/client/issues/1251
2016-10-24 15:09:25 +02:00
Jonathan Kawohl
f738cfd7fe
added info on qtkeychain
...
added installation info on qtkeychain
2016-10-24 09:00:07 +02:00
Jenkins for ownCloud
e6be670e49
[tx-robot] updated from transifex
2016-10-24 02:18:28 +02:00
Jenkins for ownCloud
46ce2f4722
[tx-robot] updated from transifex
2016-10-23 02:18:28 +02:00
Gilbert Röhrbein
166a0f60ca
nautilus integration: "share" extension for syncing folders
...
Issue #4608
* folder state is either OK or SYNC usually
* this extension does not know about if a folder is shareable
* a OK folder is shareable
* a SYNC folder could be uploaded or not uploaded
* this commit looks into file entries below this folder
* if one exists with state OK or SYNC
this folder must have been uploaded
* better would be if the server (gui) tells us
if the folder is uploaded
2016-10-22 23:26:44 +02:00
Romain Mekarni
a9019ccbad
Fix find_library FindCMocka.cmake
2016-10-22 14:52:27 +02:00
Jenkins for ownCloud
0a4806af44
[tx-robot] updated from transifex
2016-10-22 02:18:28 +02:00
Olivier Goffart
e33b89c222
Chunking-NG: Enable if the server supports it
2016-10-21 16:42:27 +02:00
Olivier Goffart
6b899be895
Merge remote-tracking branch 'origin/2.2' into master
2016-10-21 10:27:33 +02:00
Jenkins for ownCloud
641785298f
[tx-robot] updated from transifex
2016-10-21 02:18:31 +02:00
Jonathan Kawohl
092c935422
Correcting for PR comments
2016-10-20 13:05:56 +02:00
Olivier Goffart
273590fdfc
ChunkingNG: Use the 'If' header
...
As discussed in https://github.com/owncloud/core/pull/26368
2016-10-20 11:16:06 +02:00
Olivier Goffart
0960058842
Merge remote-tracking branch 'origin/master' into chunking-ng
2016-10-20 09:25:03 +02:00
Jenkins for ownCloud
1f78ea0fd1
[tx-robot] updated from transifex
2016-10-20 02:18:28 +02:00
Jonathan Kawohl
72d8175032
updated link for documentation and added more info to osx build
2016-10-19 11:12:11 +02:00
Jenkins for ownCloud
2fd9767892
[tx-robot] updated from transifex
2016-10-19 02:18:33 +02:00
