|
|
f69281a07d
|
References updated
|
2020-10-15 21:30:16 +03:00 |
|
|
|
d50cf081ba
|
Merge branch 'master' into features/ASC.AuditTrail
|
2020-10-14 13:02:30 +03:00 |
|
|
|
d41b12cdc8
|
DbTenant: fix
|
2020-10-14 12:59:37 +03:00 |
|
|
|
4a0a683c68
|
fix
|
2020-10-14 12:11:04 +03:00 |
|
|
|
f252ef2a7f
|
Merge branch 'master' into features/ASC.AuditTrail
# Conflicts:
# ASC.Web.sln
|
2020-10-13 18:17:59 +03:00 |
|
|
|
c622be89a3
|
revert discard
|
2020-10-12 22:39:23 +03:00 |
|
|
|
43b9c33979
|
fix formating
|
2020-10-12 19:23:15 +03:00 |
|
|
|
36034bf97a
|
fix warnings
|
2020-10-12 16:52:31 +03:00 |
|
SuhorukovAnton
|
917493f397
|
fix-messages: IDE0058
|
2020-10-10 14:35:05 +03:00 |
|
SuhorukovAnton
|
f4c0515340
|
fix-messages: IDE0022
|
2020-10-10 13:01:09 +03:00 |
|
|
|
49a7e215d2
|
added editorconfig
|
2020-10-09 18:52:17 +03:00 |
|
|
|
e01ee037f2
|
Merge branch 'master' into feature/fix-messages
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Core.Common/EF/Context/CoreDbContext.cs
# common/ASC.Core.Common/EF/Context/DbContext.cs
# common/ASC.Core.Common/EF/Context/DbContextManager.cs
# common/ASC.Core.Common/EF/Context/FeedDbContext.cs
# common/ASC.Core.Common/EF/Context/FilesDbContext.cs
# common/ASC.Core.Common/EF/Context/MessagesContext.cs
# common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
# common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# common/ASC.Core.Common/EF/Model/AccountLinks.cs
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
# common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
# common/ASC.Core.Common/EF/Model/Core/Subscription.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
# common/ASC.Core.Common/EF/Model/TelegramUser.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
# common/ASC.Core.Common/EF/Model/User/UserGroup.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.VoipService/Dao/CachedVoipDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
# products/ASC.Files/Core/Core/EF/DbFile.cs
# products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
# products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
# products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
# products/ASC.Files/Core/Core/EF/DbFolderTree.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Startup.cs
# web/ASC.Web.Studio/Startup.cs
|
2020-10-09 15:40:44 +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 |
|
|
|
08590b6b58
|
Fix confirm
|
2020-10-07 13:45:53 +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 |
|
|
|
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
|
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 |
|
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 |
|
