Commit Graph

16 Commits

Author SHA1 Message Date
4c78667a99 fix Bug 52493 - Welcome page. notify «User with this email is already registered» 2021-11-30 12:09:51 +03:00
e257012a9a Notify: fix 2021-06-10 11:47:58 +03:00
f6fbe33814 Web.Core: moved from 08a01422 2021-05-24 20:41:31 +03:00
5e90151e71 Notify: fix 2020-10-29 22:15:36 +03:00
ad23a67282 Notify: fix 2020-10-29 19:52:32 +03:00
260f939d2c Notify: fix 2020-10-29 19:10: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
9a092cb8ec moved from release/11 4414f77b 2020-09-18 17:45:59 +03:00
94a5079503 Encryption: notify fix 2020-09-16 13:50:53 +03:00
15b34875d3 Moved from v10.5.2-saas 2020-09-11 17:12:35 +03:00
b4ff0c09a7 moved from hotfix/10.5.2 2020-01-23 14:04:42 +03:00
a93d7adda6 moved from hotfix/10.5.2 2020-01-23 11:52:07 +03:00
f247b4a303 Notify: fixed resources 2019-09-24 19:21:05 +03:00
ddfbab4c24 Resources: notify 2019-08-15 11:44:27 +03:00
3036e1cb90 Added ASC.Studio.Notify service 2019-08-01 11:47:15 +03:00
377287570a Added ASC.Feed, ASC.IPSecurity
Added Resources
2019-06-14 19:14:24 +03:00