AlexeySafronov 789b547ccf Merge branch 'develop' into feature/workspaces ... # Conflicts: # packages/asc-web-components/src/components/icons/svg/icon_box.react.svg # packages/asc-web-components/src/components/icons/svg/icon_dropbox.react.svg # packages/asc-web-components/src/components/icons/svg/icon_google_drive.react.svg # packages/asc-web-components/src/components/icons/svg/icon_kdrive.react.svg # packages/asc-web-components/src/components/icons/svg/icon_nextcloud.react.svg # packages/asc-web-components/src/components/icons/svg/icon_onedrive.react.svg # packages/asc-web-components/src/components/icons/svg/icon_owncloud.react.svg # packages/asc-web-components/src/components/icons/svg/icon_sharepoint.react.svg # packages/asc-web-components/src/components/icons/svg/icon_webdav.react.svg # packages/asc-web-components/src/components/icons/svg/icon_yandex_disk.react.svg # products/ASC.Files/Client/package.json # products/ASC.Files/Client/src/App.js # products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js # products/ASC.Files/Client/src/components/pages/VersionHistory/index.js # products/ASC.Files/Client/src/store/files/actions.js # products/ASC.People/Client/package.json # products/ASC.People/Client/yarn.lock # web/ASC.Web.Client/package.json # web/ASC.Web.Client/src/App.js # web/ASC.Web.Client/yarn.lock # web/ASC.Web.Common/package.json # web/ASC.Web.Common/yarn.lock # web/ASC.Web.Components/package.json # web/ASC.Web.Components/yarn.lock # yarn.lock		2021-01-22 11:24:16 +03:00
..
components	Merge branch 'develop' into feature/workspaces	2021-01-22 11:24:16 +03:00
helpers	Merge branch 'develop' into feature/workspaces	2021-01-11 12:21:59 +03:00
store	Merge branch 'develop' into feature/workspaces	2021-01-22 11:24:16 +03:00
App.js	Merge branch 'develop' into feature/workspaces	2021-01-22 11:24:16 +03:00
App.test.js	Web: Files: Applied prettier style fix	2020-10-16 16:27:22 +03:00
custom.scss	Web: Files: added drag cursor	2020-10-29 12:35:17 +03:00
FilesContent.jsx	Web: Files: init Files build and loading (Moved out from CRA)	2020-12-07 10:49:07 +03:00
FilesPage.jsx	Web: Added support of public folders + moved back to original index.html	2020-12-15 19:27:30 +03:00
index.js	Web: Files: init Files build and loading (Moved out from CRA)	2020-12-07 10:49:07 +03:00
resourceConfig.json	Web: People: changed empty screen description, fixed icons alignment	2020-11-28 13:44:31 +03:00
serviceWorker.js	Web: Files: Applied prettier style fix	2020-10-16 16:27:22 +03:00
sw-build.js	Web: Files: Applied prettier style fix	2020-10-16 16:27:22 +03:00
sw-template.js	Web: ServiceWorkers: Turned off debug mode	2020-10-07 13:43:51 +03:00
wdyr.js	Web: Files: Applied prettier style fix	2020-10-16 16:27:22 +03:00