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
..
public	Web: Files: added rename notifications	2021-04-23 16:15:46 +03:00
src	Merge branch 'develop' into feature/thumbnails	2021-04-27 13:40:38 +03:00
.babelrc	Web: Editor: Optimization	2021-03-06 18:50:06 +03:00
.env	web: files: Fixed proxy configure for images and socketjs	2020-02-26 11:04:26 +03:00
.gitignore	Files: Init Files.Client	2020-02-25 09:58:09 +03:00
analyse.js	Web: Files: Added Webpack-bundle-analyzer	2020-08-31 12:07:58 +03:00
Dockerfile	Web: Files: init Files build and loading (Moved out from CRA)	2020-12-07 10:49:07 +03:00
package.json	Bump version v0.1.7	2021-04-22 14:13:12 +03:00
webpack.config.js	Web: Files/Editor: Added SharingDialog.	2021-03-31 16:49:14 +03:00