|
3ca0990715
|
Merge branch 'master' into feature/files
# Conflicts:
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2020-10-08 19:01:09 +03:00 |
|
|
bc1438ba92
|
EF: rename
|
2020-10-08 12:07:05 +03:00 |
|
|
b9e74c0e4d
|
DbContextManager: fix
|
2020-10-08 11:56:46 +03:00 |
|
|
573dc8922b
|
Merge branch 'master' into feature/schema
# Conflicts:
# common/ASC.Common/DIHelper.cs
|
2020-10-08 11:42:57 +03:00 |
|
|
e8061d10bd
|
DI: refactoring
|
2020-10-08 11:36:47 +03:00 |
|
Diana
|
2ceb82b458
|
flag to turn on/off migrations
|
2020-10-07 15:20:06 +03:00 |
|
|
ed47263adf
|
Merge branch 'master' into feature/files
|
2020-10-07 13:48:11 +03:00 |
|
|
08590b6b58
|
Fix confirm
|
2020-10-07 13:45:53 +03:00 |
|
|
0a7eb28989
|
Reassign: fix scope
|
2020-10-07 11:23:43 +03:00 |
|
SuhorukovAnton
|
10a55a2a76
|
ASC.AuditTrail: fix
|
2020-10-06 16:03:51 +03:00 |
|
SuhorukovAnton
|
d247223f86
|
ASC.AuditTrail: fix
|
2020-10-06 15:12:57 +03:00 |
|
Diana
|
5c2b6debac
|
fix migrations
|
2020-10-06 14:39:44 +03:00 |
|
Diana
|
cc8b3e470d
|
fix
|
2020-10-06 14:38:15 +03:00 |
|
SuhorukovAnton
|
8fb13f633c
|
ASC.AuditTrail
|
2020-10-06 14:24:12 +03:00 |
|
|
1ba65b9c01
|
EF: new Migration scheme
|
2020-10-06 10:06:18 +03:00 |
|
SuhorukovAnton
|
d145bcf076
|
ASC.AuditTrail: first version
|
2020-10-06 10:06:05 +03:00 |
|
|
d00d16ee02
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/utils/index.js
# web/ASC.Web.Common/yarn.lock
|
2020-10-05 13:32:26 +03:00 |
|
|
191b517a59
|
Ef: fix
|
2020-10-05 13:11:15 +03:00 |
|
|
9c6812a9c3
|
EF: refactoring
|
2020-10-05 13:02:28 +03:00 |
|
|
bfba82be8e
|
EF: refactoring data
|
2020-10-05 12:56:07 +03:00 |
|
|
9b5f32be30
|
Merge branch 'feature/schema' of github.com:ONLYOFFICE/AppServer into feature/schema
|
2020-10-05 12:27:33 +03:00 |
|
|
07263e58e8
|
EF: removed partial
Files: removed DbEncryptedData.cs
|
2020-10-05 12:27:15 +03:00 |
|
|
58f4f6b912
|
Notify: fix AutoSubmitted
|
2020-10-02 16:52:48 +03:00 |
|
Diana
|
04ee542f22
|
fix migrations, models, added migration and model schema TelegramDbContext
|
2020-10-01 20:08:55 +03:00 |
|
|
6bad98e277
|
Merge branch 'master' into feature/schema
# Conflicts:
# config/appsettings.json
# products/ASC.Files/Server/ASC.Files.csproj
# web/ASC.Web.Studio/ASC.Web.Studio.csproj
|
2020-10-01 12:25:07 +03:00 |
|
|
0bd5099c00
|
Removed Migrations()
|
2020-10-01 11:39:21 +03:00 |
|
SuhorukovAnton
|
cb2e656e21
|
fix-messages: IDE0066
|
2020-10-01 10:57:35 +03:00 |
|
|
140d57d5d4
|
Merge branch 'master' into feature/files
|
2020-09-30 18:28:27 +03:00 |
|
SuhorukovAnton
|
edbc0f247c
|
fix-messages: IDE0022
|
2020-09-30 17:47:42 +03:00 |
|
|
c08abfc396
|
User: fix SetUserPasswordHash
|
2020-09-30 15:54:36 +03:00 |
|
SuhorukovAnton
|
f618f8799b
|
fix-messages: IDE0062
|
2020-09-30 15:46:16 +03:00 |
|
SuhorukovAnton
|
ba1ed22345
|
fix-messages: IDE0058
|
2020-09-30 14:50:39 +03:00 |
|
|
bfd450e602
|
DbUserService: fix
|
2020-09-30 14:20:54 +03:00 |
|
Diana
|
0d74f8d6a2
|
fix
|
2020-09-29 20:13:09 +03:00 |
|
Diana
|
bea6857429
|
fix models for npgsql
|
2020-09-29 20:09:39 +03:00 |
|
|
b56df84bce
|
Settings: added password settings
|
2020-09-29 18:08:54 +03:00 |
|
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
|
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 |
|
TatianaLopaeva
|
eaa24436db
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-28 16:04:54 +03:00 |
|
|
a4cbb9f386
|
Files: fix openedit
|
2020-09-28 15:45:26 +03:00 |
|
|
2c1d473314
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
|
2020-09-28 12:29:33 +03:00 |
|
|
0dbae1adfd
|
Merge branch 'master' into feature/files
|
2020-09-28 11:32:13 +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 |
|
|
075798b90c
|
moved from release/11 4414f77b
|
2020-09-22 17:17:17 +03:00 |
|
|
dbbd0010f3
|
EF: fix
|
2020-09-20 23:02:34 +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 |
|
|
50ff5a94a4
|
Encryption: fix port
|
2020-09-18 21:15:50 +03:00 |
|
|
144dde2699
|
Encryption: fix notify
|
2020-09-18 20:57:51 +03:00 |
|
Diana
|
4a5e577cd4
|
Added Data
|
2020-09-18 20:50:30 +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 |
|
TatianaLopaeva
|
8ecc93a30c
|
Changed logic of upload license
|
2020-09-16 10:33:06 +03:00 |
|
|
dc6b0d2c6c
|
ASC.Data.Storage moved from release/11 4414f77b
|
2020-09-15 18:16:37 +03:00 |
|
TatianaLopaeva
|
a3adea3c27
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
|
2020-09-15 17:39:34 +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 |
|
SuhorukovAnton
|
5916705391
|
enctyption: fixbug
|
2020-09-15 11:24:48 +03:00 |
|
SuhorukovAnton
|
8ed470113d
|
encryption: fix
|
2020-09-15 10:00:07 +03:00 |
|
SuhorukovAnton
|
505cb447cd
|
encryption: fix
|
2020-09-14 17:36:57 +03:00 |
|
SuhorukovAnton
|
a3e52d3f3d
|
ecnryption: test version
|
2020-09-14 17:16:30 +03:00 |
|
SuhorukovAnton
|
eb18133e4b
|
encryption: bugfix
|
2020-09-14 13:32:20 +03:00 |
|
|
7c9df6c3c4
|
Moved from v10.5.2-saas
|
2020-09-11 17:16:59 +03:00 |
|
|
15b34875d3
|
Moved from v10.5.2-saas
|
2020-09-11 17:12:35 +03:00 |
|
|
9282ffbbf1
|
Merge branch 'master' into feature/files
|
2020-09-10 13:40:54 +03:00 |
|
|
f89af33b5b
|
fix unhandled exception
|
2020-09-10 13:39:26 +03:00 |
|
|
23b2a310a0
|
Merge branch 'master' into feature/files
|
2020-09-10 12:35:55 +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 |
|
|
e0febd8890
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2020-09-09 13:49:25 +03:00 |
|
SuhorukovAnton
|
5aeaa0ee98
|
Merge branch 'master' into feature/ASC.Data.Storage.Encryption
|
2020-09-09 13:45:21 +03:00 |
|