IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
885e958a79
DocSpace-buildtools/products/ASC.People/Server
History
pavelbannov 6c78438b75 Merge branch 'develop' into feature/optimization-ef 
# Conflicts:
#	common/ASC.Api.Core/Middleware/WebhooksGlobalFilterAttribute.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Core/RegionHelper.cs
#	common/ASC.Core.Common/Data/DbQuotaService.cs
#	common/ASC.Core.Common/GeolocationHelper.cs
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/ConnectionsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/RadicaleController.cs
#	web/ASC.Web.Api/Api/Settings/TfaappController.cs
#	web/ASC.Web.Api/Core/QuotaHelper.cs
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
2023-05-30 14:13:02 +03:00
..
Api Merge branch 'develop' into feature/optimization-ef 2023-05-30 14:13:02 +03:00
ApiModels Merge branch 'develop' into feature/optimization-ef 2023-05-17 11:01:32 +03:00
Log Log: refactoring 2022-05-26 12:01:54 +03:00
Properties refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
Resources added translations 2023-05-11 19:12:10 +03:00
.gitignore ASC.People project is divided into two separate parts: Server and Client 2019-07-10 11:21:12 +03:00
appsettings.json ASC.People project is divided into two separate parts: Server and Client 2019-07-10 11:21:12 +03:00
ASC.People.csproj Merge pull request #1149 from ONLYOFFICE/feature/dotnet7 2023-01-19 22:00:57 +03:00
GlobalUsings.cs CustomSynchronizationContext.CurrentCulture to CultureInfo.CurrentCulture 2023-04-27 13:15:42 +03:00
PeopleProduct.cs IDE1006 2022-03-25 19:26:06 +03:00
Program.cs refactoring 2023-02-27 18:38:01 +03:00
Startup.cs WebHooks: added resources, new methods and settings for disable webhook 2023-02-08 14:17:06 +03:00