|
d683aa65b3
|
Fix all UselessTranslationKeysTest issues
|
2022-12-02 18:33:25 +03:00 |
|
Elyor Djalilov
|
7e06c67e00
|
Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
# packages/client/src/pages/Home/InfoPanel/Header/index.js
|
2022-11-30 23:07:13 +05:00 |
|
Elyor Djalilov
|
b69c737c9d
|
key was moved to the Common
|
2022-11-30 22:58:33 +05:00 |
|
Elyor Djalilov
|
a944200dac
|
key was moved to the Common
|
2022-11-30 22:46:35 +05:00 |
|
Elyor Djalilov
|
ad5fc420b4
|
unused key removed
|
2022-11-30 19:57:19 +05:00 |
|
Elyor Djalilov
|
668c65972a
|
unused key removed
|
2022-11-30 19:55:27 +05:00 |
|
Elyor Djalilov
|
b07d64bf50
|
unused key removed
|
2022-11-30 19:55:00 +05:00 |
|
Elyor Djalilov
|
6b08016970
|
unused key removed
|
2022-11-30 19:52:26 +05:00 |
|
Elyor Djalilov
|
ca437e87f1
|
unused key removed
|
2022-11-30 19:49:10 +05:00 |
|
Elyor Djalilov
|
96ffde2d3e
|
unused key removed
|
2022-11-30 19:47:27 +05:00 |
|
Elyor Djalilov
|
47eff7bd20
|
unused key removed
|
2022-11-30 19:42:50 +05:00 |
|
Elyor Djalilov
|
4fd7987274
|
unused key removed
|
2022-11-30 19:40:27 +05:00 |
|
Elyor Djalilov
|
9ee52588bd
|
unused key removed
|
2022-11-30 19:37:05 +05:00 |
|
Elyor Djalilov
|
84c70aa0e4
|
unused key removed
|
2022-11-30 19:34:58 +05:00 |
|
Elyor Djalilov
|
bc6a4b445f
|
unused key removed
|
2022-11-30 19:33:04 +05:00 |
|
Mushka Nikita
|
c6b4a076b6
|
moved new translation keys to Common
|
2022-11-30 13:00:30 +03:00 |
|
Elyor Djalilov
|
e4b077f69b
|
key was moved to the Common
|
2022-11-29 00:39:03 +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
|
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
|
fc59726fe1
|
empty value keys fixed and deleted duplicate keys
|
2022-11-28 11:46:04 +05:00 |
|
TimofeyBoyko
|
e56b10d1e5
|
Web:Client: move 'Room admin' and 'DocSpace admin' translation keys to common
|
2022-10-13 15:35:58 +05:00 |
|
|
f013c74475
|
Web: Added additional units for measuring the amount of information, added verification.
|
2022-10-11 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 |
|
|
1f5384dc0c
|
Web: Common: added hide menu translation
|
2022-09-26 12:37:21 +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 |
|
|
20fe2a3763
|
Web:Added values for the downgrade plan dialog from the stores.
|
2022-09-15 12:54:00 +03:00 |
|
|
28a3096a25
|
Web: Files: Settings: styling + new translations
|
2022-09-14 12:37:33 +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 |
|
|
d016efea48
|
Web: Moved translations to the common.
|
2022-09-09 11:12:02 +03:00 |
|
|
5954c20c37
|
Web: Translations: Moved all toasts title translations to Common.json
|
2022-09-08 12:10:33 +03:00 |
|
|
ced1ef8c8f
|
Web: Translations: Renamed key Culture_en to Culture_en-GB
|
2022-09-06 12:52:19 +03:00 |
|
|
0e0fe15e1d
|
Web: Translations: Renamed some Culture_ keys
|
2022-09-06 11:28:25 +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 |
|
|
a9338edd81
|
Web: Transferring translations to a common file
|
2022-08-31 15:22:48 +03:00 |
|
mushka
|
4379a34bcf
|
Merge branch 'develop' into feature/create-room
|
2022-08-15 16:01:20 +03:00 |
|
mushka
|
f2112365b8
|
Merge branch 'develop' into feature/create-room
|
2022-08-01 09:59:21 +03:00 |
|
mushka
|
d9fb015eb5
|
added Tags and NoTags keys to Common translation
|
2022-07-26 20:34:05 +03:00 |
|
|
0e0cc87aba
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
# public/locales/az/Common.json
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/el/Common.json
# public/locales/en/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/it/Common.json
# public/locales/ja/Common.json
# public/locales/ko/Common.json
# public/locales/lo/Common.json
# public/locales/lv/Common.json
# public/locales/nl/Common.json
# public/locales/pl/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/sk/Common.json
# public/locales/sl/Common.json
# public/locales/tr/Common.json
# public/locales/uk/Common.json
# public/locales/vi/Common.json
# public/locales/zh-CN/Common.json
|
2022-07-26 19:02:17 +03:00 |
|
Artem Tarasov
|
eb352fd860
|
Web: Client/public: Moved PreparePortalTitle key from PreporationPortal.json to Common.json.
|
2022-07-25 17:54:51 +03:00 |
|
|
3fd8aa98fb
|
Web: fix merge
|
2022-07-22 19:19:03 +03:00 |
|
|
44c65ee52c
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
# public/locales/az/Common.json
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/el/Common.json
# public/locales/en/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/it/Common.json
# public/locales/ja/Common.json
# public/locales/ko/Common.json
# public/locales/lo/Common.json
# public/locales/lv/Common.json
# public/locales/nl/Common.json
# public/locales/pl/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/sk/Common.json
# public/locales/sl/Common.json
# public/locales/tr/Common.json
# public/locales/uk/Common.json
# public/locales/vi/Common.json
# public/locales/zh-CN/Common.json
# web/ASC.Web.Client/src/store/index.js
|
2022-07-22 19:04:35 +03:00 |
|
|
cf1b168dd6
|
Web: move locales to Common
|
2022-07-20 12:22:38 +03:00 |
|
|
e5f56f6855
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
|
2022-07-07 18:12:26 +03:00 |
|
|
ed45bb0118
|
Fix Bug 57978 - Client.Clouds. Rename button 'Delete third-party' to 'Disconnect'
|
2022-07-05 16:58:05 +03:00 |
|
|
b54e47a10e
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
|
2022-07-01 13:37:47 +03:00 |
|