Commit Graph

3760 Commits

Author SHA1 Message Date
Daniil Senkiv
b791be6189 web: components: bump version 2019-12-11 13:56:50 +03:00
Daniil Senkiv
fbe1c4f1ff
Merge pull request #14 from ONLYOFFICE/refactoring/text-heading
Refactoring/text heading
2019-12-11 13:54:11 +03:00
Daniil Senkiv
babb7875d5 Merge branch 'master' into refactoring/text-heading
# Conflicts:
#	products/ASC.People/Client/src/components/pages/Import/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Import/Section/Header/index.js
#	web/ASC.Web.Components/src/components/text/index.js
2019-12-11 13:45:04 +03:00
NikolayRechkin
c6ba00ae87 PWA: added update of cached items and the use of a fallback page 2019-12-11 12:41:22 +03:00
Ilya Oleshko
ff1d6a0603 Web: People: Fixed import page 2019-12-11 11:18:48 +03:00
01f4ae8129 web: components: bump version 2019-12-11 08:59:03 +03:00
457be61faf Web: Components: fixed text styles 2019-12-11 08:58:41 +03:00
Daniil Senkiv
f8be196b8b Merge branch 'master' into refactoring/text-heading 2019-12-10 17:13:46 +03:00
Daniil Senkiv
d62de9827e 1. Web.Components: Text: change proptype fontSize from [number, string] to string. Applied to other components.
2. Web.Components: Link: fixed isTextOverflow prop working
3.  Web.Components: RadioButtonGroup, RadioButton: fixed readme
2019-12-10 17:12:38 +03:00
NikolayRechkin
ebe61b6234 web: components: bump version 2019-12-10 14:15:53 +03:00
NikolayRechkin
fce1e74aa7 web: components: fixed tree menu 2019-12-10 14:15:35 +03:00
NikolayRechkin
026f573267 web: components: bump version 2019-12-10 12:56:50 +03:00
NikolayRechkin
4870bdec5b web: component: fixed tree menu 2019-12-10 12:56:21 +03:00
Daniil Senkiv
426387cab6 web.components: renamed components, commented console.log in Textarea component 2019-12-10 12:38:14 +03:00
Daniil Senkiv
bd6669d87d Web.components: Heading: deleted unused prop 2019-12-10 12:23:37 +03:00
Daniil Senkiv
190c38534e web.components: HelpButton: fixed error "HeaderText is not defined" 2019-12-10 12:22:06 +03:00
Daniil Senkiv
b84761ae7c Merge branch 'refactoring/text-heading' of https://github.com/ONLYOFFICE/AppServer into refactoring/text-heading 2019-12-10 12:20:36 +03:00
Daniil Senkiv
440c4cb528 Merge branch 'master' into refactoring/text-heading
# Conflicts:
#	web/ASC.Web.Components/src/components/modal-dialog/index.js
2019-12-10 12:20:26 +03:00
ed7fb5bc70 web: Components: Added test for Aside mode in HelpButton 2019-12-10 11:50:36 +03:00
077d1c4196 web: components: bump version 2019-12-10 11:19:09 +03:00
125aa6040e Web: Components: fixed avatar-editor modal-dialog size 2019-12-10 11:18:52 +03:00
2901617d12 web: Common: Fixed setup size prop 2019-12-10 10:42:16 +03:00
414bcb21d8 web: common: bump version 2019-12-10 10:42:02 +03:00
ec99a13f76 web: components: bump version 2019-12-10 10:41:54 +03:00
NikolayRechkin
4bb2b08d2e Merge branch 'master' into feature/pwa 2019-12-10 10:37:41 +03:00
0b52301591 web: Common: Changed default prop size 2019-12-10 10:36:09 +03:00
78a722f516 web: Common: Fixed call cancel of undefined 2019-12-10 10:34:20 +03:00
aeac729e52 web: Moved AdvancedSelector2 from asc-web-components to asc-web-common 2019-12-10 10:32:26 +03:00
26d3e3d29d
Merge pull request #13 from ONLYOFFICE/Refactoring/remove-react-bootstrap
Refactoring/remove react bootstrap
2019-12-10 10:26:08 +03:00
3ead54b4e4 web: Components: Removed AdvancedSelector v1 2019-12-10 09:59:27 +03:00
Daniil Senkiv
4f1dbc6352 web.common, web.components: sorted props in readme alphabetically 2019-12-10 09:44:18 +03:00
d6e8dc7026 web: Common: Fixed PropType definition 2019-12-10 09:38:15 +03:00
Daniil Senkiv
6b6c4569cf Merge branch 'master' into refactoring/text-heading 2019-12-10 09:36:05 +03:00
Daniil Senkiv
b34b653c5f web: components: bump version 2019-12-10 09:28:51 +03:00
Daniil Senkiv
b0b1b45127 Web.components: RadioButtonGroup: added new props: width, orientation, changed proptype spacing from number to string, applied changes to other components 2019-12-10 09:28:45 +03:00
NikolayRechkin
d9d50ee364 web: components: bump version 2019-12-10 09:17:07 +03:00
NikolayRechkin
e13b1e461b Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-12-10 09:16:37 +03:00
5f6d63f941 Web: Components: fixed badge fontSize props number to string 2019-12-10 09:16:26 +03:00
NikolayRechkin
f6f12dea46 web: people: small fix 2019-12-10 09:16:21 +03:00
Daniil Senkiv
864e6d6ca3 web.components: removed unuseless wrappers above Heading component 2019-12-09 19:42:00 +03:00
Daniil Senkiv
9cf94d8817 Merge branch 'master' into refactoring/text-heading 2019-12-09 19:09:10 +03:00
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
8c0fc47251 web: Client: Changed AdvancedSelector to PeopleSelector 2019-12-09 17:20:42 +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