DocSpace-client/common/ASC.FederatedLogin
pavelbannov 68483bc979 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Startup.cs
2020-11-13 16:03:17 +03:00
..
Helpers Merge branch 'develop' into refactoring/scope 2020-11-13 16:03:17 +03:00
LoginProviders Merge branch 'develop' into refactoring/scope 2020-11-13 16:03:17 +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 Refactoring: scope 2020-10-22 20:57:18 +03:00
ASC.FederatedLogin.csproj References updated 2020-10-16 10:27:44 +03:00
callback.htm ASC.FederatedLogin: .netcoreapp3.0 2019-06-06 16:34:46 +03:00
Login.cs Scope: refactoring 2020-10-19 18:53:15 +03:00
LoginMode.cs ASC.FederatedLogin: .netcoreapp3.0 2019-06-06 16:34:46 +03:00
MultiRegionAccountLinker.cs fix 2020-08-27 17:01:37 +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