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 |
|
|
|
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 |
|
SuhorukovAnton
|
cb365ba75f
|
encryption: add api-metods getProgress and getSettings
|
2020-09-18 13:02:20 +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 |
|
|
|
dc6b0d2c6c
|
ASC.Data.Storage moved from release/11 4414f77b
|
2020-09-15 18:16:37 +03:00 |
|
|
|
15b34875d3
|
Moved from v10.5.2-saas
|
2020-09-11 17:12:35 +03:00 |
|
SuhorukovAnton
|
80198032a4
|
scope: refactoring
|
2020-09-07 15:01:15 +03:00 |
|
|
|
8e3e73c746
|
Scope: fix
|
2020-09-04 13:10:19 +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 |
|
maksim
|
8282f3f658
|
fix
|
2020-08-27 17:01:37 +03:00 |
|
SuhorukovAnton
|
055e787d63
|
scope: fix
|
2020-08-24 21:41:06 +03:00 |
|
SuhorukovAnton
|
eef5c3e4f3
|
scope: merge fix
|
2020-08-16 13:11:15 +03:00 |
|
SuhorukovAnton
|
faec4269db
|
Merge branch 'master' into feature/scope
|
2020-08-16 12:23:20 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
SuhorukovAnton
|
73fff2e63c
|
Merge branch 'master' into feature/scope
|
2020-07-30 16:39:52 +03:00 |
|
SuhorukovAnton
|
456866d4d9
|
scope: refactoring
|
2020-07-30 00:57:58 +03:00 |
|
|
|
585d98f8f4
|
Files: core. replace
|
2020-07-28 15:45:14 +03:00 |
|
SuhorukovAnton
|
581a5a4751
|
scope: first version
|
2020-07-28 10:35:17 +03:00 |
|
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
|
|
4681fb0f78
|
fix
|
2020-07-16 16:02:21 +03:00 |
|
SuhorukovAnton
|
83a88d0240
|
Merge branch 'master' into feature/ASC.Files.Core
|
2020-07-15 17:38:40 +03:00 |
|
|
|
e10ac2ccfa
|
BaseStartup: refactoring
|
2020-07-15 15:33:44 +03:00 |
|
|
|
baa71247d8
|
Merge branch 'master' into feature/general-startup
|
2020-07-15 13:06:32 +03:00 |
|
SuhorukovAnton
|
5bf0bd22b6
|
ASC.Files.Core: first version
|
2020-07-14 13:03:53 +03:00 |
|
SuhorukovAnton
|
9d069de30a
|
general-startup: transform GeneralStartup to BaseStartup
|
2020-07-07 23:00:39 +03:00 |
|
SuhorukovAnton
|
a43c14dcb3
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-07-07 12:38:35 +03:00 |
|
SuhorukovAnton
|
00558dd95f
|
general-startup: fix
|
2020-07-06 10:56:17 +03:00 |
|
SuhorukovAnton
|
71d90ebfa2
|
general-startup: fix
|
2020-07-03 18:57:59 +03:00 |
|
SuhorukovAnton
|
2f5491f1ba
|
general-startup: first version
|
2020-07-03 14:47:27 +03:00 |
|
|
|
c9a64ca377
|
Added NullIfDefault
|
2020-07-02 18:15:52 +03:00 |
|
|
|
7950db51ff
|
Notify: fix
|
2020-06-29 18:10:31 +03:00 |
|
|
|
d7cb638a1e
|
Backup: notify fix
|
2020-06-29 15:58:56 +03:00 |
|
|
|
3f97755c92
|
Backup: fix notify
|
2020-06-29 15:45:38 +03:00 |
|
|
|
4a848ea535
|
Backup: notify fix
|
2020-06-29 15:15:09 +03:00 |
|
SuhorukovAnton
|
e1f7b7365a
|
api-defaultvalue: fix backup
|
2020-06-29 14:40:42 +03:00 |
|
|
|
eb6be17333
|
Backup: removed notify reference
|
2020-06-29 12:32:43 +03:00 |
|
|
|
57454bae0c
|
References updated
|
2020-06-28 16:55:21 +03:00 |
|
|
|
155e0b2c9b
|
Backup: fix
|
2020-06-28 14:46:16 +03:00 |
|
|
|
197f468bf7
|
Removed unused proto, added backup rewrite
|
2020-06-25 19:05:14 +03:00 |
|
SuhorukovAnton
|
4e839c9b11
|
Backup: transfer to ASC.Data.Backup
|
2020-06-23 13:48:36 +03:00 |
|
|
|
ca9af1080c
|
Backup: refactoring
|
2020-06-17 10:49:17 +03:00 |
|
|
|
b36dac0cb4
|
Backup: fix
|
2020-06-16 19:04:40 +03:00 |
|
