|
26511d9fb7
|
Merge branch 'develop' into feature/webhooks
# Conflicts:
# ASC.Tests.sln
|
2021-10-29 13:18:57 +03:00 |
|
|
399377ff43
|
Merge branch 'develop' into feature/dbcontextmanager-optimization
|
2021-10-26 22:05:41 +03:00 |
|
|
cb8bc701ec
|
fix migrations
|
2021-10-26 16:14:40 +03:00 |
|
|
b1134d239c
|
Merge branch 'develop' into feature/auto-migrations
# Conflicts:
# common/ASC.Core.Common/EF/Context/UserDbContext.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/MySqlAccountLinkContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/MySqlDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/MySqlFeedDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/MySqlMailDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20210803212546_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/MySqlMessagesContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/MySqlNotifyDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/MySqlResourceDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/MySqlTelegramDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/MySqlTenantDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210309095256_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210803213502_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/MySqlWebstudioDbContextModelSnapshot.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.Designer.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.Designer.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.Designer.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
|
2021-10-25 20:52:13 +03:00 |
|
|
018c1939ab
|
replace type name with type
|
2021-10-22 13:08:09 +03:00 |
|
|
5eab8516f8
|
EF: removed unused class
|
2021-10-22 12:30:06 +03:00 |
|
|
36db823276
|
removed unused class
|
2021-10-22 11:54:45 +03:00 |
|
|
dd8f77f827
|
Merge branch 'develop' into feature/wizard/migration
|
2021-10-22 11:44:21 +03:00 |
|
|
5a5e299d98
|
Merge branch 'develop' into feature/webhooks
# Conflicts:
# ASC.Web.sln
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
|
2021-10-19 18:30:59 +03:00 |
|
|
9f12c95828
|
Merge branch 'feature/webhooks' of github.com:ONLYOFFICE/AppServer into feature/webhooks
|
2021-10-19 15:25:53 +03:00 |
|
|
f5a25b80be
|
update migrations
|
2021-10-12 17:54:11 +03:00 |
|
|
a19dfef1ab
|
update postgresql migrations
|
2021-10-12 13:25:56 +03:00 |
|
|
55da5e7c54
|
add postgresql model configuring
|
2021-10-12 13:24:19 +03:00 |
|
|
1ddbb41052
|
rename Postgre to PostgreSql
|
2021-10-12 13:23:20 +03:00 |
|
|
9541b9e6b4
|
optimization migration
|
2021-10-12 12:04:24 +03:00 |
|
|
243a2cb55f
|
update migration
|
2021-10-11 17:24:15 +03:00 |
|
|
8b4d793d78
|
remove unnecessary HasData
|
2021-10-11 17:23:39 +03:00 |
|
|
0066585554
|
replace DateTime.Now to fixed DateTime
|
2021-10-11 17:23:02 +03:00 |
|
|
8ced3a052a
|
change access modificator
|
2021-10-07 12:51:29 +03:00 |
|
|
040f3065c5
|
fix
|
2021-10-07 12:51:10 +03:00 |
|
|
6cc771bb87
|
fix
|
2021-10-07 12:50:57 +03:00 |
|
|
814fe65535
|
fix
|
2021-10-07 12:49:55 +03:00 |
|
|
e755d2eda8
|
renamed providers to lowercase
|
2021-09-24 17:36:46 +03:00 |
|
diana-vahomskaya
|
a5e1609dac
|
two methods
|
2021-09-16 11:25:17 +03:00 |
|
|
ea4fa97838
|
Merge branch 'develop' into feature/wizard/migration
# Conflicts:
# ASC.Tests.sln
# common/ASC.Core.Common/EF/Model/Tenant/DbQuota.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/Tests/ASC.Common.Tests/ASC.Common.Tests.csproj
# common/Tests/ASC.Core.Common.Tests/ASC.Core.Common.Tests.csproj
# common/Tests/ASC.Notify.Textile.Tests/ASC.Notify.Textile.Tests.csproj
|
2021-09-15 15:52:13 +03:00 |
|
|
ec66a65d38
|
User: fix request
|
2021-09-10 17:00:26 +03:00 |
|
Vashchuk Nikita
|
3b4cb1dfc6
|
Added GlobalFilter, fix
|
2021-09-03 17:02:52 +03:00 |
|
|
fa204303f5
|
Merge branch 'develop' into release/1.0.0
|
2021-09-01 16:08:41 +03:00 |
|
|
2addb81adf
|
Quota: Price2 removed
|
2021-08-30 18:19:20 +03:00 |
|
|
14e8c59b17
|
Merge branch 'develop' into release/1.0.0
|
2021-08-25 21:17:41 +03:00 |
|
|
a0f5c4231f
|
fixed run via vs
|
2021-08-23 15:55:19 +03:00 |
|
|
9207238d8d
|
Merge branch 'develop' into release/1.0.0
|
2021-08-20 16:12:40 +03:00 |
|
|
91fd7615b3
|
Optimization
|
2021-08-20 10:52:52 +03:00 |
|
|
cf87addaa3
|
Security: added new method
|
2021-08-18 17:04:16 +03:00 |
|
diana-vahomskaya
|
945739fe44
|
fix test ASC.Web.Api.Tests
|
2021-08-16 15:20:41 +03:00 |
|
|
163e73ef4a
|
Personal: optimization
|
2021-08-12 14:00:05 +03:00 |
|
|
44847c1e8f
|
backend: change TargetFramework from netstandard2.1 to net5.0
|
2021-08-06 18:37:22 +03:00 |
|
|
90bb8a139a
|
UserManager: fix for personal
|
2021-08-06 17:30:51 +03:00 |
|
diana-vahomskaya
|
eaa449db1f
|
Updated migrations for ASC.Core.Common
|
2021-08-04 00:41:33 +03:00 |
|
diana-vahomskaya
|
af84cd6532
|
fix Context
|
2021-08-03 17:11:53 +03:00 |
|
diana-vahomskaya
|
bcfddd88d7
|
fix context
|
2021-08-02 17:49:36 +03:00 |
|
diana-vahomskaya
|
34c4161f08
|
Update migrations, fix Context with repetitive Models
|
2021-07-27 19:26:56 +03:00 |
|
diana-vahomskaya
|
3131c27d26
|
Merge remote-tracking branch 'remotes/origin/feature/wizard/migration' into develop
|
2021-07-27 17:39:29 +03:00 |
|
|
f1668a3b43
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
|
2021-07-27 12:43:01 +03:00 |
|
|
d88741962c
|
EF: optimize server version check
|
2021-07-16 11:48:30 +03:00 |
|
|
2d75554b0d
|
DbContext: optimization
|
2021-07-15 13:07:47 +03:00 |
|
diana-vahomskaya
|
e02e833d31
|
fixed data to open wizard if magration true
|
2021-07-07 17:29:27 +03:00 |
|
|
a31dc583c1
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Settings/index.js
|
2021-07-02 16:26:45 +03:00 |
|
|
b6b1c72769
|
core: added new ThenBy linq extension. crm: fixed sql
|
2021-06-30 19:08:41 +03:00 |
|
|
fbcdba3b17
|
Merge branch 'develop' into feature/personal
|
2021-06-25 11:10:49 +03:00 |
|