Commit Graph

3538 Commits

Author SHA1 Message Date
Daniil Senkiv
30626d46fa web.components: deleted heading.css 2019-12-09 19:08:20 +03:00
Daniil Senkiv
e9449f6a70 web.components: Text: prop size can be string or number 2019-12-09 18:33:05 +03:00
Daniil Senkiv
d3483a2e6b web: components: bump version 2019-12-09 18:31:43 +03:00
Daniil Senkiv
4aa17bc90c Merge branch 'master' into refactoring/text-heading 2019-12-09 16:55:31 +03:00
Daniil Senkiv
449589f971 web.common: Headline: fixed readme 2019-12-09 16:54:10 +03:00
NikolayRechkin
a739f1ee8a revert appsettings.json 2019-12-09 16:10:48 +03:00
NikolayRechkin
ca5e501e2b Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-12-09 16:08:48 +03:00
NikolayRechkin
29433b0232 web: people: changed the use of the avatar editor 2019-12-09 16:07:04 +03:00
NikolayRechkin
8db8e25fa7 web: components: fixed avatar editor 2019-12-09 16:00:45 +03:00
NikolayRechkin
94581bdd39 People: deleted unused code 2019-12-09 15:59:34 +03:00
d187c8c82b UserPhotoManager: fixed SearchInCache 2019-12-09 15:49:36 +03:00
1d475151c1 Web: Client: remove bootstrap peer dependency jquery 2019-12-09 15:37:07 +03:00
f0ce75cf7d Web: People: remove bootstrap peer dependency jquery 2019-12-09 15:36:30 +03:00
a77aef1970 Merge branch 'master' into Refactoring/remove-react-bootstrap
# Conflicts:
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
2019-12-09 15:29:04 +03:00
Daniil Senkiv
d3f06c8d3e Merge branch 'master' into refactoring/text-heading 2019-12-09 15:24:23 +03:00
fdfaae8abe Docker: .net core up to 3.1 2019-12-09 15:19:18 +03:00
Daniil Senkiv
13ea03fd54 web.components: applied truncate prop to components 2019-12-09 15:18:51 +03:00
Daniil Senkiv
f275c5b258 web.common: renamed Heading component to Headline 2019-12-09 15:12:25 +03:00
Daniil Senkiv
03fdebd4af web.components: Heading: fixed readme 2019-12-09 14:51:31 +03:00
Daniil Senkiv
275b307c72 web.components: deleted Header component 2019-12-09 14:49:31 +03:00
Daniil Senkiv
5dd25bcaca web.components: replaced Header component to Heading component 2019-12-09 14:47:36 +03:00
4c5a930333 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-12-09 14:38:50 +03:00
9f2e4a8b9b web: common: bump version 2019-12-09 14:29:20 +03:00
3579f630fc web: components: bump version 2019-12-09 14:29:08 +03:00
714e8af2b5 web: People: Update packages 2019-12-09 14:26:42 +03:00
57050cf019 web: components: bump version 2019-12-09 14:23:14 +03:00
2518975217 Web: Components: fixed all.stories.js 2019-12-09 14:22:55 +03:00
306e861879 web: Client: Update packages 2019-12-09 14:21:23 +03:00
d08ba81c85 web: Common: Update packages 2019-12-09 14:13:26 +03:00
7710a85057 web: Components: Update packages 2019-12-09 14:13:03 +03:00
750bd11adf web: Update packages React, Redux 2019-12-09 13:46:20 +03:00
7ded8ae4cd web: Components: Update packages (storybook, babel, jest, css-loader, postcss) 2019-12-09 12:33:39 +03:00
a9bfec3f21 Merge branch 'master' into Refactoring/remove-react-bootstrap 2019-12-09 11:53:14 +03:00
b43cb7c8cc Merge branch 'Refactoring/remove-react-bootstrap' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into Refactoring/remove-react-bootstrap 2019-12-09 11:49:01 +03:00
3f9ec420be web: Update yarn.lock files 2019-12-09 11:47:14 +03:00
35edb25821 Web: Components: fixed drop-down profile item styles 2019-12-09 11:41:48 +03:00
Daniil Senkiv
450875f16f web.components: Heading: added new sizes, rename old sizes 2019-12-09 11:33:46 +03:00
994d44c7bf Web: Components: revert modal-dialog (5e6d5ea17d) 2019-12-09 10:05:08 +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
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