Commit Graph

9 Commits

Author SHA1 Message Date
79ea471098 Merge branch 'develop' into refactoring/scope
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Core.Common/BaseCommonLinkUtility.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Migration/Program.cs
#	common/services/ASC.Notify/NotifyServiceLauncher.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Socket.IO.Svc/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Thumbnails.Svc/Program.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-11-04 15:22:43 +03:00
43beaf6f6b Refactoring: scope 2020-10-29 17:30:08 +03:00
SuhorukovAnton
03ae9171b6 connect-controlPanel: fix multitenancy 2020-10-23 10:42:28 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
a35a79c96a moved from release/11 4414f77b 2020-09-18 10:59:23 +03:00
627dd8a97d ApiSystem: fix 2020-05-19 16:22:47 +03:00
b29b11ad0f Merge branch 'master' into feature/apisystem
# Conflicts:
#	ASC.Web.sln
2020-05-19 14:45:24 +03:00
67e7f536d1 ASC.ApiSystem: fixed auth header parsing 2020-02-25 15:06:16 +03:00
39128a7ba0 ASC.ApiSystem: replace AuthSignatureAttribute with AuthHandler 2020-02-25 14:43:01 +03:00