|
8bbe0deb53
|
Merge branch 'release/v2.0.0' into feature/updating_translations
# Conflicts:
# i18next/client.babel
# i18next/common.babel
# packages/client/public/locales/az/Files.json
# packages/client/public/locales/az/FormGallery.json
# packages/client/public/locales/az/InfoPanel.json
# packages/client/public/locales/az/JavascriptSdk.json
# packages/client/public/locales/az/Settings.json
# packages/client/public/locales/bg/Files.json
# packages/client/public/locales/bg/FormGallery.json
# packages/client/public/locales/bg/InfoPanel.json
# packages/client/public/locales/bg/JavascriptSdk.json
# packages/client/public/locales/bg/Settings.json
# packages/client/public/locales/cs/Files.json
# packages/client/public/locales/cs/FormGallery.json
# packages/client/public/locales/cs/InfoPanel.json
# packages/client/public/locales/cs/JavascriptSdk.json
# packages/client/public/locales/cs/Settings.json
# packages/client/public/locales/de/Files.json
# packages/client/public/locales/de/FormGallery.json
# packages/client/public/locales/de/InfoPanel.json
# packages/client/public/locales/de/JavascriptSdk.json
# packages/client/public/locales/de/Settings.json
# packages/client/public/locales/el-GR/Files.json
# packages/client/public/locales/el-GR/FormGallery.json
# packages/client/public/locales/el-GR/InfoPanel.json
# packages/client/public/locales/el-GR/JavascriptSdk.json
# packages/client/public/locales/el-GR/Settings.json
# packages/client/public/locales/en/Files.json
# packages/client/public/locales/es/Files.json
# packages/client/public/locales/es/FormGallery.json
# packages/client/public/locales/es/InfoPanel.json
# packages/client/public/locales/es/JavascriptSdk.json
# packages/client/public/locales/es/Settings.json
# packages/client/public/locales/fi/Files.json
# packages/client/public/locales/fi/FormGallery.json
# packages/client/public/locales/fi/InfoPanel.json
# packages/client/public/locales/fi/JavascriptSdk.json
# packages/client/public/locales/fi/Settings.json
# packages/client/public/locales/fr/Files.json
# packages/client/public/locales/fr/FormGallery.json
# packages/client/public/locales/fr/InfoPanel.json
# packages/client/public/locales/fr/JavascriptSdk.json
# packages/client/public/locales/fr/Settings.json
# packages/client/public/locales/hy-AM/Files.json
# packages/client/public/locales/hy-AM/FormGallery.json
# packages/client/public/locales/hy-AM/InfoPanel.json
# packages/client/public/locales/hy-AM/JavascriptSdk.json
# packages/client/public/locales/hy-AM/Settings.json
# packages/client/public/locales/it/Files.json
# packages/client/public/locales/it/FormGallery.json
# packages/client/public/locales/it/InfoPanel.json
# packages/client/public/locales/it/JavascriptSdk.json
# packages/client/public/locales/it/Settings.json
# public/locales/az/Common.json
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/el-GR/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/hy-AM/Common.json
# public/locales/it/Common.json
|
2023-11-20 15:55:26 +04:00 |
|
|
83a670d256
|
Fix UselessTranslationKeysTest (removed old translations)
|
2023-11-20 13:16:33 +04:00 |
|
|
71a496d472
|
Update translations: az, bg, cs, de, el, es, fi, fr, hy, it
|
2023-11-17 16:15:11 +03:00 |
|
|
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 |
|
|
fb6d0b06a9
|
edited 'Move to Trash' description
|
2023-09-19 12:29:04 +03:00 |
|
|
b3470375cb
|
Web: Fix translations to other languages
|
2023-09-12 17:57:27 +04:00 |
|
|
09238dda41
|
Translations: Removed duplicate keys (MoveToTrashFileFromPersonal, MoveToTrashItemsFromPersonal)
|
2023-04-13 17:47:05 +04:00 |
|
|
ad514df77c
|
added translations
|
2023-03-30 18:29:03 +03:00 |
|
|
073aa9943f
|
Fix WrongTranslationVariablesTest issues + added missing files and key sorting
|
2022-10-25 14:52:15 +03:00 |
|
|
c956d8b696
|
Web: Merged 'Files' module with 'Client' and fixed paths
|
2022-07-24 19:57:03 +03:00 |
|