pavelbannov 18a2c0a53d Merge branch 'develop' into feature/dotnet5 ... # Conflicts: # common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs # common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs # common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs # common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs # common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs # common/ASC.Core.Common/EF/Model/DbipLocation.cs # common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs # common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs # common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs # common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs # common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs # common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs # common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs # common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs # common/ASC.Core.Common/EF/Model/Resource/ResData.cs # common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs # common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs # common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs # common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs # common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs # common/ASC.Core.Common/EF/Model/User/UserPhoto.cs # common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs # common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs # common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs # common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs # common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs # common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs # products/ASC.Files/Core/Core/EF/DbFilesTag.cs # products/ASC.Files/Core/Core/EF/FilesDbContext.cs		2021-03-25 21:50:09 +03:00
..
Controllers	Fix getshortenlink	2021-03-21 18:29:35 +03:00
Core	Auth by thirdparty	2021-02-19 19:16:08 +03:00
Models	Fix getshortenlink	2021-03-21 18:29:35 +03:00
Properties	Merge branch 'develop' into feature/dotnet5	2021-01-22 16:34:40 +03:00
appsettings.json	External config	2019-06-21 11:03:42 +03:00
ASC.Web.Api.csproj	Merge branch 'develop' into feature/dotnet5	2021-03-25 21:50:09 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
Program.cs	fix create file	2020-11-26 20:30:57 +03:00
Startup.cs	Fixed loading products, lazy loading webitemmanager	2021-01-26 12:29:50 +03:00