IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
f0f75c7c60
DocSpace-client/common/ASC.Common
History
Sergey Linnik b2235b90cb Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 
# Conflicts:
#	common/ASC.Api.Core/Model/EmployeeFullDto.cs
#	common/ASC.Core.Common/Core/UserInfo.cs
#	common/ASC.Core.Common/EF/FireBaseUser.cs
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	common/ASC.IPSecurity/Models/IPRestriction.cs
#	common/services/ASC.Data.Backup/Api/BackupController.cs
#	products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs
#	products/ASC.Files/Core/ApiModels/RequestDto/ExternalShareRequestDto.cs
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Helpers/DocumentService.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Server/Api/EditorController.cs
#	products/ASC.Files/Server/Api/FilesController.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.Files/Server/Api/SecurityController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Server/Api/TagsController.cs
#	products/ASC.Files/Server/Api/ThirdpartyController.cs
#	products/ASC.Files/Server/Api/UploadController.cs
#	products/ASC.Files/Server/Api/VirtualRoomsController.cs
#	products/ASC.People/Server/Api/ContactsController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/CustomNavigationController.cs
#	web/ASC.Web.Api/Api/Settings/IpRestrictionsController.cs
#	web/ASC.Web.Api/Api/Settings/LdapController.cs
#	web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
#	web/ASC.Web.Api/Api/Settings/NotificationController.cs
#	web/ASC.Web.Api/Api/Settings/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Api/Settings/SsoController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
#	web/ASC.Web.Api/Api/Settings/VersionController.cs
#	web/ASC.Web.Api/Api/Settings/WebhooksController.cs
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
#	web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksConfigRequestsDto.cs
#	web/ASC.Web.Api/ApiModels/RequestsDto/WebhooksLogRequest.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/WebhooksConfigDto.cs
2023-08-01 17:07:05 +03:00
..
Caching Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
Collections Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
Data refactoring 2022-11-24 17:21:34 +03:00
DependencyInjection refactoring 2022-04-15 12:08:06 +03:00
Geolocation Payments: fixed price for eu 2023-05-15 19:30:14 +03:00
Log fix build 2022-07-22 11:54:42 +03:00
Logging fix ide001 2022-11-07 12:49:29 +03:00
Mapping fix 2022-09-08 18:39:53 +03:00
Module remove waste asc.common 2022-09-01 11:16:46 +03:00
Properties added new license headers 2022-03-15 21:00:53 +03:00
protos remove unused proto file 2022-04-02 14:59:42 +03:00
Security Common: refactor 2023-02-17 16:29:13 +03:00
Threading Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions 2023-08-01 11:39:57 +03:00
Utils Merge branch 'develop' into feature/public-room-backend 2023-06-02 16:42:16 +03:00
Web formats for editor(pr 1305) 2023-03-21 12:42:09 +03:00
ArgumentNullExceptionExtension.cs IDE1006 2022-03-25 17:54:34 +03:00
ASC.Common.csproj Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
ASC.Common.sln
DIHelper.cs DI: optimization 2022-11-25 17:00:49 +03:00
GlobalUsings.cs Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
RegionSettings.cs set region when start app 2022-11-30 19:03:44 +03:00