IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9b74f49359
DocSpace-client/web/ASC.Web.Api/Core
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
..
AdminHelperSettings.cs Settings: ignore id 2022-07-12 15:33:46 +03:00
AuditResource.az.resx az resources 2022-06-27 14:00:23 +03:00
AuditResource.bg.resx Api: Resources. 2022-05-12 14:25:01 +03:00
AuditResource.cs.resx Api: Resources. 2022-05-12 14:25:01 +03:00
AuditResource.de.resx Api: Resources. 2022-05-12 14:25:01 +03:00
AuditResource.Designer.cs removed past license headers 2022-03-15 19:59:24 +03:00
AuditResource.el-GR.resx Resources renamed 2023-01-18 18:53:09 +03:00
AuditResource.es.resx Api: Resources. 2022-05-12 14:25:01 +03:00
AuditResource.fi.resx Api: Resources. 2022-05-12 14:25:01 +03:00
AuditResource.fr.resx Api: Resources. 2022-05-12 14:25:01 +03:00
AuditResource.hy-AM.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
AuditResource.it.resx edited translations 2023-04-27 17:42:34 +03:00
AuditResource.ja-JP.resx Resources renamed 2023-01-18 18:53:09 +03:00
AuditResource.lv.resx Api: Resources. 2022-05-12 14:25:01 +03:00
AuditResource.nl.resx Api: Resources. 2022-05-12 14:25:01 +03:00
AuditResource.pl.resx Api: Resources. 2022-05-12 14:25:01 +03:00
AuditResource.pt-BR.resx Api: Resources. 2022-05-12 14:25:01 +03:00
AuditResource.resx az resources 2022-06-27 14:00:23 +03:00
AuditResource.ru.resx Api: Resources. 2022-05-12 14:25:01 +03:00
AuditResource.sk.resx Api: Resources. 2022-05-12 14:25:01 +03:00
AuditResource.sl.resx Api: Resources. 2022-05-12 14:25:01 +03:00
AuditResource.tr.resx Api: Resources. 2022-05-12 14:25:01 +03:00
AuditResource.uk-UA.resx Resources renamed 2023-01-18 18:53:09 +03:00
AuditResource.vi.resx Api: Resources. 2022-05-12 14:25:01 +03:00
AuditResource.zh-CN.resx Api: Resources. 2022-05-12 14:25:01 +03:00
BuildVersion.cs Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 2023-08-01 17:07:05 +03:00
DnsSettings.cs UserDbContext - async 2023-03-24 10:53:49 +03:00
FirstTimeTenantSettings.cs fix build 2023-07-19 14:34:00 +03:00
OpensourceGiftSettings.cs Settings: ignore id 2022-07-12 15:33:46 +03:00
PaymentAccountHandler.cs fix build 2023-07-19 14:34:00 +03:00
QuotaHelper.cs Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
SmtpJob.cs fix build 2023-07-19 14:34:00 +03:00
SmtpOperation.cs fix build 2023-07-19 14:34:00 +03:00