Commit Graph

8 Commits

Author SHA1 Message Date
e879d94bff Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	packages/asc-web-components/checkbox/index.js
#	packages/asc-web-components/file-input/index.js
#	packages/asc-web-components/index.js
#	packages/asc-web-components/label/index.js
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/index.js
2022-06-15 13:52:00 +03:00
Dmitry Kulak
efd3dd94ed Web: Components: Label: Added children prop 2022-02-10 14:30:29 +03:00
Dmitry Kulak
5e4da4d32d Web: Components: Label: Now accepts elements as text 2022-02-02 13:50:23 +03:00
Timofey
18ed20569d Web:Editor: wrap editor in theme provider and delete theme as props in components 2022-01-27 21:54:58 +08:00
Timofey
ff370ebe1d Web:Editor: add support dark-theme 2022-01-24 22:32:05 +08:00
Artem Tarasov
f2045ab5f0 Web: Components: added stories (ModalDialog, MainButton, Loader, Link, LinkWithDropDown, Label, IconButton),fix HelpButton, Heading stories 2021-03-08 23:18:45 +03:00
Artem Tarasov
487fd2affc Web: Components/Common: fix imports 2021-02-26 00:19:45 +03:00
Artem Tarasov
5f2d0e4616 Web: Components: changed component hierarchy 2021-02-24 17:42:09 +03:00