mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-27 23:17:13 +03:00
Code Issues Projects Releases Packages Wiki Activity
nextcloud-desktop/src/libsync
History
Christian Kamm 53195b064a Conflicts: Upload them files if env variable says so 
Set OWNCLOUD_UPLOAD_CONFLICT_FILES=1 to trigger this behavior.

Note that this is experimental and unsupported. The real feature is
likely to end up in 2.5.

Uploading conflict files is simply done by removing the pattern from
csync_exclude. The rest here deals with making the conflict notification
ui approximately work.

There are still some concerns about where an uploaded conflict file
appears in the sync protocol and issues list (it should be in both, but
is only in one of them currently!).

See #4557.
2017-09-19 11:45:38 +02:00
..
creds Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
abstractnetworkjob.cpp AbstractNetworkJob: Allow relative redirect 2017-09-15 15:25:10 +02:00
abstractnetworkjob.h OAuth: Use redirectable jobs for oauth token management 2017-09-15 09:28:03 +02:00
accessmanager.cpp remove qt4 code 2017-09-15 07:11:05 +02:00
accessmanager.h Apply clang-format 2017-05-17 12:26:27 +02:00
account.cpp Private links: Retrieve link through propfind property #6020 2017-09-19 10:51:03 +02:00
account.h Private links: Retrieve link through propfind property #6020 2017-09-19 10:51:03 +02:00
accountfwd.h License: Adjust license of GPLv2 source files to GPLv2+ 2016-10-25 11:06:54 +02:00
bandwidthmanager.cpp Move Utility to a new common static library 2017-09-05 17:25:19 +02:00
bandwidthmanager.h Apply clang-format 2017-05-17 12:26:27 +02:00
capabilities.cpp Private links: Retrieve link through propfind property #6020 2017-09-19 10:51:03 +02:00
capabilities.h Private links: Retrieve link through propfind property #6020 2017-09-19 10:51:03 +02:00
clientproxy.cpp Apply clang-format 2017-05-17 12:26:27 +02:00
clientproxy.h Move Utility to a new common static library 2017-09-05 17:25:19 +02:00
CMakeLists.txt Fix the build (make install) 2017-09-18 15:32:05 +02:00
configfile.cpp Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
configfile.h Move Utility to a new common static library 2017-09-05 17:25:19 +02:00
connectionvalidator.cpp Update server url in case of permanent redirection #5972 2017-09-11 19:27:36 +02:00
connectionvalidator.h Credentials: Simplify credential flow #5728 2017-05-22 10:52:18 +02:00
cookiejar.cpp Apply clang-format 2017-05-17 12:26:27 +02:00
cookiejar.h Apply clang-format 2017-05-17 12:26:27 +02:00
discoveryphase.cpp Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
discoveryphase.h Replace the custom rbtree by a std::map 2017-09-18 11:46:09 +02:00
excludedfiles.cpp Move Utility to a new common static library 2017-09-05 17:25:19 +02:00
excludedfiles.h Compile almost all of csync as C++ 2017-08-22 15:22:56 +02:00
filesystem.cpp Move non-csync-dependent parts of FileSystem to src/common 2017-09-18 14:00:52 +02:00
filesystem.h Move non-csync-dependent parts of FileSystem to src/common 2017-09-18 14:00:52 +02:00
libsync.md Structure developer documentation 2015-06-29 18:43:21 +02:00
logger.cpp remove qt4 code 2017-09-15 07:11:05 +02:00
logger.h Move Utility to a new common static library 2017-09-05 17:25:19 +02:00
networkjobs.cpp OAuth: Use redirectable jobs for oauth token management 2017-09-15 09:28:03 +02:00
networkjobs.h OAuth: Use redirectable jobs for oauth token management 2017-09-15 09:28:03 +02:00
owncloudpropagator.cpp Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
owncloudpropagator.h Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
owncloudpropagator_p.h Apply clang-format 2017-05-17 12:26:27 +02:00
owncloudtheme.cpp Move Utility to a new common static library 2017-09-05 17:25:19 +02:00
owncloudtheme.h Apply clang-format 2017-05-17 12:26:27 +02:00
progressdispatcher.cpp Make DetailError different from BlacklistedError 2017-09-15 09:27:07 +02:00
progressdispatcher.h Remove SyncFileItem::_isDirectory 2017-09-18 11:46:09 +02:00
propagatedownload.cpp Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
propagatedownload.h Compare the hash of files with identical mtime/size #5589 2017-06-15 13:54:16 +02:00
propagateremotedelete.cpp Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
propagateremotedelete.h Remove SyncFileItem::_isDirectory 2017-09-18 11:46:09 +02:00
propagateremotemkdir.cpp Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
propagateremotemkdir.h Apply clang-format 2017-05-17 12:26:27 +02:00
propagateremotemove.cpp Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
propagateremotemove.h Remove SyncFileItem::_isDirectory 2017-09-18 11:46:09 +02:00
propagateupload.cpp Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
propagateupload.h remove qt4 code 2017-09-15 07:11:05 +02:00
propagateuploadng.cpp Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
propagateuploadv1.cpp Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
propagatorjobs.cpp Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
propagatorjobs.h Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
syncengine.cpp Conflicts: Upload them files if env variable says so 2017-09-19 11:45:38 +02:00
syncengine.h Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
syncfileitem.cpp Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
syncfileitem.h Reverse the dependency between SyncJournalFileRecord and SyncFileItem 2017-09-18 14:00:52 +02:00
syncfilestatus.cpp Revert "Revert "Discovery: consider also the "shared by me" as shared"" 2017-07-25 12:11:33 +02:00
syncfilestatus.h Revert "Revert "Discovery: consider also the "shared by me" as shared"" 2017-07-25 12:11:33 +02:00
syncfilestatustracker.cpp Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
syncfilestatustracker.h Move SyncJournalDB to src/common 2017-09-18 14:00:52 +02:00
syncresult.cpp Remove SyncFileItem::_isDirectory 2017-09-18 11:46:09 +02:00
syncresult.h Conflicts: Detect and show in issues tab 2017-07-13 11:48:10 +02:00
theme.cpp remove qt4 code 2017-09-15 07:11:05 +02:00
theme.h Authentication with OAuth2 2017-06-01 10:39:33 +02:00