haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,427 Commits 140 Branches 416 Tags
bbe65f9dfb9b78cff1e6367894de7730bc139199
Commit Graph
9 Commits
Author SHA1 Message Date
Daniel Gehriger 0b43c467c7 Merge remote-tracking branch 'upstream/master' into feature/usn 2018-04-25 17:19:13 +02:00
Kenneth Skovhede 83950e78c6 Merge branch 'feature/ignore_filenames_option' into feature/exclude_empty_folders 
# Conflicts:
#	Duplicati/Library/Main/Operation/Backup/CountFilesHandler.cs
#	Duplicati/Library/Main/Operation/Backup/FileEnumerationProcess.cs
#	Duplicati/Library/Main/Operation/BackupHandler.cs
#	Duplicati/Library/Main/Operation/TestFilterHandler.cs
#	Duplicati/Library/Main/Options.cs
#	Duplicati/Library/Main/Strings.cs
 2018-04-24 14:46:46 +02:00
Kenneth Skovhede c6be934747 Implemented empty folder exclusion flag 2018-04-24 13:11:03 +02:00
Kenneth Skovhede e51e1b9e5a Implemented option to use exclude filenames to mark folders for exclusion by placing a specially named file inside 2018-04-24 11:25:37 +02:00
Daniel Gehriger 1af7f9e0ca Merge remote-tracking branch 'upstream/master' into feature/usn 2018-04-23 22:28:27 +02:00
Kenneth Skovhede 9eef035924 Fixed a case where the counter process would eat the output from the backup operation 2018-04-11 23:34:51 +02:00
Kenneth Skovhede 79f7b22e0f Merge branch 'master' into concurrent_processing 
Changed a few things on the way, removing the log process

# Conflicts:
#	Duplicati/Library/Main/Controller.cs
#	Duplicati/Library/Main/Database/ExtensionMethods.cs
#	Duplicati/Library/Main/Database/LocalBackupDatabase.cs
#	Duplicati/Library/Main/Duplicati.Library.Main.csproj
#	Duplicati/Library/Main/Operation/BackupHandler.cs
#	Duplicati/Library/Main/Operation/FilelistProcessor.cs
#	Duplicati/Library/Main/Operation/PurgeBrokenFilesHandler.cs
#	Duplicati/Library/Main/Operation/TestFilterHandler.cs
#	Duplicati/Library/Main/Options.cs
#	Duplicati/Library/Main/ResultClasses.cs
#	Duplicati/UnitTest/BasicSetupHelper.cs
 2018-04-11 23:02:47 +02:00
Kenneth Skovhede a3f2b39d23 Implemented handling of pause/stop/abort in the concurrent code. 
Implemented the dry-run feature for backups.
 2016-02-29 21:52:11 +01:00
Kenneth Skovhede 537fe20838 Added a lot of comments. 
Fixed a few issues that caused parallel uploads.
Fixed the use of the encryption module so the encryption module is not re-used for multiple jobs.
 2016-02-25 19:15:51 +01:00