DocSpace-client/web/ASC.Web.Components
Alexey Safronov 3b88c07178 Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/src/components/index.js
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/src/components/advanced-selector/index.js
#	web/ASC.Web.Components/src/components/help-button/index.js
#	web/ASC.Web.Components/src/index.js
#       web/ASC.Web.Components/src/components/examples/people.selectors.stories.js [removed]
#
2019-12-14 12:32:31 +03:00
..
.storybook Merge branch 'master' into Refactoring/remove-react-bootstrap 2019-12-07 10:45:57 +03:00
.vscode web: components: Added opportunity to debug tests 2019-09-11 16:41:54 +03:00
config web: components: Init merging components and storybook 2019-09-05 16:25:33 +03:00
public web: Storybook: Split titles of storybooks 2019-11-26 14:48:42 +03:00
scripts web: components: Fixed run rests with inline svg components 2019-09-06 11:58:23 +03:00
src Merge branch 'master' into feature/advanced-selector-v2 2019-12-14 12:32:31 +03:00
test web: components: Fixed run rests with inline svg components 2019-09-06 11:58:23 +03:00
.editorconfig web: components: Init merging components and storybook 2019-09-05 16:25:33 +03:00
.eslintignore web: components: Init merging components and storybook 2019-09-05 16:25:33 +03:00
.eslintrc.js web: components: Init merging components and storybook 2019-09-05 16:25:33 +03:00
.gitignore Web.Components: updated .gitignore: added coverage folder 2019-10-17 11:45:36 +03:00
babel.config.js web: components: Init merging components and storybook 2019-09-05 16:25:33 +03:00
jest.config.js web: components: Fixed run rests with inline svg components 2019-09-06 11:58:23 +03:00
package.json Merge branch 'master' into feature/advanced-selector-v2 2019-12-14 12:32:31 +03:00
README.md web: Changed README.md 2019-05-24 17:24:16 +03:00
rollup.config.js web: components: Init merging components and storybook 2019-09-05 16:25:33 +03:00
yarn.lock Merge branch 'master' into feature/advanced-selector-v2 2019-12-14 12:32:31 +03:00