AlexeySafronov 72527ccded Merge branch 'master' into develop ... # Conflicts: # lerna.json # package.json # packages/asc-web-common/package.json # packages/asc-web-components/package.json # products/ASC.CRM/Client/package.json # products/ASC.Calendar/Client/package.json # products/ASC.Files/Client/package.json # products/ASC.Mail/Client/package.json # products/ASC.People/Client/package.json # products/ASC.Projects/Client/package.json # web/ASC.Web.Client/package.json # web/ASC.Web.Editor/package.json # web/ASC.Web.Login/package.json		2021-05-29 21:57:42 +03:00
..
public	Web: People: OAuth buttons have been moved from the edit profile section to the profile view section	2021-04-22 16:09:56 +03:00
src	Web: People: MyProfile: Fix translations loading	2021-05-20 11:45:13 +03: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	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
analyse.js	Web: People: Added Webpack-bundle-analyzer	2020-08-31 11:59:35 +03:00
Dockerfile	Web: Files: init Files build and loading (Moved out from CRA)	2020-12-07 10:49:07 +03:00
package.json	Merge branch 'master' into develop	2021-05-29 21:57:42 +03:00
webpack.config.js	Web: People: Added new component "people/MyProfile" for users without "People" module access	2021-05-13 10:55:31 +03:00