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
..
Helpers	DataAnnotations: fix	2021-02-25 21:18:27 +03:00
LoginProviders	fixed login handler	2021-02-10 22:43:18 +03:00
Profile	revert discard	2020-10-12 22:39:23 +03:00
Properties	added ASC.VoipService	2019-06-06 17:41:16 +03:00
protos	Replaced ICacheNotify with ICacheNotify<>	2019-07-22 15:31:09 +03:00
AccountLinker.cs	Thridparty: fixed RemoveProvider method	2021-02-19 12:11:04 +03:00
ASC.FederatedLogin.csproj	Merge branch 'develop' into feature/dotnet5	2021-03-25 21:50:09 +03:00
callback.htm	ASC.FederatedLogin: .netcoreapp3.0	2019-06-06 16:34:46 +03:00
Login.cs	fixed login handler	2021-02-10 22:43:18 +03:00
LoginMode.cs	ASC.FederatedLogin: .netcoreapp3.0	2019-06-06 16:34:46 +03:00
MultiRegionAccountLinker.cs	Refactoting & optimization	2020-11-24 13:15:11 +03:00
OAuth20Token.cs	revert discard	2020-10-12 22:39:23 +03:00
ProviderConstants.cs	Added /api/2.0/capabilities.json	2020-10-31 17:11:45 +03:00