Commit Graph

4147 Commits

Author SHA1 Message Date
SuhorukovAnton
d247223f86 ASC.AuditTrail: fix 2020-10-06 15:12:57 +03:00
SuhorukovAnton
8fb13f633c ASC.AuditTrail 2020-10-06 14:24:12 +03:00
SuhorukovAnton
d145bcf076 ASC.AuditTrail: first version 2020-10-06 10:06:05 +03:00
Artem Tarasov
b4c144df74 Web: Common: refactoring createPasswordHash 2020-10-01 19:04:10 +03:00
Artem Tarasov
053b3c902c refactoring getPortalSettings 2020-10-01 11:42:59 +03:00
Artem Tarasov
afedcc603c Web: Client: wizard: deleted unused props 2020-10-01 11:06:48 +03:00
Artem Tarasov
db7ac80645 refactoring getPortalSettings 2020-10-01 09:56:22 +03:00
Artem Tarasov
45e70f6d11 fixed missing hashSettings after logout 2020-10-01 00:46:33 +03:00
Artem Tarasov
17d999f538 refactoring 2020-10-01 00:44:49 +03:00
Artem Tarasov
f7064f3baa Web: Common: login: added hashPassword 2020-09-30 21:20:51 +03:00
Artem Tarasov
8db1420cdd Merge branch 'master' into feature/hash-password 2020-09-30 17:24:51 +03:00
58126fd98d Auth by passwordHash 2020-09-30 17:16:48 +03:00
Artem Tarasov
14f0d0f2be update yarn.lock 2020-09-30 15:00:27 +03:00
Artem Tarasov
bfdfcbb4b5 Web: Client: Wizard: added password hash 2020-09-30 14:22:14 +03:00
Artem Tarasov
235193fb6b web: common: bump version 2020-09-30 11:45:47 +03:00
Artem Tarasov
b7cda3333e Web: Common: added function createHashPassword 2020-09-30 11:43:19 +03:00
Artem Tarasov
c68b6d6b7f update yarn.lock 2020-09-30 10:53:51 +03:00
Artem Tarasov
5b5018a214 web: common: bump version 2020-09-30 10:44:06 +03:00
b56df84bce Settings: added password settings 2020-09-29 18:08:54 +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
ec6dc5aa46 fix merge 2020-09-23 14:11:39 +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
4c7983fe7c Settings: fix 2020-09-23 13:22:23 +03:00
075798b90c moved from release/11 4414f77b 2020-09-22 17:17:17 +03:00
642472ce22 TenantExtra: fix 2020-09-20 20:27:51 +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
144dde2699 Encryption: fix notify 2020-09-18 20:57:51 +03:00
9a092cb8ec moved from release/11 4414f77b 2020-09-18 17:45:59 +03:00
SuhorukovAnton
8cbc380241 encryption: fix 2020-09-18 13:06:32 +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
94a5079503 Encryption: notify fix 2020-09-16 13:50:53 +03:00
SuhorukovAnton
13edcd6a1a Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-15 11:26:43 +03:00
15b34875d3 Moved from v10.5.2-saas 2020-09-11 17:12:35 +03:00
3f37da9891 fix notify 2020-09-10 12:02:26 +03:00
cc9e0e1374 Merge branch 'master' into feature/scope
# Conflicts:
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
2020-09-09 18:18:34 +03:00
SuhorukovAnton
ae61f59d55 Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-09 12:40:01 +03:00
f464e031b8 Notify: fix 2020-09-08 11:42:13 +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
96df0ab8ca Api: added payment settings 2020-09-07 16:53:39 +03:00
SuhorukovAnton
80198032a4 scope: refactoring 2020-09-07 15:01:15 +03:00
f48574a809 Merge branch 'master' into feature/scope 2020-09-04 11:26:03 +03:00
82dd4a8828 Settings: fix timeZones for unix 2020-09-03 18:30:14 +03:00
SuhorukovAnton
d8576a4b0a encryption: fix 2020-09-03 14:48:36 +03:00