IlyaSobolev/DocSpace-buildtools

History

Viktor Fomin 048237dffc Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation # Conflicts: # packages/client/src/pages/Confirm/sub-components/deactivatePortal.js # packages/client/src/pages/Confirm/sub-components/removePortal.js # packages/client/src/pages/PortalSettings/categories/data-management/index.js # packages/client/src/pages/PortalSettings/categories/delete-data/DeleteDataLoader.js # packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js # packages/client/src/pages/PortalSettings/categories/delete-data/index.js # packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js # packages/client/src/pages/PortalSettings/categories/delete-data/portalDeletion.js # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/src/components/pages/Confirm/index.js # web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js # web/ASC.Web.Client/src/components/pages/Settings/index.js # web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js		2022-08-11 21:47:39 +03:00
..
.yarn	Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation	2022-08-11 21:47:39 +03:00
app	Merge branch 'release/v1.2' into develop	2022-06-19 22:44:48 +03:00
config	unified config style	2022-05-31 16:04:24 +03:00
.yarnrc.yml	ASC.Socket.IO: Upgrade yarn to v3.2.2	2022-07-29 22:24:09 +03:00
package.json	Socket.IO: Downgrade axios version (issue: Provided config url is not valid)	2022-02-09 11:08:57 +03:00
README.md	socket.io: first version	2020-08-02 23:12:45 +03:00
server.js	unified config style	2022-05-31 16:04:24 +03:00
yarn.lock	ASC.Socket.IO: Upgrade yarn to v3.2.2	2022-07-29 22:24:09 +03:00

README.md

ASC.Socket.IO