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 |
|
Daniel Molkentin
|
2db17a57d2
|
Fix header names
|
2014-11-09 23:25:57 +01:00 |
|
Daniel Molkentin
|
a992c5b8d3
|
Fix build
|
2014-11-09 23:10:18 +01:00 |
|
Daniel Molkentin
|
58f1a9bb30
|
Rename: Adjust documentation
|
2014-11-09 23:09:52 +01:00 |
|
Daniel Molkentin
|
269b59c2ba
|
More CMake adjustments
|
2014-11-09 22:58:24 +01:00 |
|
Daniel Molkentin
|
d462c8838f
|
Adapt and expand README
|
2014-11-09 22:58:16 +01:00 |
|
Daniel Molkentin
|
1297ac77b9
|
Fix tests
|
2014-11-09 22:37:56 +01:00 |
|
Daniel Molkentin
|
d57d3cf1f6
|
Drop Mirall from strings
|
2014-11-09 22:35:29 +01:00 |
|
Daniel Molkentin
|
ae85aa33fd
|
Adjust namespaces
|
2014-11-09 22:34:07 +01:00 |
|
Daniel Molkentin
|
f2eadacf09
|
Remove "Mirall" from class names
|
2014-11-09 22:30:29 +01:00 |
|
Daniel Molkentin
|
9ebc41ed6f
|
Remove "Mirall" from cmake project files
|
2014-11-09 22:30:05 +01:00 |
|
hefee
|
f9dfdd58df
|
Fixing indent and make nautilus script python3 compatible.
|
2014-11-09 16:59:01 +01:00 |
|
Jenkins for ownCloud
|
c9f9388ef6
|
[tx-robot] updated from transifex
|
2014-11-09 01:25:21 -05:00 |
|
Olivier Goffart
|
7ae6712d56
|
Add a few Q_DECL_OVERRIDE
|
2014-11-08 11:21:48 +01:00 |
|
Olivier Goffart
|
98a283b4ec
|
Fix clang warnings
|
2014-11-08 11:21:48 +01:00 |
|
Olivier Goffart
|
d524f6b395
|
Fix compilation errors after merge
|
2014-11-08 11:11:05 +01:00 |
|
Olivier Goffart
|
6b716683e2
|
Merge the long PUT Poll URL feature with the new sql backend
|
2014-11-08 11:09:50 +01:00 |
|
Olivier Goffart
|
ba2c33af0b
|
Fix the il branch merge: Move the bandwidthmanager to libsync
|
2014-11-08 10:52:14 +01:00 |
|
Olivier Goffart
|
de11f602d5
|
Merge remote-tracking branch 'origin/il'
Conflicts:
csync/src/csync_private.h
src/CMakeLists.txt
src/gui/folder.cpp
src/libsync/owncloudpropagator.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagator_qnam.cpp
src/libsync/propagator_qnam.h
src/libsync/syncengine.cpp
src/libsync/syncengine.h
src/mirall/syncjournaldb.cpp
|
2014-11-08 10:48:36 +01:00 |
|
Jenkins for ownCloud
|
b8cb180e4b
|
[tx-robot] updated from transifex
|
2014-11-08 01:25:22 -05:00 |
|
Volkan Gezer
|
260c8e0227
|
fix typo
|
2014-11-07 17:51:15 +01:00 |
|
Daniel Molkentin
|
e579504181
|
Merge pull request #2370 from owncloud/icons-overlay-doc
Add section on Overlay Icons to 'Using the Synchronization Client'
|
2014-11-07 16:52:26 +01:00 |
|
Daniel Molkentin
|
7c034b427e
|
Handle invalid handle & fix an issue found during code review
|
2014-11-07 14:52:31 +01:00 |
|
Jenkins for ownCloud
|
08868594ae
|
[tx-robot] updated from transifex
|
2014-11-07 01:25:32 -05:00 |
|
Daniel Molkentin
|
f25d175b5d
|
Merge remote-tracking branch 'origin/1.7'
|
2014-11-06 19:54:20 +01:00 |
|
Daniel Molkentin
|
cc6e548a78
|
Merge pull request #2419 from owncloud/updater
Update and correct doc/autoupdate.rst
|
2014-11-06 19:53:33 +01:00 |
|
Daniel Molkentin
|
17a4299f74
|
Fix nautilus python integration
|
2014-11-06 19:26:43 +01:00 |
|
Daniel Molkentin
|
776f4dc316
|
v1.7.0
|
2014-11-06 15:53:17 +01:00 |
|
Daniel Molkentin
|
5db55d9e29
|
Prettify Changelog
|
2014-11-06 15:41:23 +01:00 |
|
Christian Kamm
|
5c9564ac08
|
Add to 1.7 changelog.
|
2014-11-06 15:31:09 +01:00 |
|
Daniel Molkentin
|
5c5a89c1a4
|
Revert "Bump binary directory to current master"
This reverts commit af4e9c30f5.
This is consistent with 176413d312.
|
2014-11-06 15:21:39 +01:00 |
|
Daniel Molkentin
|
176413d312
|
Revert "Windows Shell Integration: Show status icon for root folder"
This reverts commit 5805ffebec.
There is no good way to fix this on the Mirall side without risk.
Delay until after 1.7.0
|
2014-11-06 15:18:54 +01:00 |
|
Olivier Goffart
|
b70ecc3dd3
|
Never overwrite the mtime from the local file system in the db when updating the metadata
Attempt to fix #2431
|
2014-11-06 15:13:10 +01:00 |
|
Daniel Molkentin
|
89670e5ce4
|
Folderwatcher_win: handle conversion error
|
2014-11-06 12:54:33 +01:00 |
|
Christian Kamm
|
174e1acbc7
|
Folder::wipe(): Remove partial downloads and -shm,-wal db files.
|
2014-11-06 12:49:02 +01:00 |
|
Christian Kamm
|
1f09a24a72
|
Resync button: Remove partial downloads too. #2445
|
2014-11-06 12:17:04 +01:00 |
|
Christian Kamm
|
eed91ddf46
|
Legacy propagator: Don't use mtime retrieved via _fstat64.
May be the cause of #2431
|
2014-11-06 12:16:55 +01:00 |
|