Thomas Suckow
acea2fe10f
upstream
...
Update Telegram SharpAESCrypt dep
Update SystemIOWindows to split the difference
# Conflicts:
# BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj
# BuildTools/AutoUpdateBuilder/packages.config
# BuildTools/DependencyFinder/DependencyFinder.csproj
# BuildTools/DependencyFinder/packages.config
# BuildTools/GnupgSigningTool/GnupgSigningTool.csproj
# BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj
# BuildTools/UpdateVersionStamp/app.config
# Duplicati/CommandLine/BackendTester/Duplicati.CommandLine.BackendTester.csproj
# Duplicati/CommandLine/BackendTester/app.config
# Duplicati/CommandLine/BackendTool/Duplicati.CommandLine.BackendTool.csproj
# Duplicati/CommandLine/BackendTool/app.config
# Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj
# Duplicati/CommandLine/Duplicati.CommandLine.csproj
# Duplicati/CommandLine/RecoveryTool/Duplicati.CommandLine.RecoveryTool.csproj
# Duplicati/CommandLine/RecoveryTool/packages.config
# Duplicati/CommandLine/app.config
# Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
# Duplicati/GUI/Duplicati.GUI.TrayIcon/app.config
# Duplicati/GUI/Duplicati.GUI.TrayIcon/packages.config
# Duplicati/Library/AutoUpdater/Duplicati.Library.AutoUpdater.csproj
# Duplicati/Library/AutoUpdater/app.config
# Duplicati/Library/AutoUpdater/packages.config
# Duplicati/Library/Backend/AlternativeFTP/Duplicati.Library.Backend.AlternativeFTP.csproj
# Duplicati/Library/Backend/AlternativeFTP/app.config
# Duplicati/Library/Backend/AlternativeFTP/packages.config
# Duplicati/Library/Backend/AzureBlob/Duplicati.Library.Backend.AzureBlob.csproj
# Duplicati/Library/Backend/AzureBlob/packages.config
# Duplicati/Library/Backend/Backblaze/Duplicati.Library.Backend.Backblaze.csproj
# Duplicati/Library/Backend/Backblaze/packages.config
# Duplicati/Library/Backend/Box/Duplicati.Library.Backend.Box.csproj
# Duplicati/Library/Backend/Box/packages.config
# Duplicati/Library/Backend/CloudFiles/Duplicati.Library.Backend.CloudFiles.csproj
# Duplicati/Library/Backend/CloudFiles/app.config
# Duplicati/Library/Backend/Dropbox/Duplicati.Library.Backend.Dropbox.csproj
# Duplicati/Library/Backend/Dropbox/packages.config
# Duplicati/Library/Backend/FTP/Duplicati.Library.Backend.FTP.csproj
# Duplicati/Library/Backend/FTP/app.config
# Duplicati/Library/Backend/File/Duplicati.Library.Backend.File.csproj
# Duplicati/Library/Backend/File/app.config
# Duplicati/Library/Backend/GoogleServices/Duplicati.Library.Backend.GoogleServices.csproj
# Duplicati/Library/Backend/GoogleServices/packages.config
# Duplicati/Library/Backend/HubiC/Duplicati.Library.Backend.HubiC.csproj
# Duplicati/Library/Backend/Jottacloud/Duplicati.Library.Backend.Jottacloud.csproj
# Duplicati/Library/Backend/Mega/Duplicati.Library.Backend.Mega.csproj
# Duplicati/Library/Backend/Mega/packages.config
# Duplicati/Library/Backend/OAuthHelper/Duplicati.Library.OAuthHelper.csproj
# Duplicati/Library/Backend/OAuthHelper/packages.config
# Duplicati/Library/Backend/OneDrive/Duplicati.Library.Backend.OneDrive.csproj
# Duplicati/Library/Backend/OneDrive/packages.config
# Duplicati/Library/Backend/OpenStack/Duplicati.Library.Backend.OpenStack.csproj
# Duplicati/Library/Backend/OpenStack/packages.config
# Duplicati/Library/Backend/Rclone/Duplicati.Library.Backend.Rclone.csproj
# Duplicati/Library/Backend/Rclone/packages.config
# Duplicati/Library/Backend/S3/Duplicati.Library.Backend.S3.csproj
# Duplicati/Library/Backend/S3/app.config
# Duplicati/Library/Backend/S3/packages.config
# Duplicati/Library/Backend/SSHv2/Duplicati.Library.Backend.SSHv2.csproj
# Duplicati/Library/Backend/SSHv2/packages.config
# Duplicati/Library/Backend/SharePoint/Duplicati.Library.Backend.SharePoint.csproj
# Duplicati/Library/Backend/SharePoint/app.config
# Duplicati/Library/Backend/Sia/Duplicati.Library.Backend.Sia.csproj
# Duplicati/Library/Backend/Sia/packages.config
# Duplicati/Library/Backend/TahoeLAFS/Duplicati.Library.Backend.TahoeLAFS.csproj
# Duplicati/Library/Backend/TahoeLAFS/packages.config
# Duplicati/Library/Backend/Tardigrade/Duplicati.Library.Backend.Tardigrade.csproj
# Duplicati/Library/Backend/Tardigrade/packages.config
# Duplicati/Library/Backend/WEBDAV/Duplicati.Library.Backend.WEBDAV.csproj
# Duplicati/Library/Backend/WEBDAV/app.config
# Duplicati/Library/Common/Duplicati.Library.Common.csproj
# Duplicati/Library/Common/IO/SystemIOWindows.cs
# Duplicati/Library/Common/app.config
# Duplicati/Library/Common/packages.config
# Duplicati/Library/Compression/Duplicati.Library.Compression.csproj
# Duplicati/Library/Compression/app.config
# Duplicati/Library/Compression/packages.config
# Duplicati/Library/DynamicLoader/Duplicati.Library.DynamicLoader.csproj
# Duplicati/Library/DynamicLoader/app.config
# Duplicati/Library/Encryption/Duplicati.Library.Encryption.csproj
# Duplicati/Library/Encryption/packages.config
# Duplicati/Library/Interface/Duplicati.Library.Interface.csproj
# Duplicati/Library/Localization/Duplicati.Library.Localization.csproj
# Duplicati/Library/Localization/packages.config
# Duplicati/Library/Logging/Duplicati.Library.Logging.csproj
# Duplicati/Library/Logging/app.config
# Duplicati/Library/Main/Duplicati.Library.Main.csproj
# Duplicati/Library/Main/app.config
# Duplicati/Library/Main/packages.config
# Duplicati/Library/Modules/Builtin/Duplicati.Library.Modules.Builtin.csproj
# Duplicati/Library/Modules/Builtin/packages.config
# Duplicati/Library/SQLiteHelper/Duplicati.Library.SQLiteHelper.csproj
# Duplicati/Library/Snapshots/Duplicati.Library.Snapshots.csproj
# Duplicati/Library/Snapshots/app.config
# Duplicati/Library/Snapshots/packages.config
# Duplicati/Library/UsageReporter/Duplicati.Library.UsageReporter.csproj
# Duplicati/Library/UsageReporter/packages.config
# Duplicati/Library/Utility/Duplicati.Library.Utility.csproj
# Duplicati/Library/Utility/app.config
# Duplicati/Library/Utility/packages.config
# Duplicati/License/Duplicati.License.csproj
# Duplicati/Server/Duplicati.Server.Serialization/Duplicati.Server.Serialization.csproj
# Duplicati/Server/Duplicati.Server.Serialization/packages.config
# Duplicati/Server/Duplicati.Server.csproj
# Duplicati/Server/app.config
# Duplicati/Server/packages.config
# Duplicati/Service/Duplicati.Service.csproj
# Duplicati/Service/app.config
# Duplicati/Tools/Duplicati.Tools.csproj
# Duplicati/UnitTest/Duplicati.UnitTest.csproj
# Duplicati/UnitTest/RestoreHandlerTests.cs
# Duplicati/UnitTest/app.config
# Duplicati/UnitTest/packages.config
# Duplicati/WindowsService/App.config
# Duplicati/WindowsService/WindowsService.csproj
# Tools/SQLiteTool/App.config
# Tools/SQLiteTool/SQLiteTool.csproj
# thirdparty/TlsTest/TlsTest.csproj
# thirdparty/UnixSupport/UnixSupport.csproj
# thirdparty/mozroots/mozroots.csproj
2020-12-29 09:59:42 -08:00
Thomas Suckow
624a5d698b
Add a catch to prevent the database being locked when migrations fail.
2020-12-28 12:18:58 -08:00
Thomas Suckow
7b40e8df20
Fix naming mismatch causing migrations to not be found
2020-12-28 12:17:33 -08:00
warwickmm and GitHub
45c4f865e8
Merge pull request #4399 from Gurthurb/master
...
Avoid NullReferenceException if an IAsyncResult or WebRequest doesn't contain a WebResponse property
2020-12-27 14:33:12 -08:00
Gurthurb
763ae5cb68
Avoid NullReferenceException if an IAsyncResult or WebRequest doesn't contain a WebResponse property
...
An example of when this happens is when shutting down TrayIcon (using its context menu), at least on Windows. This is quite annoying when debugging with Visual Studio (having the default exception settings).
2020-12-27 22:21:03 +01:00
Kenneth Skovhede and GitHub
d2189933e8
Merge pull request #4392 from warwickmm/fix_edit_uri_backend_config_typo
...
Fix bug in showing OpenStack configuration error dialog
2020-12-19 15:02:31 +01:00
Kenneth Skovhede and GitHub
e070af3dd1
Merge pull request #4386 from warwickmm/catch_symlink_read_error
...
Catch and log exceptions encountered when getting symlink target
2020-12-19 15:02:09 +01:00
Kenneth Skovhede and GitHub
1a476468f4
Merge pull request #4384 from warwickmm/translation_source_extra_backslashes
...
Remove newline characters from HTML strings to fix some translations
2020-12-19 15:01:27 +01:00
Kenneth Skovhede and GitHub
ca073a2d0c
Merge pull request #4380 from warwickmm/fix_purge_broken_files_dry_run
...
Fix error encountered during dry-run of purge-broken-files
2020-12-19 14:44:21 +01:00
Kenneth Skovhede and GitHub
8002d3d225
Merge pull request #4376 from warwickmm/fix_indentation
...
Fix incorrect or misleading indentations
2020-12-19 14:43:31 +01:00
Kenneth Skovhede and GitHub
ae0316b107
Merge pull request #4375 from warwickmm/remove_unreachable_code
...
Remove unreachable code
2020-12-19 14:41:40 +01:00
Kenneth Skovhede and GitHub
d857139783
Merge pull request #4368 from warwickmm/improve_notification_messages
...
Improve some notification messages
2020-12-19 14:41:21 +01:00
Kenneth Skovhede and GitHub
ebc30c7f02
Merge pull request #4366 from warwickmm/improve_missing_source_message
...
Fix misleading error message about missing source path
2020-12-19 14:40:35 +01:00
Kenneth Skovhede and GitHub
1a2e69fd9f
Merge pull request #4357 from warwickmm/fix_run_script_before_remoteurl
...
Fix issue where remote URL defined using run-script-before was ignored
2020-12-19 14:40:01 +01:00
Kenneth Skovhede and GitHub
5af8e1c38b
Merge pull request #4367 from warwickmm/fix_variable_name
...
Fix typo in variable name
2020-12-19 14:39:15 +01:00
Kenneth Hsu
e4f056f3dd
Fix bug in showing OpenStack configuration error dialog.
...
This fixes #4110 .
2020-12-12 15:08:37 -08:00
Kenneth Hsu
a39a24beae
Catch and log exceptions encountered when getting symlink target.
...
Since the GetSymlinkTarget method can throw an exception, we should log
the failure case and avoid further processing of the symlink target.
This concerns #2171 , which describes issues with symlinks created using
Windows Subsystem for Linux.
2020-12-06 10:08:46 -08:00
Kenneth Hsu
8a74df50ad
Remove newline characters from HTML strings.
...
These don't get interpreted as line breaks, and the resulting characters
get converted to \\n in the localization_webroot.pot translation source
file, which prevents translation of these strings.
This concerns the following comment in issue #2209 :
https://github.com/duplicati/duplicati/issues/2209#issuecomment-590856779
2020-12-05 14:23:44 -08:00
Kenneth Hsu
780f53b89a
Add test for purging broken files with dry-run.
...
This concerns #4379 .
2020-11-30 19:56:08 -08:00
Kenneth Hsu
9952babf0b
Commit or rollback transaction before beginning new ones.
...
The PurgeFilesHandler begins new transactions using the same database
connection. During a dry-run, these transactions are rolled back, and a
subsequent attempt to rollback in the PurgeBrokenFilesHandler then
resulted in an exception.
To avoid this, we perform the rollback in the PurgeBrokenFilesHandler as
soon as we can.
I'm not entirely confident that this is the correct fix, but it appears
to resolve issue #4379 .
This fixes #4379 .
2020-11-30 19:55:20 -08:00
warwickmm and GitHub
7d958adb8a
Merge pull request #4372 from apreiml/master
...
Improve wording of the remote volume size description
2020-11-26 09:17:23 -08:00
warwickmm and GitHub
1c3065aa81
Merge pull request #4336 from barfoo4711/master
...
Add logging statements for issues encountered when restoring empty files.
2020-11-22 10:23:06 -08:00
Kenneth Hsu
47270d1979
Change log level for entry regarding restoring empty files.
...
Restoring empty files is expected to be quick, so profiling is not
necessary.
2020-11-22 09:05:25 -08:00
Kenneth Hsu
8b010888e2
Make log entries for restore errors consistent.
...
This concerns #4315 .
2020-11-22 09:05:25 -08:00
Kenneth Hsu
31a4eab7e7
Fix casing in log entry.
2020-11-22 09:05:25 -08:00
Kenneth Hsu
5951047ff1
Fix incorrect or misleading indentations.
...
This also adds braces to clarify scope where beneficial.
2020-11-21 13:58:16 -08:00
Kenneth Hsu
6876d765b0
Remove unreachable code.
2020-11-21 13:41:57 -08:00
Armin Preiml
3953c635ab
better description fo the Remote Volume Size description
2020-11-20 13:57:07 +01:00
Armin Preiml
cc23ed2c4b
remove executable flag from addoredit.html
2020-11-20 13:54:36 +01:00
Kenneth Hsu
1e2e0f8763
Improve notification title message to indicate warning or error.
2020-11-15 15:44:26 -08:00
Kenneth Hsu
560c995763
Improve some error and warning notification messages.
...
While this is more verbose and contains some elements that aren't
relevant to the user (e.g., class namespaces), it is arguably more
useful than just seeing "Got 1 warning(s)".
2020-11-15 15:30:14 -08:00
Kenneth Hsu
61056dd14c
Clean up indentation and formatting.
2020-11-15 15:11:01 -08:00
Kenneth Hsu
20e599586a
Fix typo in variable name.
2020-11-15 12:23:46 -08:00
Kenneth Hsu
14de767738
Fix misleading error message about missing source path.
...
The source path can be a file, so the error message should not assume
that the path represents a folder. This also provides the user with
some hints on what steps should be taken to address the issue.
This fixes #3522 .
2020-11-15 12:21:05 -08:00
warwickmm and GitHub
7d1d256315
Merge pull request #4360 from martikyan/telegram-double-account-fix
...
Fix issue with Telegram backend and multiple accounts.
2020-11-12 16:25:09 -08:00
Karen Martikyan
0f138a1cfb
default literal fix for build check pass
2020-11-09 22:11:10 +04:00
Karen Martikyan
74ec1e078f
Fixed problems while using few different accounts for storing files.
2020-11-09 22:05:43 +04:00
Karen Martikyan
39fb3bdbae
Merge branch 'master' of https://github.com/martikyan/duplicati
2020-11-09 20:42:59 +04:00
warwickmm and GitHub
c7f9f8f556
Merge pull request #4324 from martikyan/feature/telegram_backend
...
Add support for Telegram channels as a backend destination.
2020-11-08 17:59:37 -08:00
Karen Martikyan
812d698aba
Removed SystemExtensions.cs, using Utility.Utility
2020-11-09 00:28:10 +04:00
Karen Martikyan
1feb75002d
Fixed bug connected with finding minimal element in an empty list
2020-11-09 00:16:00 +04:00
Karen Martikyan
e1b2a190ad
Retrieval of epoch moved to extensions
2020-11-08 23:27:29 +04:00
Karen Martikyan
1bc6e20a57
Fixed possible bug connected with retrieval more than 100 messages from a channel
2020-11-08 23:14:39 +04:00
Karen Martikyan
1d106e8163
PR comments fixed: minor changes
2020-11-08 16:50:29 +04:00
Karen Martikyan
8187f66c60
Removed redundant package dependency
2020-11-07 18:45:45 +04:00
Karen Martikyan
a9ac5ff12a
Small intend fix v2
2020-11-07 18:32:22 +04:00
Karen Martikyan
1332940f73
Small intend fix
2020-11-07 18:26:50 +04:00
Karen Martikyan
035e34f1de
Improvements made, bugfixes made
2020-11-07 18:03:58 +04:00
Karen Martikyan
9017878a3c
Small fixes, redundant extension removed
2020-11-07 14:54:33 +04:00
Karen Martikyan
64ccc60fd2
Undone changes to Log.cs
2020-11-07 14:32:03 +04:00
Thomas Suckow