Christian Kamm
|
350ad98c27
|
Folderwizard: Prepare for multiaccount. #43
Avoid accessing the global account instance and instead pass it in
from the outside.
|
2015-01-28 10:40:32 +01:00 |
|
Markus Goetz
|
906779c4b1
|
SyncEngine: Use QNAM for csync_update
This is for #2507
|
2015-01-20 18:27:25 +01:00 |
|
Olivier Goffart
|
c9f1b3229b
|
Add Folder Wizard: fix wording
(Relates #2663)
|
2015-01-15 13:55:48 +01:00 |
|
Christian Kamm
|
53d5de685c
|
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/libsync/networkjobs.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagatedownload.cpp
|
2014-12-10 13:01:36 +01:00 |
|
Daniel Molkentin
|
2db17a57d2
|
Fix header names
|
2014-11-09 23:25:57 +01:00 |
|
Daniel Molkentin
|
ae85aa33fd
|
Adjust namespaces
|
2014-11-09 22:34:07 +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 |
|
Klaas Freitag
|
bcff1ced5e
|
Merge branch '1.7'
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folderman.cpp
src/gui/wizard/owncloudadvancedsetuppage.cpp
src/libsync/account.cpp
|
2014-08-29 20:40:33 +02:00 |
|
Daniel Molkentin
|
cf12a56b4c
|
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/gui/socketapi.cpp
|
2014-08-27 18:22:07 +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 |
|