Commit Graph

351 Commits

Author SHA1 Message Date
26d3e3d29d
Merge pull request #13 from ONLYOFFICE/Refactoring/remove-react-bootstrap
Refactoring/remove react bootstrap
2019-12-10 10:26:08 +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
1d475151c1 Web: Client: remove bootstrap peer dependency jquery 2019-12-09 15:37:07 +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
306e861879 web: Client: Update packages 2019-12-09 14:21:23 +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
3f9ec420be web: Update yarn.lock files 2019-12-09 11:47:14 +03:00
6ada25a873 Web: Client: fixed Home page styles 2019-12-07 10:08:28 +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
8e0cf2da5e Web: Client: removed ReactToastify styles 2019-12-06 15:50:07 +03:00
b15bc4fc67 Web: Client: removed bootstrap from module client 2019-12-06 12:04:06 +03:00
86a0a6b48c Merge branch 'master' into Refactoring/remove-react-bootstrap 2019-12-06 10:51:04 +03:00
a6bb507317 Web: Client: added Client base styles 2019-12-06 10:43:33 +03:00
105b4bdd3a Web: Client: fixed accessRights admins page styles 2019-12-06 09:54:32 +03:00
Daniil Senkiv
781833d38d moved actions from web.common to web.client and people modules 2019-12-05 20:00:53 +03:00
Daniil Senkiv
276eefe679 Moved actions for confirm pages from web.common to web.client, applying to pages 2019-12-05 16:50:07 +03:00
Daniil Senkiv
402226eca6 moved information for confirm pages from web.common to web.client, added confirm reducer 2019-12-04 17:35:38 +03:00
Daniil Senkiv
fac36adde8 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-04 12:38:54 +03:00
Daniil Senkiv
3ec6c287c0 web.components: Text: refactoring, separating component to 3 components, apply changes 2019-12-04 12:36:13 +03:00
9788667ec7 Web: Client: removed reactstrap from client module 2019-12-04 10:12:04 +03:00
Daniil Senkiv
c3fb173e15
Web.Client: Settings: Article: Body: fixed styles for Link component after (7a67dabcd7) 2019-12-03 16:48:12 +03:00
4128d43d89 web: Update yarn.lock files 2019-12-03 16:24:13 +03:00
3832e78b3d web: Common: Moved ModuleTile from asc-web-components to asc-web-common 2019-12-03 15:10:07 +03:00
885b108cd1 Web: Client: removed reactstrap from Home page 2019-11-29 13:25:07 +03:00
49d8889225 Web: Client: removed reactstrap from comfirm pages 2019-11-29 12:00:37 +03:00
240fd3dee4 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-11-28 16:38:17 +03:00
26cac462a0 Web: Client: remove reactstrap from changeOwner page 2019-11-28 16:37:24 +03:00
ae4a3af443 ASC.Web.Common: made a general layout for all clients 2019-11-28 16:36:55 +03:00
a1aa6f8b80 ASC.Web.Client: Settings: Layout: removed unused code 2019-11-28 16:33:56 +03:00
74a624a8b9 update yarn.lock files 2019-11-26 14:04:37 +03:00
14f92deedb Merge branch 'master' into feature/asc-web-common 2019-11-26 11:42:57 +03:00
cad12889ce web: Client: Add errors catch on load 2019-11-26 09:45:58 +03:00
6dcd699f21 ASC.Web.Client: Settings: revert e617c00a41 + added Suspense 2019-11-25 17:52:18 +03:00
d13e729282 Merge branch 'master' into feature/asc-web-common
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/Layout/index.js
2019-11-25 15:18:34 +03:00
93d88ccffb Web: Client: remove route from accessRights page 2019-11-25 14:32:08 +03:00
485b3ed1ef Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-11-25 13:42:27 +03:00
e617c00a41 ASC.Web.Client: Settings: lazy loader replaced to Route (fix initial horizontal scroll) 2019-11-25 13:42:21 +03:00
5bc15e8e29 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-11-25 13:33:39 +03:00
d7b8d560cb Web: Client: removed hidden-icon on accessRight admins sub-page 2019-11-25 13:33:32 +03:00
4d365d8fde Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-11-25 13:32:43 +03:00
ef5c3fccc0 ASC.Web.Client: Settings: Layout: fix missing dependencies 2019-11-25 13:32:37 +03:00
ee02ce6b67 Web: Client: replace lazy loader to Route on accessRights page 2019-11-25 12:33:35 +03:00
e1b8682025 global replace HelpButtonHeaderContent with helpButtonHeaderContent 2019-11-25 12:00:40 +03:00
b2ea40d967 web: Client: Removed commented code 2019-11-25 09:30:54 +03:00
10fd09750d Merge branch 'master' into feature/asc-web-common 2019-11-22 16:49:04 +03:00
604f7278d9 web: Client: Removed old not used code 2019-11-22 16:46:25 +03:00
1043cbc68b web: Common: Removed old not used code 2019-11-22 15:40:51 +03:00
056c098090 ASC.Web.Client: Settings: customization: responsive design 2019-11-22 15:05:50 +03:00
9cda01b5a7 ASC.Web.Client: Settings: whitelabe: responsive design 2019-11-22 15:04:59 +03:00