Jenkins for ownCloud
06b31d7cf0
[tx-robot] updated from transifex
2014-11-20 01:25:20 -05:00
Christian Kamm
4d7b8bdb25
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
OWNCLOUD.cmake
test/CMakeLists.txt
test/testfolderwatcher.h
2014-11-19 14:45:25 +01:00
Christian Kamm
421a8cc6b7
Windows: Make unit tests compile.
2014-11-19 14:18:37 +01:00
Christian Kamm
3a448fda91
Windows mingw32: Fix finding of windres binary.
2014-11-19 14:16:56 +01:00
Christian Kamm
3706c76622
useLegacyJobs: Fix logic.
2014-11-19 10:31:42 +01:00
Olivier Goffart
9a6710e330
Propagator: add a bit of documentation comments
2014-11-18 17:54:53 +01:00
Olivier Goffart
1113980b20
Propagator: Change the scheduler
...
It still needs to be a bit optimized, but it allows to paralelized jobs between directories
(this is required to paralelize the mkcol)
2014-11-18 17:35:31 +01:00
Markus Goetz
e890c4ae1b
OS X: Move previous fix to proper location
2014-11-17 18:30:32 +01:00
Markus Goetz
7ada625161
OS X: Fix packages file
2014-11-17 17:48:29 +01:00
Olivier Goffart
7d8dd54b19
Merge pull request #2504 from owncloud/revert-2454-fswatcher_readdirectorychanges_port
...
Revert "WiP: switch to ReadDirectoryChangesW"
2014-11-17 11:11:39 +01:00
Olivier Goffart
0b275c4933
Revert "WiP: switch to ReadDirectoryChangesW"
2014-11-17 11:11:13 +01:00
Olivier Goffart
e529bbed90
Merge pull request #2454 from owncloud/fswatcher_readdirectorychanges_port
...
switch to ReadDirectoryChangesW
2014-11-17 09:43:29 +01:00
Jenkins for ownCloud
39e97779ec
[tx-robot] updated from transifex
2014-11-17 01:25:22 -05:00
Jenkins for ownCloud
629d46ca25
[tx-robot] updated from transifex
2014-11-16 01:25:22 -05:00
Daniel Molkentin
c5a35ad56f
Merge pull request #2499 from owncloud/revert-2412-nsis_shortcuts_all_users
...
Revert "Install shortcuts for all users"
2014-11-15 21:05:05 +01:00
Daniel Molkentin
1e94161ec1
Revert "Install shortcuts for all users"
2014-11-15 21:04:33 +01:00
Daniel Molkentin
6f78ff200c
Merge pull request #2412 from owncloud/nsis_shortcuts_all_users
...
Install shortcuts for all users
2014-11-15 20:09:29 +01:00
Daniel Molkentin
02e96484a8
Install shortcuts for all users
2014-11-15 17:07:39 +01:00
Jenkins for ownCloud
67b0e4dd15
[tx-robot] updated from transifex
2014-11-15 01:25:23 -05:00
Olivier Goffart
a3b21022af
new bandwith limiting: Do a test on the Qt version to activate it
...
We need Qt 5.3.3.
If the compiled qt version is Qt 5 but smaller than Qt 5.3.3, do a runtime
check.
OWNCLOUD_NEW_BANDWIDTH_LIMITING is still there for a special setup in which
we patch Qt with the patches
2014-11-14 17:29:28 +01:00
Olivier Goffart
ad92e7b888
Move UploadDevice to the right header
2014-11-14 16:40:13 +01:00
Olivier Goffart
c73522de2e
Remove ChunkBlock
...
It is not in used
2014-11-14 16:39:39 +01:00
Olivier Goffart
14f5e8e32e
Move all the neon code to the _legacy files
2014-11-14 16:13:50 +01:00
Olivier Goffart
f3797abecf
Fix the PropfindJob
...
-the namespace mangling was wrong
-And the way we read the reply did not work
2014-11-14 15:03:48 +01:00
Markus Goetz
5b7ec19778
SyncEngine: Also output the neon version
2014-11-14 15:02:09 +01:00
Guillermo López Leal
a786511769
Clarify the remotePollInterval variable from https://github.com/owncloud/core/issues/6543
2014-11-14 11:48:30 +01:00
Jenkins for ownCloud
e71c617bfd
[tx-robot] updated from transifex
2014-11-14 01:25:20 -05:00
Olivier Goffart
1310bef528
Port the propagate mkdir to QNAM
...
This way we can make it parallel
2014-11-13 18:57:07 +01:00
Jenkins for ownCloud
f1432992d3
[tx-robot] updated from transifex
2014-11-13 01:25:30 -05:00
Markus Goetz
348b7bf4eb
SyncEngine: Output versions used
2014-11-12 09:21:37 +01:00
Markus Goetz
30479cc5a2
Wizard: Properly show error message
2014-11-12 09:21:37 +01:00
Jenkins for ownCloud
1ba1bdec2d
[tx-robot] updated from transifex
2014-11-12 01:25:29 -05:00
Daniel Molkentin
8993af4378
Bump version in readme
2014-11-12 00:32:28 +01:00
Daniel Molkentin
7246011b62
Merge pull request #2459 from owncloud/typo
...
fix typo
2014-11-12 00:09:22 +01:00
Daniel Molkentin
058d868edd
Merge remote-tracking branch 'origin/1.7'
2014-11-12 00:09:00 +01:00
Daniel Molkentin
9a58d0e559
Merge pull request #2469 from owncloud/fixing_indent
...
Fixing indent and make nautilus script python3 compatible.
2014-11-12 00:08:46 +01:00
Daniel Molkentin
281c0e1553
Merge branch 'master' into rename_client
...
Conflicts:
CMakeLists.txt
src/gui/main.cpp
src/libsync/accessmanager.cpp
src/libsync/accessmanager.h
src/libsync/owncloudpropagator_p.h
2014-11-12 00:07:59 +01:00
Daniel Molkentin
52a63a65ef
Merge pull request #2110 from owncloud/crashreporter
...
Implement CrashReporter using libcrashreporter-qt
2014-11-12 00:01:58 +01:00
Daniel Molkentin
cdac8d56d5
Merge remote-tracking branch 'origin/master' into crashreporter
...
Conflicts:
src/libsync/utility.cpp
src/libsync/utility.h
2014-11-11 23:53:38 +01:00
Olivier Goffart
b04cb23ed5
t8.pl: fix the test for me
...
On localhost, the other file (the bigger one) was downloaded first
2014-11-11 16:38:20 +01:00
Olivier Goffart
7b4be209aa
MOVE: fix moving with special character.
...
The Destination header need to be %-encoded
2014-11-11 16:27:06 +01:00
Olivier Goffart
c712b7c46c
Parallel MOVE by porting the job to qnam
2014-11-11 16:09:01 +01:00
Olivier Goffart
22c6892870
DELETE: Error out if the HTTP code is not 204
2014-11-11 14:32:25 +01:00
Olivier Goffart
134650eb44
Parallel DELETE
2014-11-11 13:19:29 +01:00
Olivier Goffart
506ba022f1
Split propagator_qnam.cpp into propagateupload.cpp and propagatedownload.cpp
2014-11-11 12:17:10 +01:00
Klaas Freitag
fc6d572a6c
Make compile against Qt4
2014-11-11 10:10:46 +01:00
Jenkins for ownCloud
e6eb91c5f9
[tx-robot] updated from transifex
2014-11-11 02:06:12 -05:00
Jenkins for ownCloud
ced986e010
[tx-robot] updated from transifex
2014-11-11 01:25:22 -05:00
Jenkins for ownCloud
cde9b3ac85
[tx-robot] updated from transifex
2014-11-10 01:25:22 -05:00
Daniel Molkentin
b54c079766
Adjust issue urls
2014-11-09 23:38:07 +01:00
