SuhorukovAnton
|
31cc18f568
|
fix-messages: IDE1006
|
2020-09-29 15:27:28 +03:00 |
|
SuhorukovAnton
|
4e1bc262b9
|
fix-messages: IDE0075
|
2020-09-29 14:53:02 +03:00 |
|
SuhorukovAnton
|
9b6ccc19f0
|
fix-messages: IDE0074
|
2020-09-29 14:51:34 +03:00 |
|
SuhorukovAnton
|
151d8e162a
|
fix-messages: IDE0063
|
2020-09-29 13:34:12 +03:00 |
|
SuhorukovAnton
|
6df7f14901
|
fix-messages: IDE0056
|
2020-09-29 12:06:08 +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
|
29ec562a78
|
fix-messages: IDE0038
|
2020-09-28 18:21:29 +03:00 |
|
SuhorukovAnton
|
1545138152
|
fix-messages: IDE0034
|
2020-09-28 17:34:28 +03:00 |
|
SuhorukovAnton
|
b1090335d0
|
Telegram: fix
|
2020-09-25 14:36:09 +03:00 |
|
SuhorukovAnton
|
c455419113
|
Telegram: fix Kafka
|
2020-09-25 14:13:43 +03:00 |
|
|
|
89df700fb1
|
Files: fix
|
2020-09-25 13:47:21 +03:00 |
|
SuhorukovAnton
|
693e35ac57
|
add ASC.TelegramService
|
2020-09-24 17:30:27 +03:00 |
|
|
|
8094848d05
|
Settings: fix
|
2020-09-24 12:45:02 +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 |
|
|
|
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 |
|
|
|
dd80e300d0
|
Common, Core.Common moved from release/11 4414f77b
|
2020-09-15 16:11:05 +03:00 |
|
SuhorukovAnton
|
13edcd6a1a
|
Merge branch 'master' into feature/ASC.Data.Storage.Encryption
|
2020-09-15 11:26:43 +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 |
|
SuhorukovAnton
|
89daf213c5
|
encryption: fix
|
2020-09-08 15:07:59 +03:00 |
|
|
|
f464e031b8
|
Notify: fix
|
2020-09-08 11:42:13 +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 |
|
|
|
dc98b02d4f
|
fix
|
2020-09-04 12:20:12 +03:00 |
|
|
|
897f3c910e
|
Sln: removed *_Ubuntu configuration
|
2020-09-04 12:06:30 +03:00 |
|
SuhorukovAnton
|
15b17a0478
|
Encryption: first version
|
2020-09-02 13:54:50 +03:00 |
|
SuhorukovAnton
|
32f570784b
|
scope: fix
|
2020-08-31 12:01:23 +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
|
95299daaf9
|
ASC.Data.Storage.Migration: adding listener and extension
|
2020-08-27 17:06:03 +03:00 |
|
maksim
|
8282f3f658
|
fix
|
2020-08-27 17:01:37 +03:00 |
|
|
|
952e0f40c7
|
Settings: authservice api
|
2020-08-26 17:34:21 +03:00 |
|
SuhorukovAnton
|
055e787d63
|
scope: fix
|
2020-08-24 21:41:06 +03:00 |
|
SuhorukovAnton
|
c96620554d
|
Merge branch 'master' into feature/scope
|
2020-08-24 17:09:42 +03:00 |
|
|
|
f837b3aa24
|
Merge branch 'master' into feature/socket.io
# Conflicts:
# ASC.Web.sln
|
2020-08-19 19:53:13 +03:00 |
|
SuhorukovAnton
|
06e897d982
|
scope: fix
|
2020-08-16 17:11:34 +03:00 |
|
SuhorukovAnton
|
faec4269db
|
Merge branch 'master' into feature/scope
|
2020-08-16 12:23:20 +03:00 |
|
|
|
f00a964c32
|
Merge branch 'master' into feature/private
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2020-08-14 17:19:36 +03:00 |
|
SuhorukovAnton
|
4db1cd0af8
|
Merge branch 'master' into feature/socket.io
|
2020-08-14 14:01:27 +03:00 |
|
SuhorukovAnton
|
645b07b511
|
socket: bagfix
|
2020-08-14 13:56:15 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
|
|
98b69d6492
|
Fix Incorrect datetime value: '0001-01-01 00:00:00' for column 'last_modified' at row 1
|
2020-08-10 20:17:00 +03:00 |
|
|
|
e860d1ab76
|
Fix Incorrect datetime value: '0001-01-01 00:00:00' for column 'create_on'
|
2020-08-10 20:16:34 +03:00 |
|
|
|
518648cb19
|
Fix parse license
|
2020-08-04 17:29:43 +03:00 |
|
|
|
39b984debd
|
Settings: added license/required and license upload
|
2020-08-03 16:42:59 +03:00 |
|
