IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,967 Commits 40 Branches 22 Tags 420 MiB
0970b1b420
Commit Graph

12 Commits

Author SHA1 Message Date
pavelbannov
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +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
pavelbannov
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
pavelbannov
dd80e300d0 Common, Core.Common moved from release/11 4414f77b 2020-09-15 16:11:05 +03:00
SuhorukovAnton
89daf213c5 encryption: fix 2020-09-08 15:07:59 +03:00
pavelbannov
0bbc383266 Merge branch 'master' into refactoring/di 
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
 2019-10-30 11:45:55 +03:00
pavelbannov
aae987ebf2 fixed AzRecordCache.proto 2019-10-29 15:26:23 +03:00
pavelbannov
473207f9a4 DI: BaseSettings 2019-09-13 14:18:27 +03:00
pavelbannov
47e693c5e3 Kafka: guid as bytes 2019-08-28 15:58:53 +03:00
pavelbannov
3036e1cb90 Added ASC.Studio.Notify service 2019-08-01 11:47:15 +03:00
pavelbannov
cb5f732e76 Replaced ICacheNotify with ICacheNotify<> 
Removed RedisCache
 2019-07-22 15:31:09 +03:00