IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
febf172875
DocSpace-buildtools/web/ASC.Web.Client
History
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 'master' into hotfix/v1.1.1 2021-12-28 13:35:02 +03:00
src Merge branch 'master' into hotfix/v1.1.1 2021-12-28 13:35:02 +03:00
.babelrc Web: Client: init re-write to webpack 5 2020-11-27 20:40:38 +03:00
.env Web: Clinet: Added default params to .env 2021-03-12 18:16:51 +03:00
.gitattributes Web: Client: init re-write to webpack 5 2020-11-27 20:40:38 +03:00
.gitignore Moved Studio->ClientApp to separated ASC.Web.Client folder 2019-07-09 14:51:18 +03:00
analyse.js Web: Client: Added Webpack-bundle-analyzer 2020-08-31 11:43:26 +03:00
Dockerfile Web: Client: init re-write to webpack 5 2020-11-27 20:40:38 +03:00
jsconfig.json Web: applied new import from appserver/components 2021-02-24 20:11:23 +03:00
package.json Merge branch 'master' into hotfix/v1.1.1 2021-12-28 13:35:02 +03:00
webpack.config.js Web: init e2e tests 2021-12-21 15:59:11 +08:00