Kenneth Skovhede
d01e8f19c4
Fixed an issue after the merge conflict ...
2018-06-08 11:21:43 +02:00
Kenneth Skovhede
9485339659
Fixed an issue after the merge conflict
2018-06-08 11:20:03 +02:00
Kenneth Skovhede
bce1db123a
Merge branch 'master' into feature/speedup_backup_index_files
...
# Conflicts:
# Duplicati/Library/Utility/Utility.cs
2018-06-08 10:31:27 +02:00
Kenneth Skovhede
6691d67b82
Merge branch 'feature/potential_fix_3202'
2018-06-08 10:29:25 +02:00
Kenneth Skovhede and GitHub
1f1bcce671
Merge pull request #3244 from verhoek/feature/tempdir
...
feature tempdir for backend + fix preliminary erasing of callcontextsettings
2018-06-08 10:13:32 +02:00
Kenneth Skovhede
ec63b901e3
Merge branch 'master' of github.com:duplicati/duplicati
2018-06-08 10:10:21 +02:00
Kenneth Skovhede
a41c816369
Merge branch 'feature/remove-symlink-metadata-restore'
...
This fixes #3127
2018-06-08 10:07:57 +02:00
Kenneth Skovhede
3fe1f415f4
Merge branch 'feature/b2-input-validation'
2018-06-08 10:06:42 +02:00
verhoek
3fb7175931
Merge remote-tracking branch 'origin/master' into feature/tempdir
...
# Conflicts:
# Duplicati/Server/Runner.cs (copied readonly prop)
2018-06-07 16:37:40 +02:00
verhoek
ca55179f4b
Adjusted according to review comment to keep tempfolder for storing task config around, removed trailing white space.
2018-06-07 16:32:39 +02:00
Kenneth Skovhede
4e94c5a331
Changed a bit around the volume size picker to reduce confusion as to what it does.
2018-06-07 14:56:12 +02:00
Kenneth Skovhede and GitHub
061bc38f1c
Merge pull request #3256 from warwickmm/use_stream_read_helper
...
Use helper method to read from Streams and add unit tests
2018-06-07 13:42:54 +02:00
Kenneth Skovhede and GitHub
c5c13ab242
Merge pull request #3257 from warwickmm/remove_redundant_tostring
...
Remove redundant calls to ToString
2018-06-07 13:36:20 +02:00
Kenneth Skovhede and GitHub
0debc73df0
Merge pull request #3259 from tygill/fix/oauth-client-readwritetimeout
...
Fix typo in OAuthHttpClient
2018-06-07 13:35:46 +02:00
Kenneth Skovhede
bebe0d8772
Added check to avoid restoring metadata on a symlink, as that would change the symlink target, not the symlink itself.
...
Added an option to revert to the previous behaviour as well.
2018-06-07 13:32:25 +02:00
Kenneth Skovhede
af3e9cdfdc
Added input validation for B2 paths to avoid users ending up with weird error messages, once the full path for each file is constructed.
2018-06-07 13:14:11 +02:00
Kenneth Hsu
1605dc8ede
Use utility method to read from stream.
2018-06-06 19:54:45 -07:00
Kenneth Skovhede
b534c5649e
Fixed a shared buffer being re-used for multiple results.
2018-06-06 08:37:09 +02:00
Kenneth Hsu
214e4c0428
Add test for reading stream into buffer.
2018-06-04 20:35:22 -07:00
Kenneth Hsu
08a897d7b0
Remove redundant calls to ToString.
2018-06-04 20:15:34 -07:00
Tyler Gill
5be38df560
Fix typo in OAuthHttpClient
2018-06-04 14:59:58 -06:00
verhoek
3ab394ed7d
Adjust according to review comments - prevent creating tempfolder when not needed.
...
Moved out one of multiple responsibilities out of function.
2018-06-04 18:03:24 +02:00
Kenneth Skovhede
d042e70ca2
Changed the returned IEnumerable values to be fully created, which avoids issues with locks and transactions being prematurely released.
...
This might help with #3202
2018-06-04 11:56:54 +02:00
Kenneth Skovhede
e6535e2cfa
Merge branch 'master' of github.com:duplicati/duplicati
...
# Conflicts:
# Duplicati/Server/WebServer/RESTMethods/UISettings.cs
2018-06-04 10:48:11 +02:00
Kenneth Skovhede
8da3f61346
Merge branch 'warwickmm-fix_line_endings'
2018-06-04 10:45:44 +02:00
Kenneth Skovhede and GitHub
b6a250db95
Merge pull request #3253 from warwickmm/missing_format_item_value
...
Provide missing values to format items
2018-06-04 10:42:34 +02:00
Kenneth Skovhede and GitHub
448d37f7cb
Merge pull request #3252 from warwickmm/remove_string_format
...
Remove unnecessary calls to String.Format
2018-06-04 10:42:02 +02:00
Kenneth Skovhede and GitHub
66e5dfe722
Merge pull request #3237 from tygill/fix/msgraph-delete-error
...
(MS Graph) When the delete operation fails due to a 'file not found' error, we don't need to bubble up an exception
2018-06-04 10:41:16 +02:00
Kenneth Skovhede and GitHub
3b6c2b61d5
Merge pull request #3242 from warwickmm/remove_ineffective_statements
...
Remove ineffective statements
2018-06-04 10:40:32 +02:00
Tyler Gill
f2f5d4c0a6
Change from swallowing delete errors to wrapping DriveItemNotFoundException in FileMissingException.
...
This way, the regular backend manager logic can handle and log the delete of a non-existant file.
Also update some of the other operations to throw FileMissingException (rather than the backend specific DriveItemNotFoundException).
2018-06-02 15:52:20 -06:00
Kenneth Hsu
afdae80716
Fix line ending issues.
2018-06-02 13:19:49 -07:00
Kenneth Hsu
e2b671bf9e
Provide missing values to format items.
2018-06-02 12:05:57 -07:00
Kenneth Hsu
20f2f37806
Remove unnecessary calls to String.Format.
2018-06-02 12:02:55 -07:00
Kenneth Skovhede and GitHub
e70f15287e
Merge pull request #3233 from warwickmm/make_fields_readonly
...
Mark fields that shouldn't be reassigned as readonly
2018-06-02 10:13:06 +02:00
Kenneth Skovhede and GitHub
018c01cfa9
Merge pull request #3234 from warwickmm/equals_instead_of_equality
...
Use Equals to compare CultureInfo instances
2018-06-02 10:10:59 +02:00
Kenneth Skovhede and GitHub
b2f1862584
Merge pull request #3238 from tygill/fix/help-logging
...
Update 'help logging' to mention --log-file-log-level and --console-log-level rather than the older --log-level
2018-06-02 10:10:32 +02:00
Kenneth Skovhede and GitHub
f8ef261f50
Merge pull request #3243 from warwickmm/remove_redundant_expression
...
Remove redundant expression
2018-06-02 10:08:29 +02:00
verhoek
4a0d6a2f5b
Inline var declaration.
2018-05-27 13:12:59 +02:00
verhoek
6287d369b1
Reverted accidental removing of static for SystemContextSettings.
2018-05-27 13:12:06 +02:00
verhoek
625db54f14
Throw proper exception. Removed unused imports.
2018-05-27 13:10:01 +02:00
verhoek
a9b88ab2ab
Return default settings in case no startcontext was previously called
...
by returning a null contextid.
2018-05-27 10:23:22 +02:00
verhoek
a108e328b6
Fix codacy issues.
2018-05-26 23:27:39 +02:00
verhoek
3fd6c3c602
Merge remote-tracking branch 'origin' into feature/tempdir
2018-05-26 22:55:29 +02:00
verhoek
e80f30f8a9
Added multiple context setting keys to callcontextsettings, exploiting
...
reflection. Contextsettings don't destroy each other anymore.
2018-05-26 21:56:15 +02:00
Kenneth Hsu
77443f61f6
Remove redundant expression.
2018-05-26 10:52:11 -07:00
Kenneth Hsu
bbe65f9dfb
Remove ineffective statements.
...
The removed code was introduced in revision ba58651e5a ("Fix for
CreateFolder with SSH"), presumably to fix an issue where some SSH
backends did not like the trailing slash when creating new folders.
However, since we are not using the output argument of the call to
Substring, these statements have no effect.
2018-05-26 10:36:50 -07:00
Kenneth Hsu
f12858e6a5
Mark fields that shouldn't be reassigned as readonly.
...
This makes it explicit at compile-time that these fields should not be
reassigned outside the constructor.
2018-05-25 10:04:52 -07:00
Kenneth Hsu
ee8788d08e
Use Equals to compare CultureInfo instances.
...
Since the Equals method is overridden in the CultureInfo class, we
should use it instead of the == operator to compare two instances.
2018-05-25 10:04:28 -07:00
Tyler Gill
f94a58d98c
Update 'help logging' to mention --log-file-log-level and --console-log-level rather than the older --log-level
2018-05-25 09:49:53 -06:00
Tyler Gill
8131e85581
(MS Graph) When the delete operation fails due to a 'file not found' error, we don't need to bubble up an exception.
2018-05-25 09:18:20 -06:00