Commit Graph

272 Commits

Author SHA1 Message Date
Elyor Djalilov
e986d29240 unused key removed 2022-11-30 15:30:25 +05:00
Elyor Djalilov
5c0322fe80 unused key removed 2022-11-30 15:30:01 +05:00
Elyor Djalilov
08108a6afa unused key removed 2022-11-30 15:29:38 +05:00
Elyor Djalilov
39930f88c6 unused key removed 2022-11-30 15:29:17 +05:00
Elyor Djalilov
feeebbb54a unused key removed 2022-11-30 15:28:50 +05:00
Elyor Djalilov
86442a8704 unused key removed 2022-11-30 15:28:25 +05:00
Elyor Djalilov
1afb601f0a unused key removed 2022-11-30 15:28:01 +05:00
Elyor Djalilov
1c929c76dc unused key removed 2022-11-30 15:27:29 +05:00
Elyor Djalilov
21855e992d unused key removed 2022-11-30 15:26:30 +05:00
Elyor Djalilov
96020455bd unused key removed 2022-11-30 15:26:07 +05:00
Elyor Djalilov
30c0cc2134 unused key removed 2022-11-30 15:25:41 +05:00
Elyor Djalilov
8d930f9830 unused key removed 2022-11-30 15:25:14 +05:00
Elyor Djalilov
3c430abfef unused key removed 2022-11-30 15:24:49 +05:00
Elyor Djalilov
18a8b5a371 unused key removed 2022-11-30 15:24:05 +05:00
Elyor Djalilov
139d313670 unused key removed 2022-11-30 15:23:36 +05:00
Elyor Djalilov
982ab9e047 unused key removed 2022-11-30 15:23:02 +05:00
Elyor Djalilov
7b71164aac unused key removed 2022-11-30 15:22:31 +05:00
Elyor Djalilov
c3e702bbf5 unused key removed 2022-11-30 15:21:15 +05:00
Elyor Djalilov
aa097121c4 unused key removed 2022-11-30 15:15:05 +05:00
Elyor Djalilov
37e15bb90b unused key removed 2022-11-30 15:12:40 +05:00
Elyor Djalilov
eb21deff5c unused key removed 2022-11-30 15:10:05 +05:00
Elyor Djalilov
f7ef99c00d unused key removed 2022-11-30 15:08:06 +05:00
Elyor Djalilov
1a5ecc1f5a unused key removed 2022-11-30 15:07:02 +05:00
Elyor Djalilov
a2ea616c77 unused key removed 2022-11-30 15:04:50 +05:00
Elyor Djalilov
02218f522a unused key removed 2022-11-30 15:04:02 +05:00
Elyor Djalilov
6a61438766 unused key removed 2022-11-30 15:03:34 +05:00
Elyor Djalilov
9b35c5735a unused key removed 2022-11-30 15:02:14 +05:00
Elyor Djalilov
5ffd47d754 deleted duplicate key 2022-11-30 14:53:26 +05:00
Elyor Djalilov
69ebe3b38a deleted duplicate key 2022-11-30 14:33:22 +05:00
Elyor Djalilov
353a3670f8 unused key removed 2022-11-29 13:56:32 +05:00
Elyor Djalilov
e4b077f69b key was moved to the Common 2022-11-29 00:39:03 +05:00
Elyor Djalilov
af4bcf4c05 deleted duplicate keys 2022-11-28 23:01:07 +05:00
Elyor Djalilov
89fe900387 deleted duplicate keys 2022-11-28 22:54:54 +05:00
Elyor Djalilov
04db0e8f0a deleted duplicate key and was moved to the Common 2022-11-28 22:46:57 +05:00
Elyor Djalilov
23109e30c2 deleted duplicate keys and was moved to the Common 2022-11-28 22:19:57 +05:00
Elyor Djalilov
b3b6615226 deleted duplicate key 2022-11-28 22:03:20 +05:00
Elyor Djalilov
d88331c704 deleted duplicate keys 2022-11-28 21:41:21 +05:00
Elyor Djalilov
b924f1582d deleted duplicate keys and was moved to the Common 2022-11-28 15:37:10 +05:00
Elyor Djalilov
3c637dbaa2 deleted duplicate keys and was moved to the Common 2022-11-28 15:19:44 +05:00
Elyor Djalilov
6ac2aceb64 deleted duplicate keys and was moved to the Common 2022-11-28 14:55:18 +05:00
Elyor Djalilov
c628368e9b deleted duplicate keys 2022-11-28 13:26:08 +05:00
Elyor Djalilov
c6f5db2486 unused key removed 2022-11-28 12:12:42 +05:00
Elyor Djalilov
254e21515b unused key removed 2022-11-28 11:58:42 +05:00
Elyor Djalilov
fc59726fe1 empty value keys fixed and deleted duplicate keys 2022-11-28 11:46:04 +05:00
Elyor Djalilov
ad1a6c4d4d Fix bad merge 2022-11-26 14:41:58 +05:00
Elyor Djalilov
bc729a8847 Fix bad merge 2022-11-26 13:47:40 +05:00
Elyor Djalilov
34954cd9e0 Fix bad merge 2022-11-25 17:51:13 +05:00
Elyor Djalilov
b8348af578 Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
#	packages/client/public/locales/en/DeleteDialog.json
#	packages/client/public/locales/en/Files.json
#	packages/client/public/locales/en/InfoPanel.json
#	packages/client/public/locales/en/InviteDialog.json
#	packages/client/public/locales/en/Payments.json
#	packages/client/public/locales/en/Profile.json
#	packages/client/public/locales/en/Settings.json
#	packages/client/public/locales/en/Translations.json
#	packages/client/public/locales/ru/Files.json
#	packages/client/public/locales/ru/InfoPanel.json
#	packages/client/public/locales/ru/Payments.json
#	packages/client/src/components/GlobalEvents/RenameEvent.js
#	packages/client/src/pages/Home/Section/Filter/index.js
2022-11-25 16:27:23 +05:00
3175554fed Web: Files: added create, delete, move to archive room hotkeys 2022-11-08 17:34:32 +03:00
7073fc2fce Web: Changed translation. 2022-11-07 10:43:32 +03:00
dbd34303f1 Web: Fixed translation key. 2022-11-07 10:41:35 +03:00
mushka
75c8f03149 added SuccessSentMultipleInvitatios translation keys to en/ and ru/ 2022-11-03 17:05:26 +03:00
073aa9943f Fix WrongTranslationVariablesTest issues + added missing files and key sorting 2022-10-25 14:52:15 +03:00
mushka
44caa890bd Merge branch 'develop' into feature/info-panel-update 2022-10-25 14:41:39 +03:00
00e6a174df Web: Files: fixed GracePeriodActivatedInfo translation 2022-10-25 13:17:33 +03:00
8f93c2df54 Web: Files: fixed GracePeriodActivatedInfo translation 2022-10-25 12:52:43 +03:00
f0ce5a9552 Web: Files: fixed Payments translations 2022-10-25 12:48:58 +03:00
5753d9722f Web: Files: added invite users dialog warning, fixed GracePeriodActivatedDescription translation 2022-10-25 11:44:30 +03:00
mushka
0adb8efd4c added ExpectPeople translation key 2022-10-19 19:33:57 +03:00
4115bdc5dd Web: Files: fixed TrustedMailDescription translation 2022-10-19 16:03:59 +03:00
b99bde994e Web: Files: fixed LanguageTimeSettingsTooltip translation 2022-10-19 16:01:32 +03:00
mushka
2a52c0b251 Merge branch 'develop' into feature/room-thirdparty-update 2022-10-19 13:22:09 +03:00
mushka
9e62fc8e45 added translation for root label 2022-10-18 13:14:06 +03:00
mushka
3008e549c9 fixed some small translation issues with info panel 2022-10-18 01:55:45 +03:00
TimofeyBoyko
b3395efe50 Merge branch 'develop' into feature/portal-access-rights 2022-10-17 11:45:25 +05:00
mushka
319d842312 fixed MakeRoomPrivateLimitationsWarningDescription translate key in russian 2022-10-13 15:12:58 +03:00
3bd63b26fe Web: Added new translations. 2022-10-13 15:06:51 +03:00
TimofeyBoyko
e56b10d1e5 Web:Client: move 'Room admin' and 'DocSpace admin' translation keys to common 2022-10-13 15:35:58 +05:00
cf2547e030 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/common/constants/index.js
2022-10-11 10:20:42 +03:00
8e7bf575ed Web: Fixed translation (ru). 2022-10-06 14:17:52 +03:00
d3d4ff6639 Web: Fixed description of grace period. 2022-10-05 13:34:59 +03:00
a2fb5e4b36 Web: Changed translations for grace period. 2022-10-05 13:26:45 +03:00
c3c64d847c Web: removed useless translations. 2022-10-05 11:55:15 +03:00
11479c14ba Web: Added missing translations. 2022-10-05 11:35:40 +03:00
84c8749e4f Web: Changed translations. 2022-10-05 10:58:10 +03:00
ca1cd06fad Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/public/images/plus.react.svg
#	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/index.js
#	packages/common/components/PrivateRoute/index.js
2022-10-04 17:13:46 +03:00
a5d3106907 Web: Added translation. 2022-10-04 16:52:43 +03:00
mushka
1b2dae0890 Merge branch 'develop' into feature/doc-space-info-panel 2022-10-02 03:45:40 +03:00
mushka
6ef11ff695 fixed spelling in FilesEmptyScreenText translation key 2022-10-02 03:20:29 +03:00
mushka
6fbac45198 complete overhaul of translation kets in en & ru InfoPanel locales, changed history translations 2022-10-02 02:24:49 +03:00
mushka
af16f21d4a Merge branch 'develop' into feature/doc-space-info-panel 2022-09-26 11:00:34 +03:00
7f1d946269 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
#	packages/client/src/pages/PortalSettings/index.js
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
2022-09-23 16:11:23 +03:00
a778e10d58 Web:Client:Delete old translation "MyEmptyContainerDescription". 2022-09-22 15:30:55 +03:00
7133d20a69 Web:Client:Delete translation "SubheadingEmptyText". 2022-09-21 18:09:35 +03:00
mushka
19cbf4bc40 updated russian InfoPanel translation keys 2022-09-20 14:08:32 +03:00
6448b63318 Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/constants/index.js
#	web/ASC.Web.Api/Program.cs
2022-09-19 18:16:34 +03:00
6b3ebed8b9 Web: Fixed bugs. 2022-09-19 11:59:47 +03:00
7dec07dc69 Web:Client:Delete old translation. 2022-09-19 11:28:05 +03:00
mushka
9c8fa64983 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-16 15:33:29 +03:00
mushka
fb0e23b2cf added some translations for history 2022-09-16 15:12:03 +03:00
bec4f11dcd Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/components/Loaders/index.js
#	packages/common/store/AuthStore.js
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	packages/login/webpack.config.js
#	products/ASC.Files/Service/Program.cs
#	web/ASC.Web.Api/Program.cs
2022-09-15 17:16:04 +03:00
21fc46b8bc Web: Removed useless translations. 2022-09-15 15:07:26 +03:00
TimofeyBoyko
0dba384037 Merge branch 'develop' into feature/redesign-personal-filter 2022-09-15 14:29:57 +03:00
TimofeyBoyko
fe98362066 Web:Client: change translation key 'ByLastModifiedDate' to 'ByLastModified' 2022-09-15 14:07:02 +03:00
TimofeyBoyko
977dc1f7ed Web:Client: change translation key 'ByCreationDate' to 'ByCreation' 2022-09-15 14:02:53 +03:00
20fe2a3763 Web:Added values for the downgrade plan dialog from the stores. 2022-09-15 12:54:00 +03:00
c0244b5400 Web: Added plan title from the store. 2022-09-14 17:17:40 +03:00
28a3096a25 Web: Files: Settings: styling + new translations 2022-09-14 12:37:33 +03:00
8e78498856 Wed: Added new stores. 2022-09-14 09:55:22 +03:00
d94918a1de Merge branch 'develop' into feature/additional-resources 2022-09-13 10:52:26 +03:00
16a9dc020d Web: Files: fixed catalog-header translation, moved "Other" translation to Translations.json, added "Rooms" translation 2022-09-12 14:32:54 +03:00
377d3be960 Merge branch 'develop' into feature/additional-resources 2022-09-10 19:46:57 +03:00
8df94b6af1 i18n: Translations: fix project files + sorting 2022-09-09 18:02:39 +03:00
mushka
ab7ace5af6 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-09 13:22:36 +03:00
05c01d85e6 Web: Fix toast translations (Remove room(s) issue) 2022-09-09 11:22:04 +03:00
d016efea48 Web: Moved translations to the common. 2022-09-09 11:12:02 +03:00
TimofeyBoyko
ec0e91ee99 Merge branch 'feature/change-owner-dialog' of github.com:ONLYOFFICE/DocSpace into feature/change-owner-dialog 2022-09-08 18:36:04 +03:00
TimofeyBoyko
07c7352604 Web:Client:Locales: clone translation for ChangePortalOwner 2022-09-08 18:19:46 +03:00
5954c20c37 Web: Translations: Moved all toasts title translations to Common.json 2022-09-08 12:10:33 +03:00
e4c47bd230 Web: Added the number of days of delay in translations. 2022-09-06 18:25:53 +03:00
a9b7facd9a Web: Added information if the user is not found. 2022-09-06 14:13:00 +03:00
afe2de7521 Web: Added new translations. 2022-09-06 11:04:16 +03:00
150060faff Web: Refactoring, added downgrade plan button. 2022-09-06 10:52:02 +03:00
3ba7052e2f Web: Added downgrade plan dialog. 2022-09-06 10:50:11 +03:00
mushka
0a2318ea59 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-05 20:53:35 +03:00
mushka
f0956da7d0 translated keys in /Files to russian (for context options) 2022-09-05 18:02:56 +03:00
b034f904f9 Web: It was hid cost calculation in grace and expired periods. 2022-09-05 17:30:07 +03:00
7b623c4e30 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/utils/settingsTree.js
#	packages/common/store/AuthStore.js
#	packages/components/slider/index.js
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2022-09-05 10:19:52 +03:00
89f9e10f84 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding 2022-09-02 01:24:12 +03:00
de00a24e3a Web: Added pay button. 2022-09-01 17:52:47 +03:00
69b692bd40 Web: Added functionality for the expired period. 2022-09-01 17:28:08 +03:00
Artem Tarasov
4ac1eb4c5c Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/components/Badges.js
#	packages/client/src/components/IndicatorLoader/index.js
#	packages/client/src/components/QuickButtons.js
#	packages/client/src/components/panels/UploadPanel/SubComponents/LoadingButton.js
#	packages/client/src/pages/About/AboutContent.js
#	packages/client/src/pages/Confirm/sub-components/activateEmail.js
#	packages/client/src/pages/Home/InfoPanel/Header/index.js
#	packages/client/src/pages/VersionHistory/Section/Body/VersionBadge.js
#	packages/client/src/store/TargetUserStore.js
#	packages/common/components/ColorTheme/ColorTheme.js
#	packages/common/components/FilterInput/sub-components/FilterBlockItem.js
#	packages/common/components/FilterInput/sub-components/FilterButton.js
#	packages/common/components/FloatingButton/FloatingButton.js
#	packages/common/components/Navigation/sub-components/item.js
#	packages/common/store/AuthStore.js
#	packages/components/badge/index.js
#	packages/components/button/index.js
#	packages/components/calendar/index.js
#	packages/components/catalog-item/index.js
#	packages/components/combobox/sub-components/combo-button.js
#	packages/components/input-block/index.js
#	packages/components/main-button/index.js
#	packages/components/submenu/index.js
#	packages/components/tabs-container/index.js
#	packages/components/text-input/text-input.js
#	packages/components/textarea/index.js
#	packages/components/toggle-button/index.js
#	packages/login/src/Login.jsx
2022-08-31 16:25:55 +03:00
33fa1dd087 Web: Added sales department request dialog. 2022-08-31 12:55:34 +03:00
Artem Tarasov
0621fd9c86 Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/components/dialogs/ConnectDialog/index.js
#	packages/login/src/Login.jsx
#	packages/login/src/client/components/sub-components/forgot-password-modal-dialog.tsx
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	yarn.lock
2022-08-30 18:38:12 +03:00
605aee5529 Merge branch 'develop' into feature/security-history-audit 2022-08-30 11:55:19 +05:00
dc3ba67fea Web: Client: added DownloadReportBtn ru translation 2022-08-30 11:53:06 +05:00
c794bf5308 Web: Fixed warnings. 2022-08-29 17:51:10 +03:00
8ab27efaef Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding 2022-08-29 17:19:16 +03:00
mushka
435e15b217 added enw translation keys for dropzone 2022-08-29 13:49:43 +03:00
9154b971c0 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/api/settings/index.js
#	packages/common/components/Loaders/index.js
2022-08-29 13:06:44 +03:00
e3e47364e0 Merge branch 'develop' into feature/security-history-audit 2022-08-29 13:36:09 +05:00
17a557e96a Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding 2022-08-28 00:12:05 +03:00
Artem Tarasov
0a3ebbc436 Web: Login: translations for InvalidError moved to login 2022-08-27 01:48:29 +03:00
mushka
56c2cd64c5 Merge branch 'develop' into feature/create-room 2022-08-26 19:28:06 +03:00
2bfa12f8b6 Web: Changed translations, deleted useless translations. 2022-08-26 17:54:50 +03:00
80e83b0b2b Web: Client: added ru translation for security history 2022-08-26 19:10:16 +05:00
ac47004401 Web: Fixed translations. 2022-08-26 10:25:56 +03:00
8998c9ee5b Merge branch 'feature/docspace-backup' of github.com:ONLYOFFICE/AppServer into feature/docspace-backup 2022-08-26 10:21:08 +03:00
084cea375a Web: Fixed translation for module documents. 2022-08-26 10:18:54 +03:00
63ba97d982 Web: Fixed styles. 2022-08-26 08:14:44 +03:00
d8ff05f7c6
Merge branch 'develop' into feature/docspace-backup 2022-08-25 16:34:59 +03:00
1354b95534 Client: delete useless translates 2022-08-25 13:00:22 +03:00
mushka
2b936a8879 added new roomType translation in russian 2022-08-24 19:50:09 +03:00
61ff3cfd15 Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe 2022-08-24 18:00:33 +03:00
4f666dfe25 Web: Added portal unavailable page. 2022-08-24 14:59:21 +03:00
6c331a3074 Web: Added functionality for the grace period. 2022-08-24 10:25:08 +03:00
95a41119f6 Client: move translates 2022-08-23 13:21:37 +03:00
737359b21a Merge branch 'develop' into feature/stripe 2022-08-23 12:05:06 +03:00
52a008ca61 Web: Fixed translations,icons. 2022-08-22 16:16:49 +03:00
80f0e53912 Web: Fixed translation. 2022-08-22 13:22:58 +03:00