nextcloud-desktop/src/libsync
Daniel Molkentin cdac8d56d5 Merge remote-tracking branch 'origin/master' into crashreporter
Conflicts:
	src/libsync/utility.cpp
	src/libsync/utility.h
2014-11-11 23:53:38 +01:00
..
creds Merge remote-tracking branch 'origin/il' 2014-11-08 10:48:36 +01:00
account.cpp Merge branch '1.7' 2014-09-18 17:10:21 +02:00
account.h Merge remote-tracking branch 'origin/1.7' 2014-10-22 10:41:55 +02:00
authenticationdialog.cpp Merge branch 'master' into move_lib_to_sep_dir 2014-08-12 21:08:44 +02:00
authenticationdialog.h Merge branch 'master' into move_lib_to_sep_dir 2014-08-12 21:08:44 +02:00
bandwidthmanager.cpp Split propagator_qnam.cpp into propagateupload.cpp and propagatedownload.cpp 2014-11-11 12:17:10 +01:00
bandwidthmanager.h Fix the il branch merge: Move the bandwidthmanager to libsync 2014-11-08 10:52:14 +01:00
clientproxy.cpp Merge remote-tracking branch 'origin/1.7' 2014-10-28 23:27:58 -04:00
clientproxy.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
CMakeLists.txt Merge remote-tracking branch 'origin/master' into crashreporter 2014-11-11 23:53:38 +01:00
connectionvalidator.cpp Merge branch '1.7' 2014-09-18 17:10:21 +02:00
connectionvalidator.h Merge branch '1.7' 2014-09-18 17:10:21 +02:00
cookiejar.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
cookiejar.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
discoveryphase.cpp Merge remote-tracking branch 'origin/1.7' 2014-10-28 23:27:58 -04:00
discoveryphase.h Merge remote-tracking branch 'origin/1.7' 2014-10-22 10:41:55 +02:00
filesystem.cpp Merge remote-tracking branch 'origin/1.7' 2014-11-06 19:54:20 +01:00
filesystem.h Merge remote-tracking branch 'origin/1.7' 2014-11-06 19:54:20 +01:00
logger.cpp Merge remote-tracking branch 'origin/1.7' 2014-10-22 10:41:55 +02:00
logger.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
mirallaccessmanager.cpp Merge remote-tracking branch 'origin/il' 2014-11-08 10:48:36 +01:00
mirallaccessmanager.h Merge remote-tracking branch 'origin/il' 2014-11-08 10:48:36 +01:00
mirallconfigfile.cpp Merge remote-tracking branch 'origin/master' into crashreporter 2014-11-11 23:53:38 +01:00
mirallconfigfile.h Merge remote-tracking branch 'origin/master' into crashreporter 2014-11-11 23:53:38 +01:00
networkjobs.cpp Parallel DELETE 2014-11-11 13:19:29 +01:00
networkjobs.h Parallel MOVE by porting the job to qnam 2014-11-11 16:09:01 +01:00
owncloudpropagator_p.h Split propagator_qnam.cpp into propagateupload.cpp and propagatedownload.cpp 2014-11-11 12:17:10 +01:00
owncloudpropagator.cpp Parallel MOVE by porting the job to qnam 2014-11-11 16:09:01 +01:00
owncloudpropagator.h Merge remote-tracking branch 'origin/il' 2014-11-08 10:48:36 +01:00
owncloudtheme.cpp Merge remote-tracking branch 'origin/1.7' 2014-10-22 10:41:55 +02:00
owncloudtheme.h Merge branch '1.7' 2014-08-29 20:40:33 +02:00
ownsql.cpp Merge remote-tracking branch 'origin/1.7' 2014-10-28 23:27:58 -04:00
ownsql.h Merge remote-tracking branch 'origin/1.7' 2014-10-28 23:27:58 -04:00
progressdispatcher.cpp Merge remote-tracking branch 'origin/1.7' 2014-08-27 18:22:07 +02:00
progressdispatcher.h Merge branch '1.7' 2014-08-29 20:40:33 +02:00
propagatedownload.cpp Parallel DELETE 2014-11-11 13:19:29 +01:00
propagatedownload.h Split propagator_qnam.cpp into propagateupload.cpp and propagatedownload.cpp 2014-11-11 12:17:10 +01:00
propagateremotedelete.cpp DELETE: Error out if the HTTP code is not 204 2014-11-11 14:32:25 +01:00
propagateremotedelete.h Parallel DELETE 2014-11-11 13:19:29 +01:00
propagateremotemove.cpp MOVE: fix moving with special character. 2014-11-11 16:27:06 +01:00
propagateremotemove.h Parallel MOVE by porting the job to qnam 2014-11-11 16:09:01 +01:00
propagateupload.cpp Split propagator_qnam.cpp into propagateupload.cpp and propagatedownload.cpp 2014-11-11 12:17:10 +01:00
propagateupload.h Split propagator_qnam.cpp into propagateupload.cpp and propagatedownload.cpp 2014-11-11 12:17:10 +01:00
propagator_legacy.cpp Split propagator_qnam.cpp into propagateupload.cpp and propagatedownload.cpp 2014-11-11 12:17:10 +01:00
propagator_legacy.h Merge branch 'master' into move_lib_to_sep_dir 2014-08-12 21:08:44 +02:00
propagatorjobs.cpp Parallel MOVE by porting the job to qnam 2014-11-11 16:09:01 +01:00
propagatorjobs.h Parallel MOVE by porting the job to qnam 2014-11-11 16:09:01 +01:00
quotainfo.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
quotainfo.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
syncengine.cpp Merge remote-tracking branch 'origin/il' 2014-11-08 10:48:36 +01:00
syncengine.h Merge remote-tracking branch 'origin/il' 2014-11-08 10:48:36 +01:00
syncfileitem.h Merge remote-tracking branch 'origin/il' 2014-11-08 10:48:36 +01:00
syncfilestatus.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
syncfilestatus.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
syncjournaldb.cpp Merge the long PUT Poll URL feature with the new sql backend 2014-11-08 11:09:50 +01:00
syncjournaldb.h Merge remote-tracking branch 'origin/il' 2014-11-08 10:48:36 +01:00
syncjournalfilerecord.cpp Fix clang warnings 2014-11-08 11:21:48 +01:00
syncjournalfilerecord.h SyncJournalDB: Add filesize column to metadata. 2014-10-29 09:53:36 +01:00
syncresult.cpp Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir 2014-08-26 11:29:42 +02:00
syncresult.h Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir 2014-08-26 11:29:42 +02:00
theme.cpp Switch monochrome systray icon color depending on systray brightness. 2014-10-24 21:52:41 +02:00
theme.h Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir 2014-08-26 11:29:42 +02:00
utility_mac.cpp Switch monochrome systray icon color depending on systray brightness. 2014-10-24 21:52:41 +02:00
utility_unix.cpp Switch monochrome systray icon color depending on systray brightness. 2014-10-24 21:52:41 +02:00
utility_win.cpp Switch monochrome systray icon color depending on systray brightness. 2014-10-24 21:52:41 +02:00
utility.cpp Merge remote-tracking branch 'origin/master' into crashreporter 2014-11-11 23:53:38 +01:00
utility.h Merge remote-tracking branch 'origin/master' into crashreporter 2014-11-11 23:53:38 +01:00
version.h.in Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00