|
0215599566
|
merge from develop
|
2021-10-27 19:37:12 +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 |
|
|
403388fbf1
|
Added solution filter
Removed unused services
replaced sh with bat
start service from source
|
2021-10-25 14:29:36 +03:00 |
|
|
79b7c37736
|
rename Postgre to PostgreSql
|
2021-10-12 13:25:04 +03:00 |
|
|
f4feb48d2c
|
fix dependencies
|
2021-09-22 19:51:06 +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 |
|
|
cf87addaa3
|
Security: added new method
|
2021-08-18 17:04:16 +03:00 |
|
diana-vahomskaya
|
63cceb5ca6
|
fix Context delete model DbTenant from Context CRMDbContext
|
2021-08-12 16:14:12 +03:00 |
|
|
546c1872a3
|
Added asp logging
|
2021-08-08 16:19:54 +03:00 |
|
diana-vahomskaya
|
bcfddd88d7
|
fix context
|
2021-08-02 17:49:36 +03:00 |
|
|
cf7d002bc1
|
Merge branch 'develop' into feature/calendar
|
2021-07-28 12:16:39 +03:00 |
|
|
1035ac6244
|
crm: set listitem id for dto object
|
2021-07-27 19:05:25 +03:00 |
|
|
6fbdaf0d31
|
Calendar: post-merge fixes
|
2021-07-27 16:09:30 +03:00 |
|
|
923db85ca1
|
crm: fixed bug with crash app for contacts list more than 25 and fixed bug with always infoType set 0
|
2021-07-16 19:01:57 +03:00 |
|
|
2d75554b0d
|
DbContext: optimization
|
2021-07-15 13:07:47 +03:00 |
|
|
4be9f847fa
|
crm: fixed sql
|
2021-06-30 19:55:20 +03:00 |
|
|
b6b1c72769
|
core: added new ThenBy linq extension. crm: fixed sql
|
2021-06-30 19:08:41 +03:00 |
|
|
c6ede6fff7
|
Merge branch 'develop' into feature/remove_itemList
|
2021-06-29 12:47:56 +03:00 |
|
|
a3cccc4044
|
crm: migrate from FromForm to FromBody attribute
|
2021-06-28 12:42:42 +03:00 |
|
|
3f2dfeb5a9
|
crm: started migrate from FromForm to FromBody attribute. bugfix
|
2021-06-25 16:58:42 +03:00 |
|
|
6e9d64da7a
|
Merge branch 'develop' into feature/remove_itemList
|
2021-06-24 11:21:46 +03:00 |
|
|
a4aa4843e8
|
crm: started migrate from FromForm to FromBody attribute
|
2021-06-23 22:32:56 +03:00 |
|
|
d783bd8ab4
|
crm: fixed warnings
|
2021-06-18 20:38:32 +03:00 |
|
|
dd64101332
|
remove itemList
|
2021-06-18 15:56:15 +03:00 |
|
|
01639a56cc
|
RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
|
2021-06-16 20:08:26 +03:00 |
|
|
3018e1822f
|
crm: fix path
|
2021-06-16 17:30:31 +03:00 |
|
|
89264cc48d
|
crm: created common project for common services
|
2021-06-15 13:41:17 +03:00 |
|
|
b925943cb6
|
merge from develop
|
2021-06-07 17:23:25 +03:00 |
|
|
fc20a742a1
|
crm: refactoring
|
2021-06-04 19:27:44 +03:00 |
|
|
58e7e41cdd
|
crm: code cleanup
|
2021-06-04 17:38:42 +03:00 |
|
|
c04dc44e36
|
crm: refacroting
|
2021-06-03 15:51:29 +03:00 |
|
|
e75e048e49
|
crm: fixed build
|
2021-06-02 18:24:49 +03:00 |
|
|
76d8ebb459
|
Tests moved to separate projects.
Removed unused dependepcies
|
2021-06-01 12:21:51 +03:00 |
|
|
d7e3e71194
|
crm: removed DataContract attribute.
|
2021-05-31 19:37:00 +03:00 |
|
|
ccd30b7b90
|
crm: refactoring. used JsonPropertyName instead of DataMember
|
2021-05-31 19:14:59 +03:00 |
|
|
a9a7c0a4b7
|
crm: refactoring
|
2021-05-28 20:20:12 +03:00 |
|
|
401c8ca2e2
|
crm: migrate from newtonsoft to system.text.json
|
2021-05-28 18:18:55 +03:00 |
|
|
c8e5c5a93c
|
crm: migrate from ProgressQueue to DistributedTaskQueue
|
2021-05-24 12:56:49 +03:00 |
|
|
86a7802ada
|
crm: refactoring
|
2021-05-17 19:32:05 +03:00 |
|
|
bbe1f1f205
|
crm: code refactoring
|
2021-05-17 17:50:55 +03:00 |
|
|
f1ca0971fd
|
crm: fixed work with sql queries
|
2021-05-15 17:42:16 +03:00 |
|
|
d85f6c0c1c
|
crm:refactoring
|
2021-05-12 20:58:22 +03:00 |
|
|
09ef8ba660
|
crm.server: refactoring. remove obsolete cache class. In future release I will use EF Core cache
|
2021-05-07 17:00:51 +03:00 |
|
|
92ce702b28
|
crm: refactoring. bugfix
|
2021-05-05 17:09:05 +03:00 |
|
|
424c6a6806
|
migrate base mapper class from ASC.CRM to ASC.Common
|
2021-04-30 17:52:57 +03:00 |
|
|
9bdc643840
|
crm: add support WindowsService/systemd for IHostBuilder
|
2021-04-30 15:33:33 +03:00 |
|
|
8816e535c1
|
merge from develop
|
2021-04-28 19:50:59 +03:00 |
|
|
2d8b085d02
|
add support WindowsService/systemd for IHostBuilder
listen unix socket if it setup for Kestrel Web Server
|
2021-04-23 16:54:39 +03:00 |
|
|
5f2998af87
|
refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile
|
2021-04-16 19:33:26 +03:00 |
|
|
3aae413e12
|
replace Path.Combine to CrossPlatform.PathCombine
|
2021-04-16 16:26:26 +03:00 |
|