Commit Graph

604 Commits

Author SHA1 Message Date
Akmal Isomadinov
a12cbd3415 Shared:Components:Cron Refusal of transfers in favor of luxon 2024-01-25 19:42:22 +05:00
Akmal Isomadinov
a7f2c24393 Shared:Components:Cron Updated translation and deleted old translations 2024-01-24 18:36:12 +05:00
1b700299ee Merge branch 'develop' into feature/my-documents-share 2023-12-15 18:22:25 +03: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
9a1e639723 Merge branch 'hotfix/v2.0.1' into develop 2023-12-15 15:20:32 +04:00
cb874bce9a
Merge pull request #120 from ONLYOFFICE/feature/add-new-beta-badge
Feature/add new beta badge
2023-12-14 19:35:25 +04:00
cf782df79f added translations 2023-12-14 16:06:09 +03:00
00a5dfd9dd added translations 2023-12-14 15:51:25 +03:00
213afa8974 added translations 2023-12-14 15:13:07 +03:00
cbc4358686 added vi 2023-12-13 19:13:52 +03:00
ee63b6b0b8 added sk, az 2023-12-13 15:41:23 +03:00
Akmal Isomadinov
642d1a3b42 Web:Client:Wizard Added BetaBadge 2023-12-13 15:50:15 +05:00
f849664079 added translations 2023-12-12 12:47:19 +03:00
6862bb529f added/edited translations 2023-12-11 17:54:33 +03:00
Akmal Isomadinov
cdfc6f651a Added BetaBadge 2023-12-11 17:01:38 +05:00
20d60bba9a Merge branch 'develop' into feature/my-documents-share 2023-12-08 01:15:45 +03:00
5bf8a28485 Merge branch 'develop' into feature/my-documents-share 2023-11-30 13:02:02 +03:00
ecd5ac40e1 Web: add translates 2023-11-30 13:00:39 +03:00
1ccfe02732 Merge branch 'develop' into feature/management 2023-11-29 12:43:55 +04:00
54da881340 Web: fix translates 2023-11-29 03:17:07 +03: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
aa8c3adddf Web: add translates 2023-11-28 14:37:07 +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
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
599056a82d Merge branch 'release/v2.0.0' into feature/plugin-sdk 2023-11-17 13:33:34 +04:00
07aef4ca41 Client:PluginSDK: init 2023-11-17 10:01:27 +03:00
40e941d4db Merge branch 'release/v2.0.0' into feature/form-gallery-error-view 2023-11-16 23:03:36 +04:00
ba520a7ad1 Merge branch 'release/v2.0.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.0.0 2023-11-16 12:33:06 +03:00
25bd37eded fix Bug 65122 - Added a warning dialog about saving a backup in a public room. 2023-11-16 12:32:40 +03: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
87d08a89f8 Auto-sorting Common translations 2023-11-15 14:09:29 +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
Akmal Isomadinov
4bad9df7eb Web:FilesSelector Added restore action 2023-11-03 15:30:26 +05:00
Vladimir Khvan
8abea90a92 fix Bug 63907 | first name and last name validation was added 2023-10-27 18:12:01 +05:00
DmitrySychugov
fd250c57da Merge branch 'develop' into feature/management
# Conflicts:
#	packages/client/src/components/MainBar/index.js
#	packages/client/src/components/NavMenu/index.js
#	packages/common/components/Article/index.js
#	packages/common/components/Article/sub-components/article-header.js
#	packages/common/components/Article/sub-components/article-hide-menu-button.js
#	packages/components/context-menu/index.js
#	yarn.lock
2023-10-25 14:40:50 +05:00
Akmal Isomadinov
ac13bb8303 Client: moved into common translation 2023-10-11 16:49:13 +05:00
DmitrySychugov
2fc16bc9ec Merge remote-tracking branch 'remotes/origin/develop' into feature/management
# Conflicts:
#	build/build.backend.docker.ps1
#	build/build.backend.docker.sh
#	build/build.static.bat
#	build/clear.backend.docker.ps1
#	build/clear.backend.docker.sh
#	build/install/docker/Dockerfile
#	build/install/docker/Dockerfile.runtime
#	build/install/docker/config/nginx/templates/upstream.conf.template
#	build/install/docker/docspace.overcome.yml
#	build/install/docker/docspace.profiles.yml
#	build/start/start.backend.docker.ps1
#	build/start/start.backend.docker.sh
#	common/ASC.Api.Core/Security/EmailValidationKeyModelHelper.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Core/TenantRegistrationInfo.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
#	common/ASC.Data.Backup.Core/Contracts/BackupServiceModel.cs
#	common/ASC.Data.Backup.Core/EF/Model/BackupSchedule.cs
#	common/ASC.Data.Backup.Core/IntegrationEvents/Events/BackupRequestIntegrationEvent.cs
#	common/ASC.Data.Backup.Core/Service/BackupService.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
#	common/services/ASC.ApiSystem/ASC.ApiSystem.csproj
#	common/services/ASC.ApiSystem/Classes/CommonMethods.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	common/services/ASC.ApiSystem/Controllers/SettingsController.cs
#	common/services/ASC.ApiSystem/GlobalUsings.cs
#	common/services/ASC.ApiSystem/Models/SettingsModel.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupRequestedIntegrationEventHandler.cs
#	common/services/ASC.Data.Backup/Api/BackupController.cs
#	common/services/ASC.Data.Backup/ApiModels/BackupDto.cs
#	common/services/ASC.Data.Backup/ApiModels/BackupScheduleDto.cs
#	common/services/ASC.Data.Backup/GlobalUsings.cs
#	config/nginx/onlyoffice.conf
#	migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
#	migrations/postgre/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
#	package.json
#	packages/client/package.json
#	packages/client/src/pages/Confirm/sub-components/auth.js
#	packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/index.js
#	packages/client/src/store/ProfileActionsStore.js
#	packages/common/api/index.js
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
#	web/ASC.Web.Core/Utility/TenantExtra.cs
#	yarn.lock
2023-10-04 16:27:12 +05:00
f778106bc4 Merge branch 'develop' into feature/web-plugins 2023-09-29 10:36:07 +03: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