AlexeySafronov febf172875 Merge branch 'master' into hotfix/v1.1.1 ... # Conflicts: # lerna.json # packages/asc-web-common/package.json # packages/asc-web-components/avatar-editor/index.js # packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js # packages/asc-web-components/main-button/index.js # packages/asc-web-components/package.json # packages/browserslist-config-asc/package.json # packages/debug-info/package.json # products/ASC.CRM/Client/package.json # products/ASC.Calendar/Client/package.json # products/ASC.Files/Client/package.json # products/ASC.Files/Client/src/HOCs/withFileActions.js # products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js # products/ASC.Files/Server/DocStore # products/ASC.Mail/Client/package.json # products/ASC.People/Client/package.json # products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js # products/ASC.Projects/Client/package.json # web/ASC.Web.Client/package.json # web/ASC.Web.Editor/package.json # web/ASC.Web.Editor/src/Editor.jsx # web/ASC.Web.Login/package.json		2021-12-28 13:35:02 +03:00
..
public	Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0	2021-12-23 11:28:50 +03:00
src	Merge branch 'master' into hotfix/v1.1.1	2021-12-28 13:35:02 +03:00
tests	Web:Tests: fix culture change before test start	2021-12-23 00:09:49 +08:00
.babelrc	Web: People: init People build and loading (Moved out from CRA)	2020-12-03 13:09:33 +03:00
.env	web: clients: Fixed CRA proxy bug;	2020-02-26 10:02:37 +03:00
.gitignore	Web: init e2e tests	2021-12-21 15:59:11 +08:00
analyse.js	Web: People: Added Webpack-bundle-analyzer	2020-08-31 11:59:35 +03:00
codecept.conf.js	Web: init e2e tests	2021-12-21 15:59:11 +08:00
Dockerfile	Web: Files: init Files build and loading (Moved out from CRA)	2020-12-07 10:49:07 +03:00
jsconfig.json	Web: init e2e tests	2021-12-21 15:59:11 +08:00
package.json	Merge branch 'master' into hotfix/v1.1.1	2021-12-28 13:35:02 +03:00
steps_file.js	Web: init e2e tests	2021-12-21 15:59:11 +08:00
steps.d.ts	Web: init e2e tests	2021-12-21 15:59:11 +08:00
webpack.config.js	Web: init e2e tests	2021-12-21 15:59:11 +08:00