Jenkins for ownCloud
bca1ef42fc
[tx-robot] updated from transifex
2014-07-21 01:25:21 -04:00
Jenkins for ownCloud
010ab7119e
[tx-robot] updated from transifex
2014-07-20 01:25:22 -04:00
Jenkins for ownCloud
3cb93510ac
[tx-robot] updated from transifex
2014-07-19 01:25:30 -04:00
Olivier Goffart
8a88ca6f34
Merge branch 'il'
...
Conflicts:
src/mirall/propagator_legacy.h
2014-07-18 17:00:38 +02:00
Olivier Goffart
81d786733d
Merge remote-tracking branch 'origin/1.6' into il
...
Conflicts:
VERSION.cmake
src/mirall/propagator_qnam.cpp
src/mirall/propagator_qnam.h
2014-07-18 16:59:29 +02:00
Olivier Goffart
336e74b992
csync_owncloud: fix the name of the permissions property
2014-07-18 16:52:04 +02:00
Olivier Goffart
beb9300b4e
network limit: Never wait more than 10 seconds
...
When using the "Limit automatically" limit, we wait for 25% of the time
it took to upload something.
However, if we go to sleep while uploading, the time it took to upload may take
days. And waiting for 25% of a day is too long.
So never wait for more than 10 seconds
This may be related to issue #1880
2014-07-18 12:27:02 +02:00
Klaas Freitag
74b3e2ce3f
tests: Another try to get around the jenkins test problem.
2014-07-18 12:20:14 +02:00
Olivier Goffart
c35880d4f1
Fix corruption while trying to resume and the server don't suport it
...
Issue #1982
2014-07-18 12:03:45 +02:00
Jenkins for ownCloud
ed6e3e4ee2
[tx-robot] updated from transifex
2014-07-18 01:25:23 -04:00
Klaas Freitag
f8bea55b10
SocketAPI: Handle top sync folder correctly.
2014-07-17 19:34:50 +02:00
Daniel Molkentin
72cd84e878
SocketAPI: Exclude drive part from path blacklist check
...
Otherwise, it always matches the ':' part
2014-07-17 19:26:58 +02:00
Daniel Molkentin
35b6d09615
SocketAPI: Fix separators on Windows
2014-07-17 17:41:20 +02:00
Daniel Molkentin
1ae727e70f
SocketAPI: Emit error of binding the server fails
2014-07-17 15:01:01 +02:00
Daniel Molkentin
0e5d0c1170
SocketAPI: Some cleaning up
2014-07-17 15:00:21 +02:00
Daniel Molkentin
7ff62bc577
NSIS: ICU rebumped to 5.3 as per build service change
2014-07-17 14:57:04 +02:00
Klaas Freitag
743c1c2eda
SocketAPI: Send an UPDATE_VIEW to the shell plugin on connect.
...
For each configured sync folder send an UPDATE_VIEW directly after
the socket connect to make the shell integration updating the view.
2014-07-17 11:26:03 +02:00
Klaas Freitag
0e9a08cbbf
SocketAPI: rename slot to send UPDATE_VIEW.
2014-07-17 11:25:08 +02:00
Klaas Freitag
d2445ec72d
PropagatorQNAM: Never send if-match header for new files.
2014-07-17 11:23:11 +02:00
Klaas Freitag
fef713aaed
SocketAPI: Create the socket API instance in folderman.
2014-07-17 11:22:18 +02:00
Klaas Freitag
c4d73688a6
Folderman: Fix path detection in folderForPath().
2014-07-17 11:21:02 +02:00
Daniel Molkentin
56b721b2eb
propagator_qnam: fix warning
2014-07-17 11:05:16 +02:00
Klaas Freitag
2981b37219
Use file size of factor of four because of the createLocalFile algorithm
2014-07-17 10:29:13 +02:00
Jenkins for ownCloud
cfc2f84d3e
[tx-robot] updated from transifex
2014-07-17 01:25:28 -04:00
Klaas Freitag
d8ebebaf12
WinInstaller: No hardcoded www in front of the url on final page.
2014-07-16 18:39:51 +02:00
Klaas Freitag
2a5691e575
tests: Fix assertion.
2014-07-16 17:26:06 +02:00
Klaas Freitag
774432066e
tests: Reverted previous change, do not append in createLocalFile()
2014-07-16 17:25:18 +02:00
Klaas Freitag
e6c501de8e
FolderMan: More useful logging.
2014-07-16 16:59:20 +02:00
Klaas Freitag
af3fae9c28
Bumped to 1.6.2 rc1
2014-07-16 14:32:58 +02:00
Klaas Freitag
d5a8661480
tests: do not use system any more to modify files, rather perl native.
2014-07-16 14:06:57 +02:00
Klaas Freitag
d3b72940fd
Updated Changelog for 1.6.2
2014-07-16 11:56:17 +02:00
Daniel Molkentin
e8de3e855a
1.6.2
2014-07-16 11:43:13 +02:00
Klaas Freitag
71338000a4
SetupWizard: Keep initial local folder to compare later for changes.
...
If the local folder changes, the sync has to be reinitialized as
well. Until now we did not detect that, which led to the case that
the sync folder was not reinitialized in case only the local folder
changed in the setup dialog.
2014-07-16 11:37:46 +02:00
Olivier Goffart
2fdb3cfdfb
Merge branch 'il'
...
Conflicts:
src/mirall/folder.cpp
src/mirall/propagator_qnam.cpp
2014-07-16 10:49:16 +02:00
Olivier Goffart
8961e61f60
Merge branch '1.6' into il
...
Conflicts:
VERSION.cmake
src/mirall/syncengine.cpp
src/mirall/syncengine.h
2014-07-16 09:57:40 +02:00
Jenkins for ownCloud
e5191acd73
[tx-robot] updated from transifex
2014-07-16 01:25:23 -04:00
Olivier Goffart
d697969f36
Use another way to detect that the server was reconfigured
...
Before, we would only detect it if all the files were removed, and no
file where added or changed. This may not be enough because there might
be a welcome.txt file. Now, we check that none of the file stays the same,
and some files are removed.
Relates issue #1948
2014-07-15 18:09:08 +02:00
Olivier Goffart
51e9c5fd96
propagator_qnam Fix signal slot connection
...
Fix the signature so it can be connected
This was hapenning if the derver does not support X-OC-MTime
issue #1963
2014-07-15 18:08:26 +02:00
Klaas Freitag
997504c03c
FolderMan: Unload folder method added.
...
unloadFolder now correctly removes a folder from all maps and signal
mappers.
2014-07-15 16:07:23 +02:00
Markus Goetz
0202351a27
Propagator: Fix crash when logging out during upload
...
Fixes #1957
2014-07-14 19:53:42 +02:00
Jenkins for ownCloud
dde06dfaba
[tx-robot] updated from transifex
2014-07-14 01:25:21 -04:00
Jenkins for ownCloud
eb0f074097
[tx-robot] updated from transifex
2014-07-13 02:06:11 -04:00
Jenkins for ownCloud
b6c9b5645c
[tx-robot] updated from transifex
2014-07-13 01:25:20 -04:00
Klaas Freitag
a281b36d6f
SocketAPI: send the path with UPDATE_VIEW
2014-07-11 12:34:04 +02:00
Klaas Freitag
7772501cdf
Remove unused socketPath variable.
2014-07-11 12:33:43 +02:00
Daniel Molkentin
d1b991e198
Fix windows compilation
2014-07-10 22:58:58 +02:00
Klaas Freitag
00f793a841
CMake: Remove accidentially added typo to fix build.
2014-07-10 17:20:40 +02:00
Klaas Freitag
bdb9598227
SocketAPI: Use QTcpSocket all over, rather than QLocalSocket.
2014-07-10 16:35:18 +02:00
Klaas Freitag
c6deb392fd
SocketAPI: Enhance SyncFileStatus to have share information.
...
Added a new class SyncFileStatus to reflect that properly.
2014-07-10 16:28:40 +02:00
Olivier Goffart
3477ea0eeb
Fix build with TOKEN_ONLY_AUTH
...
It was broken by commit 6ff38d8005
2014-07-10 15:26:55 +02:00
