|
|
b4a79d2dd3
|
web: Common: Applied useFake to PeopleSelector
|
2019-12-06 16:48:10 +03:00 |
|
|
|
2f5ef26c1a
|
web: Components: Exported GroupSelector
|
2019-12-06 16:45:07 +03:00 |
|
|
|
c8a772837f
|
web: Update yarn.lock
|
2019-12-06 16:40:57 +03:00 |
|
|
|
a3240df07c
|
web: common: bump version
|
2019-12-06 16:38:30 +03:00 |
|
|
|
f87ea9cc13
|
web: Common: Added new package "faker"
|
2019-12-06 16:37:55 +03:00 |
|
|
|
e7bf5e4a29
|
web: Common: Added support of fakeApi to getUserList and getGroupList methods
|
2019-12-06 16:37:04 +03:00 |
|
|
|
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
|
b21a74d7ec
|
web: common: bump version
|
2019-12-04 17:35:44 +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
|
59790452ce
|
web: common: bump version
|
2019-12-04 14:20:43 +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
|
171fe4bbc7
|
Merge branch 'master' into feature/components-custom-styling
|
2019-12-04 10:46:22 +03:00 |
|
|
|
546b5ac5b9
|
web: common: bump version
|
2019-12-04 10:13:56 +03:00 |
|
|
|
b5eb5e6cf7
|
Web: Common: removed reactstrap from web.common
|
2019-12-04 10:12:57 +03:00 |
|
Ilya Oleshko
|
0a47dcef88
|
Merge branch 'master' into feature/components-custom-styling
|
2019-12-04 09:24:17 +03:00 |
|
|
|
7b66b23686
|
Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
|
2019-12-03 16:41:03 +03:00 |
|
|
|
4128d43d89
|
web: Update yarn.lock files
|
2019-12-03 16:24:13 +03:00 |
|
|
|
6b357c1bc8
|
Merge branch 'master' into feature/advanced-selector-v2
|
2019-12-03 15:35:39 +03:00 |
|
|
|
b63a5262ee
|
web: common: bump version
|
2019-12-03 15:10:21 +03:00 |
|
|
|
3832e78b3d
|
web: Common: Moved ModuleTile from asc-web-components to asc-web-common
|
2019-12-03 15:10:07 +03:00 |
|
|
|
4dcb4e2145
|
web: Common: Fixed start storybook with components from asc-web-components
|
2019-12-03 15:08:43 +03:00 |
|
|
|
d44f0ea5f0
|
Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
# web/ASC.Web.Components/src/components/help-button/index.js
|
2019-11-29 12:22:14 +03:00 |
|
|
|
48f7e74572
|
web: common: bump version
|
2019-11-29 11:00:23 +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 |
|
|
|
72b210d00d
|
web: common: bump version
|
2019-11-28 15:08:26 +03:00 |
|
|
|
c9605f4941
|
Web: Common: fixed login page warning
|
2019-11-28 15:08:08 +03:00 |
|
|
|
853e1c1c61
|
web: common: bump version
|
2019-11-28 09:31:52 +03:00 |
|
|
|
9c9d0eab8c
|
Web: Common: replaced reactstrap components
|
2019-11-28 09:31:45 +03:00 |
|
|
|
f46c12cc32
|
Update yarn.lock files
|
2019-11-27 14:26:20 +03:00 |
|
|
|
e63f0200de
|
Web: Common: refactoring login page
|
2019-11-27 14:14:51 +03:00 |
|
|
|
8bf0c002c0
|
web: Common: Added yarn.lock
|
2019-11-27 13:21:46 +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 |
|
|
|
f9d42a39c2
|
web: Common: Sorted package.json
|
2019-11-26 14:58:01 +03:00 |
|
|
|
0eb67806da
|
web: Common: Fixed start of storybook
|
2019-11-26 14:55:31 +03:00 |
|
|
|
1ceef41494
|
web: Storybook: Split titles of storybooks
|
2019-11-26 14:48:42 +03:00 |
|
|
|
ba21e32868
|
web: common: bump version
|
2019-11-26 13:53:54 +03:00 |
|
|
|
c9e85eb365
|
web: Common: Fixed asc-web-components path
|
2019-11-26 13:48:19 +03:00 |
|
|
|
3fdf474e25
|
web: People: Fixed login from People page
|
2019-11-26 09:48:27 +03:00 |
|
|
|
cb3537b82e
|
web: Common: Added clear localStorage on error 401
|
2019-11-26 09:46:57 +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 |
|
