Viktor Fomin
|
248743f614
|
Web: add translates
|
2023-05-10 17:39:23 +03:00 |
|
|
|
98fbbc0f7c
|
Merge branch 'develop' into feature/public-room
# Conflicts:
# packages/client/public/locales/en/Files.json
# packages/client/public/locales/ru/Files.json
|
2023-05-02 15:20:56 +03:00 |
|
Viktor Fomin
|
5de0acaa18
|
Merge branch 'develop' into feature/deep-link
|
2023-05-02 13:09:02 +03:00 |
|
|
|
cf6aeaa746
|
Web: Files: added new translations
|
2023-04-27 17:08:02 +03:00 |
|
Viktor Fomin
|
e749307818
|
Web: move locales Login > Common
|
2023-04-24 14:03:35 +03:00 |
|
|
|
bccb3c86e3
|
Web: Files: added titles to info-panel icon, table-settings icon
|
2023-04-20 15:35:56 +03:00 |
|
|
|
fb72d3b3b5
|
Translations: Moved duplicate key to common
|
2023-04-13 17:54:29 +04:00 |
|
|
|
eafd0f0c0e
|
Translations: Moved duplicate key to common (EnDublicatesByContentTest issue)
|
2023-04-13 17:42:08 +04:00 |
|
|
|
37202673ad
|
Web: Added new translation key "Support"
|
2023-04-06 18:42:12 +04:00 |
|
|
|
0c4d1f8810
|
added translations
|
2023-04-05 17:03:14 +03:00 |
|
Akmal Isomadinov
|
c094a49e41
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-05 10:44:11 +05:00 |
|
Akmal Isomadinov
|
a5ec1923ef
|
Web:Locales:En:Common Fixed translation
|
2023-04-05 10:38:34 +05:00 |
|
|
|
e043518f1f
|
edited line 246
|
2023-04-04 19:02:07 +03:00 |
|
|
|
9bdbfe09d6
|
added translations
|
2023-04-04 18:52:06 +03:00 |
|
|
|
04e0078af9
|
added translations
|
2023-04-04 18:45:32 +03:00 |
|
|
|
2f5405a4d4
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
# Conflicts:
# public/locales/en/Common.json
|
2023-04-04 18:44:08 +03:00 |
|
|
|
4cb671c761
|
Add translations
|
2023-04-04 18:41:28 +03:00 |
|
|
|
e7b2e0916b
|
added translations
|
2023-04-04 18:38:04 +03:00 |
|
|
|
0aa56967dc
|
Web: Fixed translations.
|
2023-04-04 16:38:02 +03:00 |
|
Akmal Isomadinov
|
2b95986819
|
Web:Locales:En:Common Added translation
|
2023-04-04 12:11:54 +05:00 |
|
|
|
5744f7e67c
|
Web: Added team training alert.
|
2023-04-03 15:42:51 +03:00 |
|
|
|
a9355c4ea6
|
Web: Added new LiveChat and BookTraining menu to Profile
|
2023-04-03 14:43:01 +04:00 |
|
|
|
3af54531eb
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-29 10:44:09 +03:00 |
|
|
|
1ef1998541
|
Web: PortalSettings: Payments: Changed translation.
|
2023-03-29 10:41:03 +03:00 |
|
|
|
d44706498d
|
added translations
|
2023-03-28 18:43:17 +03:00 |
|
Timofey Boyko
|
de9b08614f
|
Web:Client:Translations: change Collaborator to PowerUser
|
2023-03-22 08:56:16 +03:00 |
|
|
|
41c966db1c
|
Web: Applied changes to Audit (renamed "room" to "context")
|
2023-03-20 16:07:20 +04:00 |
|
|
|
95734445e3
|
added new translations
|
2023-03-15 18:43:28 +03:00 |
|
|
|
d4ea5f4ccb
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-14 14:14:20 +03:00 |
|
|
|
0044ea935b
|
Web: Removed 'Video guides'.
|
2023-03-14 14:14:14 +03:00 |
|
|
|
1ebc887717
|
Web: Fix Payments translation issues (moved some keys to Common)
|
2023-03-14 15:00:19 +04:00 |
|
|
|
0b911b0d36
|
Web: Moved SizeImageLarge translation key to Common
|
2023-03-14 14:44:57 +04:00 |
|
|
|
eb86665d70
|
Web: Fix some translations issues
|
2023-03-14 14:30:58 +04:00 |
|
|
|
1df9a39a13
|
Web: Fix some translations issues
|
2023-03-14 14:15:43 +04:00 |
|
|
|
ef532e565e
|
Fix UselessTranslationKeysTest issue (Remove PasswordLimitLength key)
|
2023-03-13 14:47:13 +04:00 |
|
|
|
670125fe32
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-13 12:34:46 +03:00 |
|
|
|
d8281d940e
|
Web: Added translation for unexpected error.
|
2023-03-13 12:33:29 +03:00 |
|
|
|
d1c766c6fc
|
Fix FullEnDublicatesTest issues (Archive/to archive)
|
2023-03-13 12:56:29 +04:00 |
|
|
|
4ddbfdb814
|
Web:Add translation "SortBy".
|
2023-03-09 19:10:52 +03:00 |
|
|
|
b53bf3f58a
|
Web:Add "LastModifiedDate" translation.
|
2023-03-09 18:12:20 +03:00 |
|
|
|
386dc43708
|
Web: Files: changed ClearFilter translation
|
2023-03-09 15:40:37 +03:00 |
|
Timofey Boyko
|
eb6456a990
|
Web: add new translation key 'DocSpace owner'
|
2023-03-01 15:16:20 +03:00 |
|
Timofey Boyko
|
41096976a3
|
Web: add new translation key 'HasFullAccess'
|
2023-02-28 11:38:30 +03:00 |
|
Timofey Boyko
|
6ea82302eb
|
Web: add new translation key 'Collaborator'
|
2023-02-22 10:01:31 +03:00 |
|
Elyor Djalilov
|
20e1d49171
|
fix translate
|
2023-02-10 15:51:43 +05:00 |
|
Elyor Djalilov
|
f3c6b14817
|
Fix Bug 61099 - Mobile. The location of the download copy button in the backup menu
|
2023-02-09 13:47:20 +05:00 |
|
|
|
b7bad31a55
|
Fix Bug 60621 - Rooms.Settings.ThirdParty. Hide the ability for admins to connect third-party storage when creating a room, if the setting is disabled.
|
2023-01-18 11:36:06 +03:00 |
|
|
|
dc78694a0b
|
Fix translations of settings
|
2023-01-17 18:14:00 +03:00 |
|
Elyor Djalilov
|
6a686e5224
|
Merge branch 'release/rc-v1.2.0' into feature/dialog-create-file
# Conflicts:
# public/locales/en/Common.json
|
2023-01-12 18:40:04 +05:00 |
|
|
|
46b99d1f25
|
Removed old resources (Team titles - custom names)
|
2023-01-12 16:20:35 +03:00 |
|
|
|
c2ceab129a
|
Merge branch 'release/rc-v1.2.0' into feature/edit-en
|
2023-01-11 10:57:10 +03:00 |
|
|
|
0b64d4223c
|
Web: Default document names have been moved to 'Common' file.
|
2023-01-10 15:26:57 +03:00 |
|
Elyor Djalilov
|
cfe043502b
|
added toggle in common settings
|
2023-01-09 13:45:02 +05:00 |
|
Elyor Djalilov
|
5592a155c8
|
added toggle when creating a file
|
2023-01-09 13:00:04 +05:00 |
|
|
|
6526b1463d
|
edited en
|
2022-12-30 14:56:53 +03:00 |
|
|
|
018288d50b
|
Update common.babel and applied sorting
|
2022-12-23 19:09:17 +03:00 |
|
|
|
c3578d1661
|
Fix EnDublicatesByContentTest issues
|
2022-12-02 18:58:36 +03:00 |
|
|
|
d683aa65b3
|
Fix all UselessTranslationKeysTest issues
|
2022-12-02 18:33:25 +03:00 |
|
|
|
80273d8392
|
Fix NotFoundKeysTest issues
|
2022-12-01 18:55:05 +03:00 |
|
|
|
b0a8c93054
|
Merge branch 'develop' into feature/new-docspace-translations
|
2022-12-01 18:43:19 +03:00 |
|
Timofey Boyko
|
04e0d9bf2b
|
Merge branch 'develop' into feature/accounts-room-list
|
2022-12-01 11:53:22 +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 |
|
Timofey Boyko
|
d2f62168b8
|
Add new translation key 'Member'
|
2022-11-30 17:32:29 +03:00 |
|
Mushka Nikita
|
c6b4a076b6
|
moved new translation keys to Common
|
2022-11-30 13:00:30 +03:00 |
|
Elyor Djalilov
|
26d210c8d7
|
not found keys fixed
|
2022-11-29 15:32:36 +05:00 |
|
Elyor Djalilov
|
e4b077f69b
|
key was moved to the Common
|
2022-11-29 00:39:03 +05:00 |
|
Elyor Djalilov
|
2e44a446af
|
not translated toasts fixed
|
2022-11-28 23:52:29 +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
|
fc59726fe1
|
empty value keys fixed and deleted duplicate keys
|
2022-11-28 11:46:04 +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 |
|
TimofeyBoyko
|
67425e8001
|
Web:Client: rename SureWant to WantToContinue
|
2022-11-10 16:20:57 +03:00 |
|
TimofeyBoyko
|
7fa1fddf79
|
Web:Client: fix translation keys
|
2022-11-10 15:54:53 +03:00 |
|
|
|
bfadb09322
|
Fix some issues of NotFoundKeysTest
|
2022-10-27 18:27:21 +03:00 |
|
Elyor Djalilov
|
42471135ba
|
Merge branch 'develop' into feature/active-sessions
# Conflicts:
# packages/client/src/components/dialogs/index.js
# packages/components/themes/base.js
# packages/components/themes/dark.js
|
2022-10-25 13:41:42 +05:00 |
|
|
|
9c99f3a53f
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-19 19:41:39 +03:00 |
|
Elyor Djalilov
|
d819128bdb
|
Web:Client:ActiveSessions: added translations
|
2022-10-19 18:30:22 +05:00 |
|
TimofeyBoyko
|
e56b10d1e5
|
Web:Client: move 'Room admin' and 'DocSpace admin' translation keys to common
|
2022-10-13 15:35:58 +05:00 |
|
|
|
6d78f37729
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-11 16:05:49 +03:00 |
|
|
|
f013c74475
|
Web: Added additional units for measuring the amount of information, added verification.
|
2022-10-11 10:58:10 +03:00 |
|
|
|
cf2547e030
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/common/constants/index.js
|
2022-10-11 10:20:42 +03:00 |
|
|
|
60b9ed3dd1
|
Web:Add translation "ReconnectStorage".
|
2022-10-10 19:13:01 +03:00 |
|
TimofeyBoyko
|
09dbd9d088
|
Web: move translation key 'AdvancedFilter' from Files to Common
|
2022-10-10 13:53:24 +05: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 |
|
|
|
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 |
|
|
|
a642d42bcc
|
Client: fix translations
|
2022-09-21 16:16:19 +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 |
|
|
|
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 |
|
TimofeyBoyko
|
0dba384037
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-15 14:29:57 +03:00 |
|
|
|
20fe2a3763
|
Web:Added values for the downgrade plan dialog from the stores.
|
2022-09-15 12:54:00 +03:00 |
|
TimofeyBoyko
|
11ba9f379c
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-14 16:35:18 +03:00 |
|
|
|
f3412fa2f8
|
Merge branch 'develop' into feature/redisign-files-settings
|
2022-09-14 11:20:37 +03:00 |
|
|
|
8030f66036
|
Web: Fix translations
|
2022-09-13 17:23:52 +03:00 |
|
TimofeyBoyko
|
42d6b3e7d3
|
Web: add new translation keys
|
2022-09-13 13:47:40 +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 |
|
|
|
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 |
|
|
|
e84ba1ff80
|
Merge branch 'develop' into feature/dns-settings
|
2022-09-02 13:05:58 +03:00 |
|
|
|
3d5447bfa2
|
Web:Added translations for dns.
|
2022-09-02 12:37:00 +03:00 |
|
|
|
89f9e10f84
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-09-02 01:24:12 +03:00 |
|
|
|
a9338edd81
|
Web: Transferring translations to a common file
|
2022-08-31 15:22:48 +03:00 |
|
TimofeyBoyko
|
8bda52c489
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-31 11:38:34 +03:00 |
|
|
|
547c1782f1
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
|
2022-08-30 12:34:48 +03:00 |
|
Vlada Gazizova
|
2f822b0406
|
Merge branch 'develop' into feature/settings-common
|
2022-08-29 22:27:08 +03:00 |
|
TimofeyBoyko
|
2c3dd7276d
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 18:22:45 +03:00 |
|
|
|
8ab27efaef
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-08-29 17:19:16 +03:00 |
|
TimofeyBoyko
|
937d99249e
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 09:47:42 +03:00 |
|
|
|
17a557e96a
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-08-28 00:12:05 +03:00 |
|
Vlada Gazizova
|
302e2e655a
|
Merge branch 'develop' into feature/settings-common
|
2022-08-27 12:17:44 +03:00 |
|
mushka
|
56c2cd64c5
|
Merge branch 'develop' into feature/create-room
|
2022-08-26 19:28:06 +03:00 |
|
|
|
8ecddf3d8a
|
Web: add translates
|
2022-08-25 19:24:32 +03:00 |
|
TimofeyBoyko
|
5dc51e2c32
|
Web:Client:PortalPlugins: add translation keys
|
2022-08-23 14:35:51 +03:00 |
|
|
|
76e9125e86
|
Web:Client:Added translations "Color","Preview","Standard".
|
2022-08-18 12:01:44 +03:00 |
|
TimofeyBoyko
|
d371d865a8
|
Web: add new translation key 'Room'
|
2022-08-17 11:06:44 +03:00 |
|
TimofeyBoyko
|
17ffdff16f
|
Web:Public: add new translation key 'Invite' for en locale
|
2022-08-16 18:45:11 +03:00 |
|
TimofeyBoyko
|
f5e6f97f52
|
Web:Public: add new translation key 'Paid' for en locale
|
2022-08-16 18:34:27 +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 |
|
|
|
4ce9acce3d
|
Merge branch 'develop' into feature/sso
# Conflicts:
# products/ASC.Files/Server/DocStore
|
2022-07-22 17:23:36 +03:00 |
|
|
|
831bdc578f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# packages/asc-web-common/components/Article/styled-article.js
# products/ASC.Files/Client/src/Files.jsx
|
2022-07-21 14:22:28 +03:00 |
|
TimofeyBoyko
|
5a4e9f5ad1
|
Web: fix OtherLabel translation key
|
2022-07-20 15:12:51 +03:00 |
|
|
|
472ed56a05
|
Web: add locales
|
2022-07-20 12:27:04 +03:00 |
|
|
|
cf1b168dd6
|
Web: move locales to Common
|
2022-07-20 12:22:38 +03:00 |
|
TimofeyBoyko
|
3f8502ab8b
|
Web:Files: add new translation keys for rooms
|
2022-07-19 18:39:44 +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 |
|
|
|
33e2b2eccd
|
Web: move SelectFile translate to Common
|
2022-06-28 17:19:40 +03:00 |
|
|
|
9408a5a296
|
Web: Files: Added and applied new "ErrorInternalServer" translation key to Common.json
|
2022-06-23 15:34:52 +03:00 |
|
|
|
b5eb6420b0
|
Revert "Web: moved Error404Text translation to common"
This reverts commit 687951c921.
|
2022-06-23 15:15:49 +03:00 |
|
|
|
687951c921
|
Web: moved Error404Text translation to common
|
2022-06-20 17:49:59 +03:00 |
|
|
|
7ddb0506c9
|
Web: Files: moved Hotkeys translation, added button to open hotkeys
|
2022-06-10 11:30:57 +03:00 |
|
|
|
6c04530f20
|
Web: Files: Delete useless translation.
|
2022-06-01 16:19:59 +03:00 |
|
|
|
219366b3f6
|
Web: Moved translations to Common.
|
2022-06-01 15:56:50 +03:00 |
|
|
|
78ae5b38d2
|
edit translations
|
2022-05-31 18:37:22 +03:00 |
|
|
|
9e1a2e3cb8
|
Edit culture names in Common.json
|
2022-05-30 15:20:08 +03:00 |
|
|
|
8d3921eae9
|
Web: Translations: Removed keys: TitleDocuments, TitleSubfolders, More (UselessTranslationKeysTest issues fix)
|
2022-05-23 20:25:42 +03:00 |
|
|
|
197c09e4b3
|
Web: add Content translate
|
2022-05-20 16:39:41 +03:00 |
|
|
|
e3c441c7bd
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-20 15:57:43 +03:00 |
|
|
|
ab5f692dfc
|
Web: Client: Locales: En: Added "Editing" key
|
2022-05-20 15:56:31 +03:00 |
|
|
|
53dbf47c9d
|
Web: add Attention translate
|
2022-05-20 15:54:21 +03:00 |
|
|
|
b2f6ce39f7
|
Update translations (common, files)
|
2022-05-18 19:54:25 +03:00 |
|
|
|
dad9016695
|
Web: Translations: Moved "NotFoundTitle" key from "studio" to "Common": (EnDublicatesByContentTest33ms issue fix)
|
2022-05-17 18:17:11 +03:00 |
|
|
|
93a53092d6
|
Web: Translations: Fix UselessTranslationKeysTest issues
|
2022-05-13 19:33:16 +03:00 |
|
|
|
fc846860f9
|
Web: Translations: Moved "AddUsers" key from "Files,People" to "Common" (test issue fix)
|
2022-05-12 14:18:16 +03:00 |
|
|
|
b2474c409d
|
Web: Translations: Moved "Common" key from "Studio" to "Common" and removed useless "Documents" key (test issue fix)
|
2022-05-11 19:03:33 +03:00 |
|
|
|
ca0eb26067
|
Web: Removed already existing translation key from common (test issue fix)
|
2022-05-11 17:58:44 +03:00 |
|
|
|
58b7c5f678
|
Web: Translations: Moved "Location" key from "People" to "Common": (test issue fix)
|
2022-05-11 17:40:23 +03:00 |
|
|
|
b0450cf55b
|
Web: Translations: Moved "Comments" key from "People" to "Common": (test issue fix)
|
2022-05-11 17:25:10 +03:00 |
|
|
|
781b0eb3e4
|
Web: Translations: Moved "Info" key from "studio" to "Common": (test issue fix)
|
2022-05-11 17:11:52 +03:00 |
|
|
|
4ae8a10f7f
|
Web: Translations: Moved "AccessRights" key from "studio" to "Common": (test issue fix)
|
2022-05-11 16:51:37 +03:00 |
|
|
|
7b391e1cef
|
Web: added filter translation
|
2022-05-05 20:26:09 +05:00 |
|
|
|
f86afee2d5
|
Web: move t key from People to Common
|
2022-04-25 21:39:46 +03:00 |
|
|
|
78944a490e
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 18:55:41 +03:00 |
|
Timofey Boyko
|
216ae27b25
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-20 18:04:57 +03:00 |
|
|
|
e8c46ba42c
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2022-04-19 14:04:10 +03:00 |
|
|
|
47ffc849a5
|
Merge branch 'feature/virtual-rooms-1.2' into feature/connected-clouds-redesign
|
2022-04-18 15:05:23 +03:00 |
|
Timofey Boyko
|
ca9e132a67
|
Web: remove key 'DarkMode' in EU and RU locales
|
2022-04-18 12:37:08 +03:00 |
|
|
|
6dbf77317d
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-18 10:32:31 +03:00 |
|
|
|
b9a6c618bc
|
Web: Moved Connect translation, added new translations
|
2022-04-15 16:39:57 +03:00 |
|
|
|
165a5979a3
|
Web: Files: Added new translations.
|
2022-04-13 16:02:27 +03:00 |
|
|
|
35950126cb
|
Web: Files: Added new translations.
|
2022-04-13 15:14:37 +03:00 |
|
|
|
90bf5a7dc2
|
Web: Files: added info panel for OFORMsGallery
|
2022-04-07 16:52:16 +03:00 |
|
|
|
f04d679df4
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-04 18:25:32 +03:00 |
|
Timofey Boyko
|
d812df9332
|
Web: add new key 'DarkMode' for EU and RU locales
|
2022-04-04 13:31:55 +03:00 |
|
|
|
8c782a7903
|
Web: Files: added OFORMs gallery
|
2022-03-31 16:10:16 +03:00 |
|
|
|
1922da4ab9
|
merge
|
2022-03-24 20:56:51 +03:00 |
|
|
|
6b84d183b8
|
Web: add translates
|
2022-03-17 12:41:57 +03:00 |
|
|
|
0cd4cb49ed
|
Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/themes/dark.js
# public/locales/de/Common.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Login/src/Login.jsx
|
2022-03-16 11:03:07 +03:00 |
|
|
|
a7199bd3d4
|
Web: sort locales by key
|
2022-03-10 23:50:43 +03:00 |
|
|
|
b71c2eabc5
|
Web:Added translation for "Title" for locales en, pt-BR, ru, de, fr, it.
|
2022-03-09 12:03:01 +03:00 |
|
|
|
ee446c8e67
|
Web: moved translates to Common
|
2022-03-09 11:04:12 +03:00 |
|
|
|
7ffaee6efc
|
Web: moved translates to Common
|
2022-03-05 14:27:59 +03:00 |
|
Timofey Boyko
|
65ccfb896f
|
Web:Files: add new key 'sorting'
|
2022-03-04 10:20:10 +03:00 |
|
