SuhorukovAnton
|
31cc18f568
|
fix-messages: IDE1006
|
2020-09-29 15:27:28 +03:00 |
|
SuhorukovAnton
|
9d5a9dd769
|
fix-messages: IDE1005
|
2020-09-29 14:58:00 +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
|
a055c71610
|
fix-messages: IDE0070
|
2020-09-29 14:32:30 +03:00 |
|
SuhorukovAnton
|
151d8e162a
|
fix-messages: IDE0063
|
2020-09-29 13:34:12 +03:00 |
|
SuhorukovAnton
|
1da0de1200
|
fix-messages: IDE0065
|
2020-09-29 13:28:03 +03:00 |
|
SuhorukovAnton
|
754ac38e3e
|
fix-messages: IDE0074
|
2020-09-29 12:18:16 +03:00 |
|
SuhorukovAnton
|
135a845eaf
|
fix-messages: IDE0063
|
2020-09-29 12:16:07 +03:00 |
|
SuhorukovAnton
|
6df7f14901
|
fix-messages: IDE0056
|
2020-09-29 12:06:08 +03:00 |
|
SuhorukovAnton
|
b7cc10c13a
|
fix-messages: IDE0054
|
2020-09-29 12:03:37 +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
|
de64bcca88
|
fix-messages: IDE0020
|
2020-09-28 17:45:05 +03:00 |
|
SuhorukovAnton
|
1d7f54ca22
|
fix-messages: IDE0019
|
2020-09-28 17:39:13 +03:00 |
|
SuhorukovAnton
|
1545138152
|
fix-messages: IDE0034
|
2020-09-28 17:34:28 +03:00 |
|
SuhorukovAnton
|
bde6f8ab49
|
fix-messages: IDE0031
|
2020-09-28 17:33:41 +03:00 |
|
SuhorukovAnton
|
e3e12c7fb0
|
fix-messages: IDE0030
|
2020-09-28 17:31:07 +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 |
|
SuhorukovAnton
|
3b0a86a536
|
fix-messages: IDE0016
|
2020-09-28 16:48:27 +03:00 |
|
|
|
9e83a391e4
|
Merge pull request #83 from ONLYOFFICE/feature/release-11.0.0
Feature/release 11.0.0
|
2020-09-28 11:18:18 +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 |
|
|
|
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 |
|
|
|
e2c53e21d1
|
moved from release/11 4414f77b
|
2020-09-23 12:41:32 +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 |
|
|
|
14ae702f36
|
Merge pull request #80 from ONLYOFFICE/feature/ASC.Data.Storage.Encryption
Feature/asc.data.storage.encryption
|
2020-09-18 21:30:54 +03:00 |
|
|
|
50ff5a94a4
|
Encryption: fix port
|
2020-09-18 21:15:50 +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 |
|
SuhorukovAnton
|
7fae3bf83a
|
encryption: upload crypt
|
2020-09-16 17:03:33 +03:00 |
|
|
|
54cf80dafa
|
Encrypt: fix
|
2020-09-16 16:32:46 +03:00 |
|
|
|
94a5079503
|
Encryption: notify fix
|
2020-09-16 13:50:53 +03:00 |
|
SuhorukovAnton
|
bb7c283145
|
enctyption: remove bug
|
2020-09-16 11:10:16 +03:00 |
|
SuhorukovAnton
|
8e0ebceb36
|
encryption: copyright
|
2020-09-16 10:54:52 +03:00 |
|
