Commit Graph

28 Commits

Author SHA1 Message Date
c1b7ea5a9a Storage: moved from 08a01422 2021-05-21 16:26:42 +03:00
a5c6ba5dcc Common, db: moved from 08a01422 2021-05-17 14:35:00 +03:00
3aae413e12 replace Path.Combine to CrossPlatform.PathCombine 2021-04-16 16:26:26 +03:00
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
0fae06b2bf fix storage 2020-12-22 15:51:04 +03:00
d39c2524c3 Files: refactoring 2020-12-04 13:52:07 +03:00
0000129b3b Merge branch 'master' into feature/release-11.0.0
# Conflicts:
#	common/ASC.Core.Common/Context/WorkContext.cs
#	common/ASC.Core.Common/Tenants/TenantControlPanelSettings.cs
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/Encryption/Crypt.cs
#	common/ASC.Data.Storage/Encryption/CryptoStreamWrapper.cs
#	common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
#	common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
#	common/ASC.Data.Storage/Encryption/EncryptionSettings.cs
#	common/ASC.Data.Storage/Encryption/ICrypt.cs
#	common/ASC.Data.Storage/Encryption/IEncryptionService.cs
#	common/ASC.Data.Storage/Encryption/IMetadata.cs
#	common/ASC.Data.Storage/Encryption/IntegrityProtectionException.cs
#	common/ASC.Data.Storage/Encryption/Metadata.cs
#	common/ASC.Data.Storage/Encryption/StreamWrapper.cs
#	config/storage.json
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/PublicResources/webstudio_patterns.xml
2020-09-20 20:17:12 +03:00
54cf80dafa Encrypt: fix 2020-09-16 16:32:46 +03:00
SuhorukovAnton
8e0ebceb36 encryption: copyright 2020-09-16 10:54:52 +03:00
dc6b0d2c6c ASC.Data.Storage moved from release/11 4414f77b 2020-09-15 18:16:37 +03:00
SuhorukovAnton
eb18133e4b encryption: bugfix 2020-09-14 13:32:20 +03:00
SuhorukovAnton
2d3f183567 Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-07 17:00:48 +03:00
SuhorukovAnton
15b17a0478 Encryption: first version 2020-09-02 13:54:50 +03:00
maksim
326d352a7c Migration: registering dependencies in program 2020-08-20 16:53:39 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
1526d8e502 Common: removed StreamCopyTo 2020-05-06 11:41:27 +03:00
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00
219036d4a4 DI: HttpContext 2019-10-18 11:48:27 +03:00
6b2f6b0a7b DI: log 2019-10-17 18:55:35 +03:00
6de13b9d50 DI: configuration 2019-09-23 15:20:08 +03:00
3e0f946372 DI: PathUtils 2019-09-21 19:39:17 +03:00
e7b7cabdd2 DI: TenantManager 2019-09-20 17:04:06 +03:00
9e32ad4b6c IDE0063 2019-08-15 18:08:40 +03:00
b426004f70 IDE0019, IDE0020 2019-08-15 16:41:38 +03:00
ed7ed484e8 IDE0049 2019-08-15 16:16:39 +03:00
58fb60ba65 IDE0007 2019-08-15 16:03:57 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
9b3506ab0c ASC.Data.Storage: init commit. 2019-06-04 17:43:20 +03:00