Commit Graph

12 Commits

Author SHA1 Message Date
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
503d2c1948 fix loginproviders 2020-11-11 15:21:15 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
c325cb139d Settings: added authproviders and login.ashx 2020-07-28 11:13:49 +03:00
3f4ad15b46 Files: fropbox 2020-03-06 16:17:17 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
c0cc00bfbe Files:DI 2020-02-13 15:19:25 +03:00
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
7c05ba927b DI: KafkaCache 2019-10-11 18:03:03 +03:00
387ce4e9ad DI: configuration 2019-09-27 14:51:09 +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