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
..
install	Correct spelling	2021-01-18 15:09:43 +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	Files: removed temp	2021-01-13 12:41:29 +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