Commit Graph

536 Commits

Author SHA1 Message Date
TimofeyBoyko
97dca619a2 Web: update icons for article 2022-06-22 12:31:47 +03:00
7189a99583 Merge branch 'feature/download-dialog' of https://github.com/ONLYOFFICE/AppServer into feature/download-dialog 2022-06-22 11:36:35 +03:00
TimofeyBoyko
36835eea13 Merge branch 'develop' into feature/virtual-rooms-page 2022-06-22 11:17:05 +03:00
fd66155bac Web: Integration: Added setting integration frame options at local storage 2022-06-21 14:38:27 +03:00
d5c86203d2 Web:Added a checkmark image to select a theme. 2022-06-21 13:20:34 +03:00
687951c921 Web: moved Error404Text translation to common 2022-06-20 17:49:59 +03:00
b22e3da0dc Merge branch 'develop' into feature/integration-system 2022-06-20 13:27:01 +03:00
47f2138571 Web:Added pin and plus icons for theme preview. 2022-06-17 16:10:55 +03:00
d6ebb514c8 Web: Setting: Integration: Added message check on creating frame 2022-06-16 17:00:32 +03:00
d9a18c2c87 Web: Setting: Integration: Fixed initialization, added binding message events 2022-06-16 16:31:27 +03:00
8d44310f58 Web: Setting: Integration: Added new parameters at frame configuration 2022-06-16 13:25:09 +03:00
2828c3bb58 Web: Integration: Script: Added filter block to default config 2022-06-15 17:49:49 +03:00
2b88f8ac71 Web: Integration: Added base api for creating integration iframe component 2022-06-15 12:52:46 +03:00
TimofeyBoyko
24a204b076 Web: add new tag and rooms images 2022-06-14 16:30:17 +03:00
7ddb0506c9 Web: Files: moved Hotkeys translation, added button to open hotkeys 2022-06-10 11:30:57 +03:00
mushka
2463e3cfc3 updated Avatar component for it to also display provided SVGs and filled its Storybook 2022-06-08 17:37:58 +03:00
TimofeyBoyko
c0084cb7dc Web:Files/Components: add new images for virtual rooms page 2022-06-08 16:17:46 +03:00
28d6380022 update lo 2022-06-02 17:04:12 +03:00
b59f5de9a7 edit translations 2022-06-02 13:21:57 +03:00
caefff72c4 Web: Return translations. 2022-06-01 18:35:30 +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
881a70a540 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-05-27 14:58:43 +03:00
45c01ca7d9 Web: Client: Fixed manifest.json for apply new icons 2022-05-27 14:56:16 +03:00
41ea4cd4af Web: Client: Added new icons for browser shortcuts 2022-05-27 14:55:04 +03:00
6248fe1981 edit translations 2022-05-27 14:08:52 +03:00
b907c456bb edit translations 2022-05-26 19:22:02 +03:00
1642deb34c edit translations 2022-05-26 13:17:14 +03:00
b13fd240ad Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-25 18:11:50 +03:00
8612f14060 Web: Client: Fixed displaying page icon for creating page shortcut, fixed page display mode at manifest 2022-05-25 18:01:38 +03:00
130a7d01d6 edit translations 2022-05-25 17:52:26 +03:00
3982d38a5b edit translations 2022-05-24 16:01:46 +03:00
3e373c1e14 edit translations 2022-05-24 14:56:08 +03:00
8d3921eae9 Web: Translations: Removed keys: TitleDocuments, TitleSubfolders, More (UselessTranslationKeysTest issues fix) 2022-05-23 20:25:42 +03:00
8c5a4cc14c edit ru 2022-05-23 18:21:55 +03:00
a2991c008c edit translations (SpellCheck) 2022-05-23 18:06:43 +03:00
9903f4c439 update cs, edit translations (spellCheck) 2022-05-23 10:55:02 +03:00
9d1af6d3da update translations 2022-05-22 00:38:14 +03:00
6bc4035313 update translations 2022-05-21 15:25:14 +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
cb0879da10 update, edit translations 2022-05-20 13:48:47 +03:00
811f8cdb8b edit vi (common) 2022-05-19 23:41:44 +03:00
4541fa82d1 update translations (web, people) 2022-05-19 23:35:37 +03:00
9c6d1ae5df update translations (Login, ConvertPasswordDialog) 2022-05-19 20:56:48 +03:00
0b4488d4b4 Web: change trash catalog icon 2022-05-19 19:00:56 +03:00
f5c09d94b7 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	i18next/files.babel
2022-05-19 18:56:47 +03:00
424c4bb082 Update translations (common, files) 2022-05-19 18:36:49 +03:00
15f4fb324e update it, edit fr 2022-05-19 14:34:56 +03:00
128021653d Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	products/ASC.Files/Client/public/locales/bg/ConnectDialog.json
#	products/ASC.Files/Client/public/locales/ro/Article.json
#	products/ASC.Files/Client/public/locales/ro/FormGallery.json
#	products/ASC.Files/Client/public/locales/ro/Home.json
#	products/ASC.Files/Client/public/locales/ro/InfoPanel.json
#	products/ASC.Files/Client/public/locales/ro/SelectFolder.json
#	products/ASC.Files/Client/public/locales/ro/Settings.json
#	products/ASC.Files/Client/public/locales/ro/Translations.json
2022-05-18 20:18:32 +03:00
b2f6ce39f7 Update translations (common, files) 2022-05-18 19:54:25 +03:00
9fb495817d update translations 2022-05-18 18:25:31 +03:00
5f4d8b3b4c Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-18 12:58:24 +03:00
9180fbe42e update ko 2022-05-18 12:58:02 +03:00
90d4a68946 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	web/ASC.Web.Client/public/locales/sl/Settings.json
2022-05-18 10:09:44 +03:00
9c824a0bfa Update translation - sl 2022-05-18 09:59:02 +03:00
f6098aea20 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
#	web/ASC.Web.Client/public/locales/ro/Settings.json
2022-05-17 19:57:22 +03:00
f1130c51d9 update ro 2022-05-17 19:54:47 +03:00
f466fd2fe4 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-17 18:17:17 +03:00
dad9016695 Web: Translations: Moved "NotFoundTitle" key from "studio" to "Common": (EnDublicatesByContentTest33ms issue fix) 2022-05-17 18:17:11 +03:00
2b804d5ef8 edit es, fr, zh-CN, ja, de, ru 2022-05-17 17:20:59 +03:00
2ed7b96dd9 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-17 16:43:15 +03:00
cc9d934b13 update de, edit en (Confirm) 2022-05-17 16:42:54 +03:00
43da9f3949 Update translation - fi 2022-05-17 15:35:03 +03:00
4c53f0d4db
Merge pull request #661 from ONLYOFFICE/feature/upload-logic-change
Web: Files: added alert badge to main-button, upload logic changed
2022-05-17 14:38:38 +03:00
be3362dbc3 update ja, edit fr, es, zh-CN (Settings) 2022-05-17 12:56:56 +03:00
606f0bca2a update es (Home), add zh 2022-05-16 21:05:58 +03:00
41a0f07bfa Web: Files: added alert badge to main-button, upload logic changed 2022-05-16 18:03:21 +03:00
4264a0da16 update fr 2022-05-16 17:04:04 +03:00
5915c6e23e update es 2022-05-16 12:51:04 +03:00
93a53092d6 Web: Translations: Fix UselessTranslationKeysTest issues 2022-05-13 19:33:16 +03:00
b3e1014a71 Web: Translations: Fix ParseJsonTest issues 2022-05-13 14:29:56 +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
e9e2e4e27f Web: added new empty screen icons 2022-05-06 19:42:49 +05:00
d843c3ee68 Web: Added new icons for filter empty screen 2022-05-05 20:26:47 +05:00
7b391e1cef Web: added filter translation 2022-05-05 20:26:09 +05:00
2e33c99230 Web: Client: Files: Badges: Added medium (16px) icon for form badge. Fixed displaying for form badge 2022-04-29 14:52:56 +03:00
f86afee2d5 Web: move t key from People to Common 2022-04-25 21:39:46 +03:00
563fd3c778 Web: Files: fix context menu icons 2022-04-22 13:45:57 +03:00
78944a490e Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme 2022-04-21 18:55:41 +03:00
2bf6dec41d Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
#	packages/asc-web-common/store/SettingsStore.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2022-04-21 10:53:58 +03:00
Timofey Boyko
216ae27b25 Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme 2022-04-20 18:04:57 +03:00
04fc13073f Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
2022-04-20 15:11:00 +03:00
ee931b3098 Web: Files: fix share icon 2022-04-20 14:55:23 +03:00
e82a44d493
Merge pull request #617 from ONLYOFFICE/feature/redesign-sharing-panel
Feature/redesign sharing panel
2022-04-19 10:36:41 -04: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
ebff3a8f80 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-19 13:41:21 +03:00
d448691ae3 Web: fix view selector icons 2022-04-19 12:42:10 +03:00
Timofey Boyko
79a9b4175b Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel 2022-04-19 09:56:59 +03:00
1bfd6a959c Web: Files: fixed ConnectedClouds settings 2022-04-18 17:05:36 +03:00
Timofey Boyko
1abd712f67 Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel 2022-04-18 15:21:48 +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
Timofey Boyko
3194f8810e Web:update image for access operation 2022-04-14 11:34:18 +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
7086c7ebb5 Web: Files: Changed empty files page. 2022-04-13 10:08:20 +03:00
Timofey Boyko
d2c5cbb0eb Web: update copy.react.svg 2022-04-11 18:56:59 +03:00
90bf5a7dc2 Web: Files: added info panel for OFORMsGallery 2022-04-07 16:52:16 +03:00
Timofey Boyko
397ff0d90d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-07 12:10:11 +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
Timofey Boyko
9aa24924ad Web: add code.react.svg 2022-04-06 15:05:32 +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
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
99cdaa0440 Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel 2022-04-01 15:46:42 +03:00
8c782a7903 Web: Files: added OFORMs gallery 2022-03-31 16:10:16 +03:00
8e777afb09 Web: change info icon 2022-03-30 19:39:09 +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
080079c944 Web: add avatar images 2022-03-29 11:19:35 +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
mushka
c51d920092 vr-1.2 actualization 2022-03-21 11:13:56 +03:00
6b84d183b8 Web: add translates 2022-03-17 12:41:57 +03:00
b0e22fdac9 Web: change password input icons 2022-03-16 12:47:44 +03:00
89b2f94469 Web: add missed translate for de 2022-03-16 11:19:44 +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
cc293f60c2 Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel 2022-03-15 14:11:00 +03:00
de81329df2 WEb: Backup: Added help button component. 2022-03-15 12:43:02 +03:00
a7199bd3d4 Web: sort locales by key 2022-03-10 23:50:43 +03:00
afb0510fd6 Web: Moved translations to Common file (az). 2022-03-10 17:30:30 +03:00
1cb0345483 Web: Moved translations to Common file (bg). 2022-03-10 17:26:47 +03:00
ca45ca77d7 Web: Moved translations to Common file (cs). 2022-03-10 17:25:20 +03:00
685e7e0193 Web: Moved translations to Common file (de). 2022-03-10 17:18:26 +03:00
9a4715fad7 Web: Moved translations to Common file (el). 2022-03-10 17:10:09 +03:00
5d4a54e1ce Web: Moved translations to Common file (en). 2022-03-10 16:57:56 +03:00
a403bdbf03 Web: Moved translations to Common file (es). 2022-03-10 16:56:15 +03:00
7b5f653ead Web: Moved translations to Common file (fi). 2022-03-10 16:54:21 +03:00
a94be67b16 Web: Moved translations to Common file (fr). 2022-03-10 16:52:35 +03:00
84f1a05ba3 Web: Moved translations to Common file (it). 2022-03-10 16:50:04 +03:00
9467226e09 Web: Moved translations to Common file (ja). 2022-03-10 16:48:45 +03:00
05da08892d Web: Moved translations to Common file (ko). 2022-03-10 16:47:13 +03:00
e15108a62c Web: Moved translations to Common file (lo). 2022-03-10 16:45:08 +03:00
0efd8d1126 Web: Moved translations to Common file (lv). 2022-03-10 16:43:34 +03:00
d2e1f04d8a Web: Moved translations to Common file (nl). 2022-03-10 16:41:37 +03:00