Roeland Jago Douma
|
b7d4c997a3
|
Fix rebase of branch
|
2014-12-28 20:13:10 +01:00 |
|
Alfie "Azelphur" Day
|
748440ced3
|
Initial push for filebrowser integration, not finished yet but it's a start :)
|
2014-12-28 20:13:10 +01:00 |
|
Daniel Molkentin
|
ae85aa33fd
|
Adjust namespaces
|
2014-11-09 22:34:07 +01:00 |
|
Daniel Molkentin
|
dc1e73dcb7
|
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/libsync/syncjournaldb.cpp
test/CMakeLists.txt
|
2014-10-28 23:27:58 -04: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
|
4fc044d368
|
Merge branch 'master' into move_lib_to_sep_dir
Conflicts:
cmake/modules/NSIS.template.in
src/CMakeLists.txt
src/creds/shibboleth/authenticationdialog.cpp
src/creds/shibboleth/authenticationdialog.h
src/gui/owncloudgui.cpp
src/libsync/creds/shibboleth/authenticationdialog.cpp
src/libsync/creds/shibboleth/authenticationdialog.h
src/libsync/mirallaccessmanager.cpp
src/mirall/authenticationdialog.cpp
src/mirall/authenticationdialog.h
|
2014-08-12 21:08:44 +02:00 |
|
Daniel Molkentin
|
bb32831a60
|
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
Conflicts:
src/gui/folderman.cpp
|
2014-07-17 11:31:45 +02:00 |
|
Daniel Molkentin
|
df3c3bca02
|
Split into three separate projects: library, gui and cmd
|
2014-07-11 11:07:31 +02:00 |
|