Commit Graph

14 Commits

Author SHA1 Message Date
dccbe81002 DataAnnotations: fix 2021-02-25 21:18:27 +03:00
2848c39c57 Merge branch 'develop' into feature/thirdparty-integrations 2021-01-14 10:14:46 +03:00
b8e40ff3b2 OAuth: fix links 2021-01-13 16:30:32 +03:00
Ilya Oleshko
92bcdb9f8b Merge branch 'develop' into feature/thirdparty-integrations 2020-11-20 13:09:13 +03:00
b5a66444d7 Thirdparty: fix save 2020-11-20 12:24:17 +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
44536c695a Thirdparty: fix. 2020-11-12 11:24:36 +03:00
09c07e5060 Api: ThirdPartyController 2020-11-11 12:11:44 +03:00
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
ddf7c8ddcd IDE0054, IDE0056, IDE0057, IDE1005 2019-08-15 17:48:55 +03:00
ed7ed484e8 IDE0049 2019-08-15 16:16:39 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
aa4155eed7 ASC.FederatedLogin: .netcoreapp3.0 2019-06-06 16:34:46 +03:00