Commit Graph

6 Commits

Author SHA1 Message Date
f675415228 Merge branch 'master' into release/v1.1.0
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	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/public/locales/en/SelectFile.json
#	products/ASC.Files/Client/public/locales/en/SelectFolder.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/public/locales/en/Translations.json
#	products/ASC.People/Client/public/locales/ru/Translations.json
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
#	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-11-21 14:26:20 +03:00
2720604f8d Web: Components: fix mobile align 2021-11-18 18:53:35 +03:00
c6d97c7fc5 Web: Components: add avatar max size label 2021-11-16 18:23:39 +03:00
cab7603f5b Fixed Bug 53415: Fixed save avatar click 2021-11-10 18:33:21 +03:00
Artem Tarasov
c8d614a3ba Web: Components: refactoring stories, add public/images to components for storybook 2021-03-07 14:57:26 +03:00
Artem Tarasov
5f2d0e4616 Web: Components: changed component hierarchy 2021-02-24 17:42:09 +03:00