Commit Graph

8 Commits

Author SHA1 Message Date
fb7922f579 Thirdparty: login. Desktop 2021-10-15 11:34:34 +03:00
66d126410c Login: added desktop param 2021-10-13 10:25:19 +03:00
8bb173fa92 Thirdparty: fix providers 2021-04-26 21:42:39 +03:00
c666520c74 Merge branch 'develop' into feature/thirdparty-integrations 2020-11-17 12:04:33 +03:00
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
5adde516e8 Thirdparty: fix 2020-11-12 11:56:27 +03:00
44536c695a Thirdparty: fix. 2020-11-12 11:24:36 +03:00
09c07e5060 Api: ThirdPartyController 2020-11-11 12:11:44 +03:00