IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11b0746927
DocSpace-buildtools/public/locales
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
..
ar-SA Web: Applied new design 2023-09-22 16:39:08 +04:00
az Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
bg Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
cs Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
de Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
el-GR Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
en Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
es Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
fi Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
fr Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
hy-AM Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
it Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
ja-JP Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
ko-KR Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
lo-LA Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
lv Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
nl Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
pl Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
pt Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
pt-BR Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
ro Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
ru Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
sk Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
sl Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
tr Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
uk-UA Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
vi Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
zh-CN Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00