Commit Graph

205 Commits

Author SHA1 Message Date
TatianaLopaeva
200049ccee Web: Components: input-block: Fix icons displaying & added search.react icon. 2021-03-01 15:50:16 +03:00
TatianaLopaeva
65949fa1a9 Web: Common: Fix not displaying icons at nav and header. 2021-02-25 13:08:20 +03:00
507fadff55 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
#	packages/asc-web-common/src/store/auth/selectors.js
#	packages/asc-web-components/src/components/icons/svg/index.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
#	products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
#	products/ASC.People/Client/src/components/Article/Body/index.js
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
#	yarn.lock
2021-02-24 10:57:03 +03:00
TatianaLopaeva
3e3b079b5a Web: Components: Deleted useless Icons component. 2021-02-23 22:14:42 +03:00
TatianaLopaeva
7023cf5f3a Web: Transferring icons from a shared folder to modules. Icons are displayed by url. 2021-02-20 11:46:32 +03:00