63 commits

Author	SHA1	Message	Date
Olivier Goffart	41111541c5	Confirm feature: Add an option for it	2015-07-07 16:28:48 +02:00
Olivier Goffart	29fecb029e	Merge remote-tracking branch 'origin/1.8' ... Conflicts: VERSION.cmake src/gui/accountsettings.cpp src/gui/accountsettings.h	2015-06-25 12:30:52 +02:00
Klaas Freitag	c8cb604c18	Updater: Do a tray notification if a new update is available.	2015-06-09 08:35:15 +02:00
Olivier Goffart	426d2338d9	Settings: New UI that intergate the selective sync within the account settings	2015-03-27 16:50:35 +01:00
Daniel Molkentin	a2b817f0c0	mirall.qrc -> client.qrc	2014-12-08 18:00:29 +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
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
Dominik Schmidt	38ff7d87c8	Hide crashreporter config option if not build with crashreporter enabled	2014-08-29 17:07:31 +02:00
Dominik Schmidt	89aec52503	Add checkbox to general settings to disable the crash reporter	2014-08-28 16:19:17 +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

Renamed from src/mirall/generalsettings.cpp (Browse further)