AlexeySafronov 889949eb95 Merge branch 'develop' into feature/workspaces ... # Conflicts: # packages/asc-web-common/src/components/Layout/index.js # packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.js # packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.stories.js # packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/README.md # packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/StyledHistoryRowsLoader.js # packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/index.js # packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js # packages/asc-web-common/src/components/PageLayout/sub-components/section.js # packages/asc-web-common/src/desktop/index.js # products/ASC.Files/Client/package.json # products/ASC.Files/Client/public/index.html # products/ASC.Files/Client/src/App.js # products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js # products/ASC.Files/Client/src/components/pages/DocEditor/index.js # products/ASC.Files/Client/src/components/pages/Home/index.js # products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js # products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js # products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js # products/ASC.Files/Client/src/components/pages/VersionHistory/index.js # products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js # products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js # products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js # products/ASC.Files/Client/src/components/panels/SharingPanel/index.js # products/ASC.People/Client/package.json # products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js # products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js # products/ASC.People/Client/yarn.lock # web/ASC.Web.Client/package.json # web/ASC.Web.Client/src/helpers/confirmRoute.js # web/ASC.Web.Client/yarn.lock # web/ASC.Web.Common/package.json # web/ASC.Web.Common/src/pages/login/i18n.js # web/ASC.Web.Common/yarn.lock # web/ASC.Web.Components/package.json # web/ASC.Web.Components/yarn.lock # web/ASC.Web.Login/src/LoginContent.jsx # yarn.lock		2021-01-11 12:21:59 +03:00
..
public	Web: Added support of public folders + moved back to original index.html	2020-12-15 19:27:30 +03:00
src	Merge branch 'develop' into feature/workspaces	2021-01-11 12:21:59 +03:00
.babelrc	web: Added ASC.Web.Login	2020-11-24 13:20:14 +03:00
.gitattributes	web: Added ASC.Web.Login	2020-11-24 13:20:14 +03:00
.gitignore	web: Added ASC.Web.Login	2020-11-24 13:20:14 +03:00
Dockerfile	web: Added ASC.Web.Login	2020-11-24 13:20:14 +03:00
jsconfig.json	web: Added ASC.Web.Login	2020-11-24 13:20:14 +03:00
package.json	Web: Fixed Login/logout working	2020-12-01 13:45:27 +03:00
webpack.config.js	Web: Added support of public folders + moved back to original index.html	2020-12-15 19:27:30 +03:00