IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
bb5b8cccdd
DocSpace-client/web/ASC.Web.Api/Core
History
pavelbannov b14d6c8ef0 Merge branch 'hotfix/v1.1.3' into develop 
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Core/ITenantService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
#	config/appsettings.json
#	config/nlog.config
#	migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
#	migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
#	packages/client/src/pages/Confirm/sub-components/createUser.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
#	packages/common/components/MoreLoginModal/index.tsx
#	packages/login/src/client/components/sub-components/LoginForm.tsx
#	products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Api/Core/CspSettingsHelper.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	yarn.lock
2023-09-25 10:53:06 +03:00
..
AdminHelperSettings.cs Settings: ignore id 2022-07-12 15:33:46 +03:00
AuditResource.ar-SA.resx added ar 2023-09-08 17:12:01 +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.ko-KR.resx added pt-PT 2023-09-06 17:28:27 +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.pt.resx added pt-PT 2023-09-06 17:28:27 +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
CspSettingsHelper.cs Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
CspStartupTask.cs Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
DnsSettings.cs Merge branch 'hotfix/v1.1.2' into develop 2023-08-28 18:53:10 +03:00
FirstTimeTenantSettings.cs Merge branch 'hotfix/v1.1.2' into develop 2023-08-28 18:53:10 +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