Commit Graph

155 Commits

Author SHA1 Message Date
aa6b674721 Web: change icon 2022-07-22 13:42:49 +03:00
5e9a76a0fa Web: add logo 2022-07-21 17:08:41 +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
6cfeb9299d Web: add new logo 2022-07-20 14:58:20 +03:00
TimofeyBoyko
757856ee9b Web: update icons for catalog items 2022-07-19 15:47:52 +03:00
57c6389d07 Web: add icons 2022-07-19 14:04:04 +03:00
ee761e6811 Web: add icons 2022-07-11 23:10:20 +03:00
TimofeyBoyko
c8feb7899b Merge branch 'develop' into feature/virtual-rooms-page 2022-07-08 12:32:26 +03:00
9cf4dc70b7 Web: add arrow icon 2022-07-04 06:17:31 +03:00
TimofeyBoyko
ed8b06f88c Web: fix conflicts after merge 2022-07-01 11:10:33 +03:00
TimofeyBoyko
3e07ef1efc Merge branch 'develop' into feature/virtual-rooms-page 2022-07-01 10:09:47 +03:00
f56a40435e Web: add missed icons 2022-06-30 11:34:54 +03:00
6b2f643441 Fix Bug 57852: add flags for languages combo 2022-06-30 11:25:20 +03:00
08090ea3b4 Web: Icons: Fixed icon bundle for items menu and folders menu 2022-06-28 15:39:31 +03:00
TimofeyBoyko
247d64e0da Web: add images for person, pin and info context menu items 2022-06-27 17:18:26 +03:00
TimofeyBoyko
54b3ce8c37 Web: fix catalog accounts icon name 2022-06-22 16:24:37 +03:00
TimofeyBoyko
97dca619a2 Web: update icons for article 2022-06-22 12:31:47 +03:00
TimofeyBoyko
36835eea13 Merge branch 'develop' into feature/virtual-rooms-page 2022-06-22 11:17:05 +03:00
d5c86203d2 Web:Added a checkmark image to select a theme. 2022-06-21 13:20:34 +03:00
47f2138571 Web:Added pin and plus icons for theme preview. 2022-06-17 16:10:55 +03:00
TimofeyBoyko
24a204b076 Web: add new tag and rooms images 2022-06-14 16:30:17 +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
0b4488d4b4 Web: change trash catalog icon 2022-05-19 19:00:56 +03:00
41a0f07bfa Web: Files: added alert badge to main-button, upload logic changed 2022-05-16 18:03:21 +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
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
563fd3c778 Web: Files: fix context menu icons 2022-04-22 13:45:57 +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
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
Timofey Boyko
3194f8810e Web:update image for access operation 2022-04-14 11:34:18 +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
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
Timofey Boyko
9aa24924ad Web: add code.react.svg 2022-04-06 15:05:32 +03:00
99cdaa0440 Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel 2022-04-01 15:46:42 +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
b0e22fdac9 Web: change password input icons 2022-03-16 12:47:44 +03:00