Olivier Goffart
|
dcba129a98
|
Make it compile without neon
|
2015-01-23 17:56:46 +01:00 |
|
Olivier Goffart
|
fe51ada1e8
|
Don't require NEON with Qt 5.4
|
2015-01-23 17:11:34 +01:00 |
|
Daniel Molkentin
|
3016844dd7
|
Merge branch 'master' into rename_client
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
|
2014-12-02 13:37:22 +01:00 |
|
Christian Kamm
|
0fe7a69b39
|
FolderWatcher: Detect own changes. #2297
|
2014-11-20 13:16:29 +01:00 |
|
Olivier Goffart
|
14f5e8e32e
|
Move all the neon code to the _legacy files
|
2014-11-14 16:13:50 +01: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 |
|
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 |
|
Olivier Goffart
|
c712b7c46c
|
Parallel MOVE by porting the job to qnam
|
2014-11-11 16:09:01 +01:00 |
|
Olivier Goffart
|
134650eb44
|
Parallel DELETE
|
2014-11-11 13:19:29 +01:00 |
|
Daniel Molkentin
|
ae85aa33fd
|
Adjust namespaces
|
2014-11-09 22:34:07 +01:00 |
|
Daniel Molkentin
|
f25d175b5d
|
Merge remote-tracking branch 'origin/1.7'
|
2014-11-06 19:54:20 +01:00 |
|
Christian Kamm
|
7ae0338f5c
|
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/socketapi.h
src/libsync/syncengine.h
test/CMakeLists.txt
|
2014-10-22 10:41:55 +02:00 |
|
Daniel Molkentin
|
902bb7a198
|
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
Conflicts:
src/CMakeLists.txt
src/gui/accountsettings.cpp
src/gui/folderwizard.cpp
src/gui/settingsdialog.cpp
src/libsync/syncengine.h
|
2014-08-26 11:29:42 +02:00 |
|
Daniel Molkentin
|
df3c3bca02
|
Split into three separate projects: library, gui and cmd
|
2014-07-11 11:07:31 +02:00 |
|