|
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 |
|
|
7e828b5643
|
Autofac: fix
|
2020-11-02 19:27:08 +03:00 |
|
|
43beaf6f6b
|
Refactoring: scope
|
2020-10-29 17:30:08 +03:00 |
|
|
049e8f63e9
|
Refactoring: scope.
|
2020-10-29 11:13:51 +03:00 |
|
|
830c73a134
|
Scope: refactoring
|
2020-10-19 18:53:15 +03:00 |
|
|
c622be89a3
|
revert discard
|
2020-10-12 22:39:23 +03:00 |
|
SuhorukovAnton
|
ba1ed22345
|
fix-messages: IDE0058
|
2020-09-30 14:50:39 +03:00 |
|
|
feba6bb1c0
|
ApiSystem: System.Text.Json
|
2020-07-09 11:08:42 +03:00 |
|
|
fed4d206f7
|
Revert logger
|
2020-06-04 16:46:58 +03:00 |
|
|
794486f335
|
Notify: temp log
|
2020-06-04 16:04:17 +03:00 |
|
|
85cec8fff2
|
ApiSystem: fix autofac
|
2020-05-20 16:06:35 +03:00 |
|
|
d08a564946
|
ApiSystem: service, config, di
|
2020-05-19 20:41:37 +03:00 |
|
|
b29b11ad0f
|
Merge branch 'master' into feature/apisystem
# Conflicts:
# ASC.Web.sln
|
2020-05-19 14:45:24 +03:00 |
|
|
39128a7ba0
|
ASC.ApiSystem: replace AuthSignatureAttribute with AuthHandler
|
2020-02-25 14:43:01 +03:00 |
|
|
449c0db1fa
|
ASC.ApiSystem: replace HttpResponseMessage to IActionResult
|
2020-02-25 11:45:16 +03:00 |
|
|
f83dcbced0
|
Added ASC.ApiSystem.csproj
|
2020-02-19 16:19:10 +03:00 |
|