Commit Graph

229 Commits

Author SHA1 Message Date
SuhorukovAnton
9b6ccc19f0 fix-messages: IDE0074 2020-09-29 14:51:34 +03:00
SuhorukovAnton
a055c71610 fix-messages: IDE0070 2020-09-29 14:32:30 +03:00
SuhorukovAnton
1da0de1200 fix-messages: IDE0065 2020-09-29 13:28:03 +03:00
SuhorukovAnton
754ac38e3e fix-messages: IDE0074 2020-09-29 12:18:16 +03:00
SuhorukovAnton
135a845eaf fix-messages: IDE0063 2020-09-29 12:16:07 +03:00
SuhorukovAnton
b7cc10c13a fix-messages: IDE0054 2020-09-29 12:03:37 +03:00
SuhorukovAnton
2d34d70a4e fix-messages: IDE0051 and IDE0052 2020-09-29 11:57:37 +03:00
SuhorukovAnton
d866eccade fix-messages: IDE0044 2020-09-28 18:42:03 +03:00
SuhorukovAnton
de64bcca88 fix-messages: IDE0020 2020-09-28 17:45:05 +03:00
SuhorukovAnton
1d7f54ca22 fix-messages: IDE0019 2020-09-28 17:39:13 +03:00
SuhorukovAnton
bde6f8ab49 fix-messages: IDE0031 2020-09-28 17:33:41 +03:00
SuhorukovAnton
bc98087599 fix-messages: IDE0018 2020-09-28 17:25:40 +03:00
SuhorukovAnton
ba07caf1c8 fix-messages: IDE0017 2020-09-28 17:22:46 +03:00
SuhorukovAnton
c455419113 Telegram: fix Kafka 2020-09-25 14:13:43 +03:00
SuhorukovAnton
693e35ac57 add ASC.TelegramService 2020-09-24 17:30:27 +03:00
a085e8ef38 Merge branch 'master' into feature/release-11.0.0
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Utility/TenantExtra.cs
2020-09-23 14:00:24 +03:00
6f5cc4a447 Api: fix 2020-09-23 13:55:39 +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
50ff5a94a4 Encryption: fix port 2020-09-18 21:15:50 +03:00
144dde2699 Encryption: fix notify 2020-09-18 20:57:51 +03:00
SuhorukovAnton
cb365ba75f encryption: add api-metods getProgress and getSettings 2020-09-18 13:02:20 +03:00
a35a79c96a moved from release/11 4414f77b 2020-09-18 10:59:23 +03:00
SuhorukovAnton
7d3bb9e9a8 encryption: add api start 2020-09-17 16:56:12 +03:00
d883ef441f Api: moved from release/11 4414f77b 2020-09-17 15:04:28 +03:00
54cf80dafa Encrypt: fix 2020-09-16 16:32:46 +03:00
94a5079503 Encryption: notify fix 2020-09-16 13:50:53 +03:00
SuhorukovAnton
bb7c283145 enctyption: remove bug 2020-09-16 11:10:16 +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
13edcd6a1a Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-15 11:26:43 +03:00
SuhorukovAnton
8ed470113d encryption: fix 2020-09-15 10:00:07 +03:00
SuhorukovAnton
505cb447cd encryption: fix 2020-09-14 17:36:57 +03:00
SuhorukovAnton
a3e52d3f3d ecnryption: test version 2020-09-14 17:16:30 +03:00
SuhorukovAnton
eb18133e4b encryption: bugfix 2020-09-14 13:32:20 +03:00
15b34875d3 Moved from v10.5.2-saas 2020-09-11 17:12:35 +03:00
SuhorukovAnton
1752b9a4ba encryption: fix 2020-09-09 12:03:21 +03:00
SuhorukovAnton
89daf213c5 encryption: fix 2020-09-08 15:07:59 +03:00
SuhorukovAnton
3d79f7c484 encryption: fix 2020-09-08 11:26:05 +03:00
SuhorukovAnton
bd3c14c7ec encryption: fix 2020-09-07 18:04:26 +03:00
SuhorukovAnton
2d3f183567 Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-07 17:00:48 +03:00
SuhorukovAnton
80198032a4 scope: refactoring 2020-09-07 15:01:15 +03:00
SuhorukovAnton
89318a1f37 encryption: fix 2020-09-05 23:02:51 +03:00
8e3e73c746 Scope: fix 2020-09-04 13:10:19 +03:00
SuhorukovAnton
3e3257b4be encryption: fix 2020-09-04 11:22:03 +03:00
SuhorukovAnton
d8576a4b0a encryption: fix 2020-09-03 14:48:36 +03:00
SuhorukovAnton
15b17a0478 Encryption: first version 2020-09-02 13:54:50 +03:00
SuhorukovAnton
90f1c4fa3d Merge branch 'master' into feature/scope 2020-08-31 11:29:44 +03:00
SuhorukovAnton
132a6b05ae scope: add deconstructs 2020-08-31 11:18:07 +03:00
a48f8fb43e Migration: fix start 2020-08-28 18:30:26 +03:00
maksim
8282f3f658 fix 2020-08-27 17:01:37 +03:00