Commit Graph

367 Commits

Author SHA1 Message Date
294a449d78 add new ru-keys, edit en 2022-05-13 17:30:51 +03:00
ada737287b Web: Files: Replaced "HotkeysUploadFolder" to "Article:UploadFolder" (EnDublicatesByContentTest issue fix) 2022-05-13 10:42:46 +03:00
7262c4cbb8 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-12 19:00:51 +03:00
Timofey Boyko
8c7ba2d3ac Web:Files:Locales: add new key 'AddAuthor' for EU and RU locales 2022-05-12 18:29:54 +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
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
2d6960a5a2 Web: Files: added empty container en translation 2022-05-06 19:42:20 +05:00
7b391e1cef Web: added filter translation 2022-05-05 20:26:09 +05:00
419a6709f9 Web: Files: add translation 2022-05-04 19:32:32 +03:00
f12cb6c184 Web: Files: fixed FormsGallery styles 2022-04-25 15:09:25 +03:00
Timofey Boyko
bf8ac30f6f Web:Files:add new key 'AccessRights' for EN and RU locales 2022-04-21 18:07:58 +03:00
f8088cfbd2 Web: Files: fixed gallery translations, refactoring 2022-04-21 17:18:01 +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
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
cae74ef6e3 Web: Files: Deleted <strong> from translation. 2022-04-15 15:46:52 +03:00
cb6e45d9fe Web: Files: Added translation for title of folder selection dialog. 2022-04-13 18:19:48 +03:00
089fceadeb Web: Files: Fixed translations for de, el, en languages. 2022-04-13 16:50:12 +03:00
125afe2816 Web: Files: Fixed translations. 2022-04-13 16:43:27 +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
2b49cbfd72 Web: Files: Added <strong> to translations. 2022-04-13 15:14:08 +03:00
90bf5a7dc2 Web: Files: added info panel for OFORMsGallery 2022-04-07 16:52:16 +03:00
342c938415 Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-07 11:17:57 +03:00
aa91c6389c Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
#	packages/asc-web-common/components/Section/sub-components/section-container.js
2022-04-06 20:36:36 +03:00
c51741bf94 Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-05 10:35:53 +03:00
45d2a31d03 Merge branch 'feature/virtual-rooms-1.2' into feature/add-units
# Conflicts:
#	public/locales/de/Common.json
2022-04-04 19:34:51 +03:00
becb37d94f Web: Files: added context menu for FormGallery files 2022-04-01 11:20:58 +03:00
8c782a7903 Web: Files: added OFORMs gallery 2022-03-31 16:10:16 +03:00
f41c65623b Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
#	config/kafka.json
2022-03-30 11:14:47 +03:00
mushka
4e4ecec78f added dark theme support & moved context options "view details" button 2022-03-29 13:59:56 +03:00
mushka
5a4b36df74 translation tweaks 2022-03-28 16:53:27 +03:00
Timofey Boyko
3418cb1ca7 Web:Files: add new keys 'Admin' and 'Common' for settings of eu and ru locales 2022-03-28 11:10:22 +03:00
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
mushka
cd82919062 merge with feature/virtual-rooms-1.2 2022-03-24 18:00:31 +03:00
9174a20871 Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
#	packages/asc-web-common/api/portal/index.js
#	packages/asc-web-common/components/Loaders/index.js
#	packages/asc-web-common/store/SettingsStore.js
#	packages/asc-web-components/file-input/index.js
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/save-cancel-buttons/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/src/store/ContextOptionsStore.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/NavMenu/index.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
#	web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js
#	web/ASC.Web.Client/webpack.config.js
#	web/ASC.Web.Editor/src/Editor.jsx
2022-03-24 14:39:52 +03:00
5420ceff44 Web: Deleted useless files. 2022-03-21 11:52:26 +03:00
mushka
c51d920092 vr-1.2 actualization 2022-03-21 11:13:56 +03:00
73033f996d Web: Files: Added missing translation. 2022-03-21 10:49:32 +03:00
bada6b7dd0 Web: Files: Hotkeys: added new translations 2022-03-16 11:32:19 +03:00
cc293f60c2 Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel 2022-03-15 14:11:00 +03:00
4b62ba5560 Web: Files: fixed HotkeysPanel translations 2022-03-14 11:43:40 +03:00
bbd659f142 Web: Files: Hotkeys: removed ZoomIn/ZoomOut 2022-03-11 18:45:02 +03:00
36f32478af Web: Files: removed hotkey "Go to the top of the list" 2022-03-11 18:14:39 +03:00
afb0510fd6 Web: Moved translations to Common file (az). 2022-03-10 17:30:30 +03:00