Artem Tarasov 5d2264d483 Merge branch 'develop' into feature/thumbnails ... # Conflicts: # products/ASC.Files/Client/src/components/EditingWrapperComponent.js # products/ASC.Files/Client/src/components/FileItem.js # products/ASC.Files/Client/src/components/FilesContainer.js # products/ASC.Files/Client/src/components/FilesContent.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/EditingWrapperComponent.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js # products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js # products/ASC.Files/Client/src/components/sub-components/Badges.js # products/ASC.Files/Client/src/components/sub-components/EditingWrapperComponent.js # products/ASC.Files/Client/src/components/sub-components/Icons.js # products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js # products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleRowContent.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/BadgesFileTile.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/SimpleTileContent.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContent.js # products/ASC.Files/Client/src/pages/Home/Section/Body/index.js # products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js		2021-04-27 13:40:38 +03:00
..
article-body.js	Web: components: Added margin-bottom for fixed height of article.	2021-04-06 17:23:32 +03:00
article-header.js	Web: Common: fix after merge, fix imports and hierarchy	2021-02-25 17:20:11 +03:00
article-main-button.js	Web: Common: fix after merge, fix imports and hierarchy	2021-02-25 17:20:11 +03:00
article-pin-panel.js	Web: Fixed work with translations + refactoring:	2021-03-04 19:09:46 +03:00
article.js	Web: Files: fixed newItem styles	2021-04-19 14:16:42 +03:00
section-body-content.js	Web: Common: fix after merge, fix imports and hierarchy	2021-02-25 17:20:11 +03:00
section-body.js	Web: Added SelectedFrame	2021-04-13 09:35:07 +03:00
section-filter.js	Web: Common: fixed StyledSectionFilter	2021-03-15 16:02:26 +03:00
section-header.js	Web: Fixed displaying of shared files at aside & Deleted useless code.	2021-03-22 18:11:39 +03:00
section-paging.js	Web: Common: fix after merge, fix imports and hierarchy	2021-02-25 17:20:11 +03:00
section-toggler.js	Web: Common: fix after merge, fix imports and hierarchy	2021-02-25 17:20:11 +03:00
section.js	Web: Common: fixed StyledSectionFilter	2021-03-15 16:02:26 +03:00