Commit Graph

3830 Commits

Author SHA1 Message Date
c477b3b61b web: Update yarn.lock files 2019-12-09 09:19:26 +03:00
cfccfd4093 Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
#	web/ASC.Web.Common/package.json
2019-12-09 09:16:18 +03:00
45f94155ab web: Common: Added and applied new displayType "auto" for AdvancedSelector v2 2019-12-08 21:47:45 +03:00
83181118db web: Components: Fixed height without groups 2019-12-08 21:45:32 +03:00
10de50517d web: components: bump version 2019-12-07 16:11:49 +03:00
270eb69a35 Web: Components: renamed tab with all components 2019-12-07 16:11:29 +03:00
6809b17c16 web: components: bump version 2019-12-07 14:25:08 +03:00
8af337975f Web: Components: added all components to one tab in the storybook 2019-12-07 14:24:45 +03:00
4ed4b76689 Merge branch 'master' into Refactoring/remove-react-bootstrap
# Conflicts:
#	web/ASC.Web.Components/.storybook/styles.scss
2019-12-07 10:45:57 +03:00
cb6377163f Web: Components: fixed toastr styles 2019-12-07 10:43:14 +03:00
6ada25a873 Web: Client: fixed Home page styles 2019-12-07 10:08:28 +03:00
63f967a015 web: Common: Fixed eslint warnings 2019-12-06 16:58:12 +03:00
b4a79d2dd3 web: Common: Applied useFake to PeopleSelector 2019-12-06 16:48:10 +03:00
4fd452e603 web: People: Replaced AdvancedSelector to GroupSelector 2019-12-06 16:47:22 +03:00
2f5ef26c1a web: Components: Exported GroupSelector 2019-12-06 16:45:07 +03:00
9da66182db web: Components: Styled AdvancedSelector:
+ Added ability to apply size
+ Added ability to set options without groups
2019-12-06 16:43:58 +03:00
c8a772837f web: Update yarn.lock 2019-12-06 16:40:57 +03:00
a3240df07c web: common: bump version 2019-12-06 16:38:30 +03:00
f87ea9cc13 web: Common: Added new package "faker" 2019-12-06 16:37:55 +03:00
e7bf5e4a29 web: Common: Added support of fakeApi to getUserList and getGroupList methods 2019-12-06 16:37:04 +03:00
Daniil Senkiv
24d06b6fbe Web.common: added Heading component, applied to web.client and people modules 2019-12-06 16:13:48 +03:00
4b51e4ad4f Merge branch 'master' into Refactoring/remove-react-bootstrap
# Conflicts:
#	products/ASC.People/Client/src/custom.scss
#	web/ASC.Web.Client/src/custom.scss
#	web/ASC.Web.Common/.storybook/styles.scss
#	web/ASC.Web.Components/.storybook/styles.scss
2019-12-06 15:58:10 +03:00
c2b3d22d29 web: components: bump version 2019-12-06 15:50:41 +03:00
4b3a206cdd web: common: bump version 2019-12-06 15:50:27 +03:00
8e0cf2da5e Web: Client: removed ReactToastify styles 2019-12-06 15:50:07 +03:00
8c289784a8 Web: People: removed ReactToastify styles 2019-12-06 15:49:45 +03:00
1478d9f74c Web: Common: removed ReactToastify styles 2019-12-06 15:49:26 +03:00
b47fa41224 Web: Components: added styles to toast, removed ReactToastify styles 2019-12-06 15:48:57 +03:00
4b772255aa Merge branch 'master' into Refactoring/remove-react-bootstrap 2019-12-06 15:39:57 +03:00
Daniil Senkiv
505e868019 web: components: bump version 2019-12-06 15:36:14 +03:00
Daniil Senkiv
753807fff0 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-06 15:29:06 +03:00
667cb89c11 Merge branch 'master' into Refactoring/remove-react-bootstrap 2019-12-06 13:49:32 +03:00
8294090ddd web: common: bump version 2019-12-06 13:43:22 +03:00
9f8c093f02 Web: Common: fixed login page auto focus 2019-12-06 13:43:03 +03:00
fc5ea3d5fa Merge branch 'master' into Refactoring/remove-react-bootstrap 2019-12-06 12:15:53 +03:00
c9939b0da1 .net core up to 3.1 2019-12-06 12:12:51 +03:00
Daniil Senkiv
23363a1ee7 web.components: Heading: refactoring 2019-12-06 12:09:56 +03:00
b15bc4fc67 Web: Client: removed bootstrap from module client 2019-12-06 12:04:06 +03:00
2652c02add Web: People: removed bootstrap from people module 2019-12-06 12:03:29 +03:00
683ac13dd7 Web: Common: removed bootstrap from Common 2019-12-06 12:02:56 +03:00
b2ceba6d03 Web: Components: removed bootstrap from Components 2019-12-06 12:01:58 +03:00
86a0a6b48c Merge branch 'master' into Refactoring/remove-react-bootstrap 2019-12-06 10:51:04 +03:00
7005413f6c Web: Common: added Common base styles 2019-12-06 10:43:48 +03:00
a6bb507317 Web: Client: added Client base styles 2019-12-06 10:43:33 +03:00
6fbaee10f5 Web: People: added People base styles 2019-12-06 10:43:11 +03:00
cff8bb3ad0 Web: Components: added base styles 2019-12-06 10:16:33 +03:00
105b4bdd3a Web: Client: fixed accessRights admins page styles 2019-12-06 09:54:32 +03:00
96a2616e61 Web: Components: fixed layout text style 2019-12-06 09:52:27 +03:00
Daniil Senkiv
3f7a026c36 People: deleted unused code 2019-12-05 20:01:34 +03:00
Daniil Senkiv
0ca8d54912 web: common: bump version 2019-12-05 20:01:08 +03:00