IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,904 Commits 40 Branches 22 Tags 420 MiB
37732015b3
Commit Graph

15 Commits

Author SHA1 Message Date
Alexey Safronov
ddf5a606a1 web: Update yarn.lock files 2019-12-24 09:56:03 +03:00
Alexey Safronov
b686e99f16 web: Common: Moved Layout and PageLayout to asc-web-common 2019-12-20 14:35:53 +03:00
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
Alexey Safronov
5eeff88737 web: New packages fixes 2019-12-13 16:58:09 +03:00
Alexey Safronov
452a3ebc4a Merge branch 'master' into feature/advanced-selector-v2 
# Conflicts:
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
 2019-12-09 15:10:01 +03:00
Alexey Safronov
d08ba81c85 web: Common: Update packages 2019-12-09 14:13:26 +03:00
Alexey Safronov
7ded8ae4cd web: Components: Update packages (storybook, babel, jest, css-loader, postcss) 2019-12-09 12:33:39 +03:00
Alexey Safronov
45f94155ab web: Common: Added and applied new displayType "auto" for AdvancedSelector v2 2019-12-08 21:47:45 +03:00
Alexey Safronov
c8a772837f web: Update yarn.lock 2019-12-06 16:40:57 +03:00
Alexey Safronov
8bd3c86d2b Merge branch 'master' into feature/advanced-selector-v2 
# Conflicts:
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Components/package.json
#	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/components/icon-button/index.js
# Changed (by Text component changes):
#       web/ASC.Web.Components/src/components/advanced-selector2/sub-components/selector.js
#       web/ASC.Web.Components/src/components/advanced-selector2/advanced-selector2.stories.js
#       web/ASC.Web.Components/src/components/advanced-selector/sub-components/groups/header.js
#       web/ASC.Web.Components/src/components/advanced-selector/sub-components/options/body.js
#       web/ASC.Web.Components/src/components/advanced-selector/sub-components/selector.js
#       web/ASC.Web.Common/src/components/people-selector/index.js
 2019-12-05 14:17:45 +03:00
gopienkonikita
b5eb5e6cf7 Web: Common: removed reactstrap from web.common 2019-12-04 10:12:57 +03:00
Alexey Safronov
7b66b23686 Merge branch 'master' into feature/advanced-selector-v2 
# Conflicts:
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/yarn.lock
 2019-12-03 16:41:03 +03:00
Alexey Safronov
4128d43d89 web: Update yarn.lock files 2019-12-03 16:24:13 +03:00
Alexey Safronov
f46c12cc32 Update yarn.lock files 2019-11-27 14:26:20 +03:00
Alexey Safronov
8bf0c002c0 web: Common: Added yarn.lock 2019-11-27 13:21:46 +03:00