Commit Graph

300 Commits

Author SHA1 Message Date
dfe05b707a Merge branch 'develop' into bugfix/selectors 2024-02-20 14:36:45 +03:00
5752c6a0b6 Fix groups translations 2024-02-20 00:30:49 +04:00
namushka
b672c0579c translations update 2 + fixed insideGroup Department column 2024-02-19 17:41:44 +03:00
namushka
d796213a67 Translations update 2024-02-19 16:05:06 +03:00
d47aa36c85 Merge branch 'develop' into bugfix/selectors 2024-02-14 13:57:36 +03:00
3dc49cf352 Auto-refactoring of translations 2024-02-14 13:16:02 +04:00
20887d0f4b Move some error translation keys to common 2024-02-14 02:27:50 +04:00
9761a340f5 Move many translation keys to Common 2024-02-13 04:42:10 +04:00
e885c0485d Merge branch 'hotfix/v2.0.2' into develop
# Conflicts:
#	packages/client/src/pages/Home/Hooks/usePublic.js
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/en/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
#	public/locales/ja-JP/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/pt/Common.json
#	public/locales/ro/Common.json
#	public/locales/ru/Common.json
#	public/locales/uk-UA/Common.json
#	public/locales/zh-CN/Common.json
2024-02-02 16:15:04 +04:00
ee2f010de3 edited oform -> PDF form 2024-02-01 16:06:21 +03:00
Akmal Isomadinov
a7f2c24393 Shared:Components:Cron Updated translation and deleted old translations 2024-01-24 18:36:12 +05:00
cd453f81c0 Merge branch 'hotfix/v2.0.1' into develop 2023-12-15 18:52:31 +04:00
c051c75741 added rtl-keys 2023-12-15 14:42:38 +03:00
1ccfe02732 Merge branch 'develop' into feature/management 2023-11-29 12:43:55 +04:00
4c3057c645 Add translations of multiple languages (ar, ja, ko, lo, lv, nl, pl, pt, ro, ru, sk, sl, tr, uk, vi, zh) 2023-11-28 16:53:55 +03:00
1e87bc0eac Public: translation fixed 2023-11-27 20:07:28 +05:00
e347aacf11 Merge branch 'develop' into feature/management
# Conflicts:
#	package.json
#	yarn.lock
2023-11-21 12:40:25 +04:00
83a670d256 Fix UselessTranslationKeysTest (removed old translations) 2023-11-20 13:16:33 +04:00
40e941d4db Merge branch 'release/v2.0.0' into feature/form-gallery-error-view 2023-11-16 23:03:36 +04:00
68733bd54c Fix UselessTranslationKeysTest (removed useless keys) 2023-11-16 13:30:07 +04:00
29bbf2c8b1 Fix UselessTranslationKeysTest (removed useless AddFilter key) 2023-11-16 13:22:03 +04:00
namushka
14bdc19485 Merge branch 'release/v2.0.0' into feature/form-gallery-error-view 2023-11-15 13:53:53 +03:00
e9a292004a Fix EnDublicatesByContentTest (moved "Price" and "Free" keys to Common translations) 2023-11-15 14:47:32 +04:00
3a2c002d72 Fix FullEnDublicatesTest (moved "Plugins" key to Common translations) 2023-11-15 14:32:58 +04:00
namushka
877b32d527 added error screen for form gallery 2023-11-13 18:29:33 +03:00
3170833b98 Merge branch 'develop' into feature/management
# Conflicts:
#	frontend.macos.code-workspace
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js
#	yarn.lock
2023-11-09 19:13:20 +05:00
de5f65b632 Public: added ru translation for management 2023-11-08 18:56:04 +05:00
Vladimir Khvan
8abea90a92 fix Bug 63907 | first name and last name validation was added 2023-10-27 18:12:01 +05:00
Viktor Fomin
8d606c78e7 Web: delete useless 2023-09-27 14:15:47 +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
4048d8dc82 Web: removed useless translation key ResetButton 2023-09-22 17:21:24 +04:00
8371330d3c Web: Applied new design 2023-09-22 16:39:08 +04:00
44dbeb48cd Merge branch 'develop' into feature/document-service-location 2023-09-21 13:38:25 +04:00
Viktor Fomin
c0d87940f0 Web: move ExpiredLink translate to Common 2023-09-20 17:35:38 +03:00
3d20697ac0 Web: Translation: Fix UTC key duplication + sorting 2023-09-20 15:36:34 +04:00
mushka-n
d98680b350 moved translations and updated selector 2023-09-18 17:10:16 +03:00
mushka-n
da7aec7445 Merge branch 'develop' into feature/submit-to-form-gallery 2023-09-18 13:06:39 +03:00
9b5572552e Web: Fix ru translations 2023-09-15 18:28:31 +04:00
Viktor Fomin
2f6861f43f Web: add translates 2023-09-14 14:42:46 +03:00
mushka-n
d96911a37c merge develop + merge fix 2023-09-11 13:26:58 +03:00
14e080abb6 Web: Cron: Added ru language 2023-09-11 13:16:39 +04:00
mushka-n
e1d989c6d2 merge develop + merge fix 2023-09-08 03:27:39 +03:00
c29f577df6 Merge branch 'develop' into feature/adding-new_ru 2023-09-07 14:10:20 +04:00
96b916d81e Merge branch 'hotfix/v1.1.3' into develop 2023-09-05 09:45:42 +04:00
d3198671ba Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into feature/zoom-login
# Conflicts:
#	packages/common/constants/index.js
2023-09-04 16:38:06 +03:00
613938b819 Web: Added Zoom login button, translates and icons 2023-09-04 16:06:55 +03:00
c1bf6bf308 added new texts ru 2023-09-04 12:57:19 +03:00
efdd42f8f6 Merge branch 'develop' into feature/rtl-interface-client 2023-09-01 15:30:48 +02:00
3e6a417d19 Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
#	common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
#	migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
#	packages/client/src/components/panels/SelectFileDialog/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js
#	packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
#	packages/client/src/store/ProfileActionsStore.js
#	packages/common/api/files/index.js
#	packages/common/store/AuthStore.js
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	yarn.lock
2023-09-01 15:33:39 +03:00
19a1c80a5f edited ar language name 2023-08-30 15:39:37 +03:00