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
..
install	Cosmetic modify Docker-app	2020-12-30 10:51:40 +03:00
run	add ASC.TelegramService	2020-09-24 17:30:27 +03:00
scripts	socket.io: fix	2020-08-03 11:20:57 +03:00
start	added getPortalSettings after wizard completed	2020-07-10 19:00:21 +03:00
tools	fix check	2019-07-16 10:32:09 +03:00
build.bat	extract build.sln.bat	2020-10-14 18:24:39 +03:00
build.sln.bat	extract build.sln.bat	2020-10-14 18:24:39 +03:00
Jenkinsfile	Jenkins: fix	2020-09-04 14:44:58 +03:00
publish.bat	Added url shortener service install scripts	2020-03-05 14:56:07 +03:00
rebuild.bat	Build: Added wiping of node_modules for Front-end	2020-12-01 13:44:09 +03:00
rebuild.frontend.bat	Build: Fixed bat-files	2020-11-24 13:40:13 +03:00
rebuild.yarnlocks.bat	Build: Fixed bat-files	2020-11-24 13:40:13 +03:00
runasadmin.bat	Requesting administrative privileges for install/uninstall/start/stop	2019-07-11 16:02:33 +03:00