mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-19 20:32:03 +03:00
Code Issues Projects Releases Packages Wiki Activity
nextcloud-desktop/src/gui
History
Christian Kamm 53d5de685c Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	src/gui/folder.cpp
	src/gui/folder.h
	src/libsync/networkjobs.cpp
	src/libsync/owncloudpropagator.h
	src/libsync/propagatedownload.cpp
2014-12-10 13:01:36 +01:00
..
updater Fix header names 2014-11-09 23:25:57 +01:00
wizard Merge remote-tracking branch 'origin/1.7' 2014-12-10 13:01:36 +01:00
accountmigrator.cpp Fix header names 2014-11-09 23:25:57 +01:00
accountmigrator.h Adjust namespaces 2014-11-09 22:34:07 +01:00
accountsettings.cpp Fix header names 2014-11-09 23:25:57 +01:00
accountsettings.h Adjust namespaces 2014-11-09 22:34:07 +01:00
accountsettings.ui Adjust namespaces 2014-11-09 22:34:07 +01:00
application.cpp Merge remote-tracking branch 'origin/1.7' 2014-12-10 13:01:36 +01:00
application.h Merge branch 'master' into rename_client 2014-11-12 00:07:59 +01:00
CMakeLists.txt Fix compilation 2014-12-08 19:25:57 +01:00
cocoainitializer.h Adjust namespaces 2014-11-09 22:34:07 +01:00
cocoainitializer_mac.mm Adjust namespaces 2014-11-09 22:34:07 +01:00
folder.cpp Merge remote-tracking branch 'origin/1.7' 2014-12-10 13:01:36 +01:00
folder.h Merge remote-tracking branch 'origin/1.7' 2014-12-10 13:01:36 +01:00
folderman.cpp Merge remote-tracking branch 'origin/1.7' 2014-12-10 13:01:36 +01:00
folderman.h Merge remote-tracking branch 'origin/1.7' 2014-12-10 13:01:36 +01:00
folderstatusmodel.cpp mirall.qrc -> client.qrc 2014-12-08 18:00:29 +01:00
folderstatusmodel.h Adjust namespaces 2014-11-09 22:34:07 +01:00
folderwatcher.cpp Merge branch 'master' into rename_client 2014-12-02 13:37:22 +01:00
folderwatcher.h Merge branch 'master' into rename_client 2014-12-02 13:37:22 +01:00
folderwatcher_linux.cpp Merge branch 'master' into rename_client 2014-12-02 13:37:22 +01:00
folderwatcher_linux.h Adjust namespaces 2014-11-09 22:34:07 +01:00
folderwatcher_mac.cpp Adjust namespaces 2014-11-09 22:34:07 +01:00
folderwatcher_mac.h Adjust namespaces 2014-11-09 22:34:07 +01:00
folderwatcher_qt.cpp Adjust namespaces 2014-11-09 22:34:07 +01:00
folderwatcher_qt.h Adjust namespaces 2014-11-09 22:34:07 +01:00
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
folderwizard.cpp Merge remote-tracking branch 'origin/1.7' 2014-12-10 13:01:36 +01:00
folderwizard.h Adjust namespaces 2014-11-09 22:34:07 +01:00
folderwizardsourcepage.ui Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
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 Adjust namespaces 2014-11-09 22:34:07 +01:00
generalsettings.ui Merge branch 'master' into rename_client 2014-11-12 00:07:59 +01:00
ignorelisteditor.cpp Fix header names 2014-11-09 23:25:57 +01:00
ignorelisteditor.h Adjust namespaces 2014-11-09 22:34:07 +01:00
ignorelisteditor.ui Adjust namespaces 2014-11-09 22:34:07 +01:00
logbrowser.cpp Fix header names 2014-11-09 23:25:57 +01:00
logbrowser.h Adjust namespaces 2014-11-09 22:34:07 +01:00
main.cpp mirall.qrc -> client.qrc 2014-12-08 18:00:29 +01:00
networksettings.cpp Fix header names 2014-11-09 23:25:57 +01:00
networksettings.h Adjust namespaces 2014-11-09 22:34:07 +01:00
networksettings.ui Adjust namespaces 2014-11-09 22:34:07 +01:00
openfilemanager.cpp Adjust namespaces 2014-11-09 22:34:07 +01:00
openfilemanager.h Adjust namespaces 2014-11-09 22:34:07 +01:00
owncloudgui.cpp Merge remote-tracking branch 'origin/1.7' 2014-12-10 13:01:36 +01:00
owncloudgui.h Merge branch 'master' into rename_client 2014-11-12 00:07:59 +01:00
owncloudsetuppage.ui Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudsetupwizard.cpp Merge remote-tracking branch 'origin/1.7' 2014-12-10 13:01:36 +01:00
owncloudsetupwizard.h Adjust namespaces 2014-11-09 22:34:07 +01:00
protocolwidget.cpp Fix header names 2014-11-09 23:25:57 +01:00
protocolwidget.h Adjust namespaces 2014-11-09 22:34:07 +01:00
protocolwidget.ui Adjust namespaces 2014-11-09 22:34:07 +01:00
selectivesyncdialog.cpp Adjust namespaces 2014-11-09 22:34:07 +01:00
selectivesyncdialog.h Adjust namespaces 2014-11-09 22:34:07 +01:00
settingsdialog.cpp mirall.qrc -> client.qrc 2014-12-08 18:00:29 +01:00
settingsdialog.cpp.Rbt431 Make all ptr-based members either const or check for their existance 2014-12-01 13:08:49 +01:00
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 mirall.qrc -> client.qrc 2014-12-08 18:00:29 +01:00
settingsdialogmac.h Merge branch 'master' into rename_client 2014-12-02 13:37:22 +01:00
socketapi.cpp Merge remote-tracking branch 'origin/1.7' 2014-12-10 13:01:36 +01:00
socketapi.h Adjust namespaces 2014-11-09 22:34:07 +01:00
sslbutton.cpp Adjust namespaces 2014-11-09 22:34:07 +01:00
sslbutton.h Adjust namespaces 2014-11-09 22:34:07 +01:00
sslerrordialog.cpp Fix header names 2014-11-09 23:25:57 +01:00
sslerrordialog.h Adjust namespaces 2014-11-09 22:34:07 +01:00
sslerrordialog.ui Adjust namespaces 2014-11-09 22:34:07 +01:00
syncrunfilelog.cpp Adjust namespaces 2014-11-09 22:34:07 +01:00
syncrunfilelog.h Adjust namespaces 2014-11-09 22:34:07 +01:00
systray.cpp Adjust namespaces 2014-11-09 22:34:07 +01:00
systray.h Adjust namespaces 2014-11-09 22:34:07 +01:00