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 |
|
Dominik Schmidt
|
38ff7d87c8
|
Hide crashreporter config option if not build with crashreporter enabled
|
2014-08-29 17:07:31 +02:00 |
|
Dominik Schmidt
|
6abaad1ae8
|
Show crash reporter if trying to read the crash-reporter-enabled config crashes
|
2014-08-28 16:23:14 +02:00 |
|
Dominik Schmidt
|
89aec52503
|
Add checkbox to general settings to disable the crash reporter
|
2014-08-28 16:19:17 +02:00 |
|
Dominik Schmidt
|
439bf7641e
|
Use include path for libcrashreporter-qt instead of lengthy relative include
|
2014-08-28 11:11:42 +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 |
|
Dominik Schmidt
|
2b4849a2fa
|
Add crash reporter using libcrashreporter-qt
|
2014-08-26 18:15:13 +02:00 |
|
Dominik Schmidt
|
17e16f5e79
|
Add "Crash" entry to systray if started with --debug
|
2014-08-26 15:46:24 +02:00 |
|
Dominik Schmidt
|
b176ff6626
|
Don't use CMAKE_INSTALL_PREFIX for RPATH
|
2014-08-26 15:19:46 +02:00 |
|
Daniel Molkentin
|
e5471d8318
|
Build after merge
|
2014-08-26 14:33:21 +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
|
3c2e43d883
|
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
|
2014-07-14 10:50:53 +02:00 |
|
Daniel Molkentin
|
5041880854
|
Try to handle BUILD_LIBRARIES_ONLY correctly
Also, try to fix OS X build
|
2014-07-11 12:36:01 +02:00 |
|
Daniel Molkentin
|
2c904afd04
|
OS X explicitly requires the neon include path to be set
|
2014-07-11 12:11:04 +02:00 |
|
Daniel Molkentin
|
2cc13fb74a
|
Fix includes in mac specific headers
|
2014-07-11 11:38:01 +02:00 |
|
Daniel Molkentin
|
df3c3bca02
|
Split into three separate projects: library, gui and cmd
|
2014-07-11 11:07:31 +02:00 |
|