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
|
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 |
|
Daniel Molkentin
|
f2eadacf09
|
Remove "Mirall" from class names
|
2014-11-09 22:30:29 +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 |
|
Daniel Molkentin
|
f25d175b5d
|
Merge remote-tracking branch 'origin/1.7'
|
2014-11-06 19:54:20 +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
|
c832226aa1
|
Merge remote-tracking branch 'origin/1.7' into master
|
2014-10-22 12:25:58 +02:00 |
|
Christian Kamm
|
a20375372d
|
Blacklist: Don't ignore error files forever. #2247
Instead try them again regularly, but don't show the user any
error messages if the error persists.
|
2014-10-22 12:25:18 +02: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 |
|
Olivier Goffart
|
50e718b1e7
|
Merge branch '1.7'
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folder.cpp
src/gui/socketapi.cpp
translations/mirall_ca.ts
translations/mirall_cs.ts
translations/mirall_de.ts
translations/mirall_el.ts
translations/mirall_en.ts
translations/mirall_es.ts
translations/mirall_es_AR.ts
translations/mirall_et.ts
translations/mirall_eu.ts
translations/mirall_fa.ts
translations/mirall_fi.ts
translations/mirall_fr.ts
translations/mirall_gl.ts
translations/mirall_hu.ts
translations/mirall_it.ts
translations/mirall_ja.ts
translations/mirall_nl.ts
translations/mirall_pl.ts
translations/mirall_pt.ts
translations/mirall_pt_BR.ts
translations/mirall_ru.ts
translations/mirall_sk.ts
translations/mirall_sl.ts
translations/mirall_sv.ts
translations/mirall_th.ts
translations/mirall_tr.ts
translations/mirall_uk.ts
translations/mirall_zh_CN.ts
translations/mirall_zh_TW.ts
|
2014-09-18 17:10:21 +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 |
|