Daniel Molkentin 457f9b587d Merge remote-tracking branch 'origin/1.8' ... Conflicts: src/gui/sharedialog.cpp src/gui/sharedialog.h		2015-03-13 14:03:03 +01:00
..
updater	OS X Sparkle: Fix warning	2015-02-05 15:49:46 +01:00
wizard	setup wizard: use a PROPFIND instead of a GET on the webdav url	2015-03-03 16:03:53 +01:00
accountmigrator.cpp
accountmigrator.h
accountsettings.cpp	Handle 503 due to maintenance more gracefully. #2884	2015-02-25 12:02:10 +01:00
accountsettings.h	Account: Split into libsync/Account and gui/AccountState.	2014-12-18 15:39:51 +01:00
accountsettings.ui
accountstate.cpp	Handle 503 due to maintenance more gracefully. #2884	2015-02-25 12:02:10 +01:00
accountstate.h	Handle 503 due to maintenance more gracefully. #2884	2015-02-25 12:02:10 +01:00
addcertificatedialog.cpp	Add proper copyright headers to some files, fixes #2869	2015-02-25 17:00:27 +01:00
addcertificatedialog.h	Add proper copyright headers to some files, fixes #2869	2015-02-25 17:00:27 +01:00
addcertificatedialog.ui	Client Dialog Support: Fix certificate dialog	2015-02-02 23:35:39 +01:00
application.cpp	Install the crash handler earlier during startup	2015-03-12 17:16:05 +01:00
application.h	Install the crash handler earlier during startup	2015-03-12 17:16:05 +01:00
CMakeLists.txt	OS X: Send notification natively	2015-02-07 18:23:40 +01:00
cocoainitializer_mac.mm
cocoainitializer.h
folder.cpp	FileSystem: Remove QFileInfo based implementations.	2015-02-27 15:27:49 +01:00
folder.h	SyncEngine: pass a non-const reference to the SyncFileItemVector in aboutToPropagate	2015-02-17 11:08:16 +01:00
folderman.cpp	FolderMan: fix folderSyncStateChange emission. #2896	2015-03-12 10:00:45 +01:00
folderman.h	Ensure good sync state if in-progress folder is deleted. #2896	2015-02-27 12:39:19 +01:00
folderstatusmodel.cpp	More HIDPI support	2015-02-12 19:44:40 +01:00
folderstatusmodel.h
folderwatcher_linux.cpp	Merge branch 'master' into rename_client	2014-12-02 13:37:22 +01:00
folderwatcher_linux.h
folderwatcher_mac.cpp
folderwatcher_mac.h
folderwatcher_qt.cpp
folderwatcher_qt.h
folderwatcher_win.cpp	Merge branch 'master' into rename_client	2014-12-02 13:37:22 +01:00
folderwatcher_win.h	Merge branch 'master' into rename_client	2014-12-02 13:37:22 +01:00
folderwatcher.cpp	FolderWatcher: Fix ignore list usage.	2015-01-22 15:42:47 +01:00
folderwatcher.h	Merge branch 'master' into rename_client	2014-12-02 13:37:22 +01:00
folderwizard.cpp	Output a more sensible error message for auth errors	2015-03-10 12:14:14 +01:00
folderwizard.h	Folderwizard: Prepare for multiaccount. #43	2015-01-28 10:40:32 +01:00
folderwizardsourcepage.ui
folderwizardtargetpage.ui	Merge remote-tracking branch 'origin/1.7'	2014-12-10 13:01:36 +01:00
generalsettings.cpp	mirall.qrc -> client.qrc	2014-12-08 18:00:29 +01:00
generalsettings.h
generalsettings.ui
ignorelisteditor.cpp
ignorelisteditor.h
ignorelisteditor.ui
logbrowser.cpp	some typos, grammar and sentence fixes	2015-02-14 23:47:07 +01:00
logbrowser.h
main.cpp	Install the crash handler earlier during startup	2015-03-12 17:16:05 +01:00
networksettings.cpp
networksettings.h
networksettings.ui	Fix warnings.	2015-01-14 11:28:53 +01:00
openfilemanager.cpp	Windows: Fix opening activity entries with a space in the name	2015-02-06 13:44:06 +01:00
openfilemanager.h
owncloudgui.cpp	ShareDialog: Consider if resharing is not allowed on a share.	2015-03-11 14:12:08 +01:00
owncloudgui.h	ShareDialog: Consider if resharing is not allowed on a share.	2015-03-11 14:12:08 +01:00
owncloudsetuppage.ui
owncloudsetupwizard.cpp	Revert "SetupW: Display proper error messages if password or user was wrong."	2015-03-10 11:17:35 +01:00
owncloudsetupwizard.h	setup wizard: use a PROPFIND instead of a GET on the webdav url	2015-03-03 16:03:53 +01:00
protocolwidget.cpp	Activity: Set a message for conflicts. #2792	2015-03-12 10:00:45 +01:00
protocolwidget.h
protocolwidget.ui	Don't translate dummy strings	2015-02-20 10:12:31 +01:00
quotainfo.cpp	QuotaInfo: Ensure only one QuotaJob during startup. #2801	2015-02-12 15:25:44 +01:00
quotainfo.h	QuotaInfo: Ensure only one QuotaJob during startup. #2801	2015-02-12 15:25:44 +01:00
selectivesyncdialog.cpp	LsColJob: one must now specify the properties	2015-03-02 11:03:25 +01:00
selectivesyncdialog.h	SelectiveSync: show a message in case of error or if there is no subfolder	2015-02-06 12:27:54 +01:00
settingsdialog.cpp	OS X: Fix UI glitches related to sync folder	2015-03-11 16:42:12 +01:00
settingsdialog.cpp.Rbt431
settingsdialog.h	Merge branch 'master' into rename_client	2014-12-02 13:37:22 +01:00
settingsdialog.ui	Merge branch 'master' into rename_client	2014-12-02 13:37:22 +01:00
settingsdialogmac.cpp	OS X: Fix UI glitches related to sync folder	2015-03-11 16:42:12 +01:00
settingsdialogmac.h	Merge branch 'master' into rename_client	2014-12-02 13:37:22 +01:00
sharedialog.cpp	Merge remote-tracking branch 'origin/1.8'	2015-03-13 14:03:03 +01:00
sharedialog.h	Merge remote-tracking branch 'origin/1.8'	2015-03-13 14:03:03 +01:00
sharedialog.ui	ShareDialog: Made it less "webbish" for better usability.	2015-03-09 14:33:02 +01:00
socketapi.cpp	ShareDialog: Consider if resharing is not allowed on a share.	2015-03-11 14:12:08 +01:00
socketapi.h	ShareDialog: Consider if resharing is not allowed on a share.	2015-03-11 14:12:08 +01:00
sslbutton.cpp	Fix build when compiling libsync without QtGui	2015-02-16 10:24:42 +01:00
sslbutton.h	Account: Split into libsync/Account and gui/AccountState.	2014-12-18 15:39:51 +01:00
sslerrordialog.cpp	Use global Account/AccountState less.	2014-12-18 15:39:51 +01:00
sslerrordialog.h	Use global Account/AccountState less.	2014-12-18 15:39:51 +01:00
sslerrordialog.ui
syncrunfilelog.cpp	Propagator: Use QBA for responseTimestamp instead of QString	2015-03-09 15:52:52 +01:00
syncrunfilelog.h
systray.cpp	OS X: Send notification natively	2015-02-07 18:23:40 +01:00
systray.h	OS X: Send notification natively	2015-02-07 18:23:40 +01:00
systray.mm	OS X: Send notification natively	2015-02-07 18:23:40 +01:00