|
|
8bd3c86d2b
|
Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/advanced-selector/index.js
# web/ASC.Web.Components/src/components/help-button/index.js
# web/ASC.Web.Components/src/components/icon-button/index.js
# Changed (by Text component changes):
# web/ASC.Web.Components/src/components/advanced-selector2/sub-components/selector.js
# web/ASC.Web.Components/src/components/advanced-selector2/advanced-selector2.stories.js
# web/ASC.Web.Components/src/components/advanced-selector/sub-components/groups/header.js
# web/ASC.Web.Components/src/components/advanced-selector/sub-components/options/body.js
# web/ASC.Web.Components/src/components/advanced-selector/sub-components/selector.js
# web/ASC.Web.Common/src/components/people-selector/index.js
|
2019-12-05 14:17:45 +03:00 |
|
Ilya Oleshko
|
f100dbcced
|
Merge branch 'master' into feature/components-custom-styling
|
2019-12-05 10:26:02 +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 |
|
|
|
9e092329eb
|
web: Common: Added PeopleSelector
|
2019-12-04 17:35:17 +03:00 |
|
Ilya Oleshko
|
811ac01af7
|
Merge branch 'master' into feature/components-custom-styling
|
2019-12-04 14:38:42 +03:00 |
|
Daniil Senkiv
|
4984be5bbb
|
web.common: applied (3ec6c287c0) to ModuleTile component
|
2019-12-04 14:20:36 +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 |
|
Ilya Oleshko
|
0a47dcef88
|
Merge branch 'master' into feature/components-custom-styling
|
2019-12-04 09:24:17 +03:00 |
|
|
|
3832e78b3d
|
web: Common: Moved ModuleTile from asc-web-components to asc-web-common
|
2019-12-03 15:10:07 +03:00 |
|
|
|
eb9f905376
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-11-29 11:00:11 +03:00 |
|
|
|
86e4c4ca42
|
Web: Common: removed reactstrap, fixed login page styles
|
2019-11-29 11:00:03 +03:00 |
|
|
|
240fd3dee4
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
|
2019-11-28 16:38:17 +03:00 |
|
|
|
ae4a3af443
|
ASC.Web.Common: made a general layout for all clients
|
2019-11-28 16:36:55 +03:00 |
|
|
|
c9605f4941
|
Web: Common: fixed login page warning
|
2019-11-28 15:08:08 +03:00 |
|
|
|
9c9d0eab8c
|
Web: Common: replaced reactstrap components
|
2019-11-28 09:31:45 +03:00 |
|
|
|
e63f0200de
|
Web: Common: refactoring login page
|
2019-11-27 14:14:51 +03:00 |
|
|
|
e6498718ca
|
web: Common: Replaced state to props
|
2019-11-26 17:47:02 +03:00 |
|
|
|
8b4731e823
|
web: Common: Fixed ru translation.json
|
2019-11-26 17:42:30 +03:00 |
|
|
|
7175c2ba0b
|
web: Common: Moved api from store/services to root level
|
2019-11-25 15:52:34 +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 |
|
|
|
f048a0d1d3
|
web: Components: Fixed src to logo
|
2019-11-22 15:30:50 +03:00 |
|
|
|
f599091d5f
|
web: Components: Added and applies errors 401, 404 pages
|
2019-11-22 15:17:12 +03:00 |
|
|
|
7976dfdb77
|
web: Components: Added export PublicRoute, PublicRoute
|
2019-11-22 14:52:04 +03:00 |
|
|
|
5d626b432f
|
web: Common: Added LoginForm
|
2019-11-22 14:48:54 +03:00 |
|
|
|
810e003419
|
web: Common: Added ExternalRedirect
|
2019-11-22 14:43:06 +03:00 |
|
|
|
b0242a6663
|
web: Common: Added PublicRoute
|
2019-11-22 14:42:34 +03:00 |
|
|
|
59d4674885
|
web: Common: Added PrivateRoute
|
2019-11-22 14:41:57 +03:00 |
|
|
|
035d729c9c
|
web: People: Replaced PrivateRoute to ASC.Web.Common realization
|
2019-11-21 17:34:17 +03:00 |
|
