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
7976dfdb77
web: Components: Added export PublicRoute, PublicRoute
2019-11-22 14:52:04 +03:00
02d853dbff
web: components: link: fix warnings
...
Warning: Failed prop type: Invalid prop `children` of type `array` supplied to `<<anonymous>>`, expected `string`.
in Unknown (at customization.js:158)
in Trans (at customization.js:155)
Warning: Failed prop type: Invalid prop `children` of type `array` supplied to `<<anonymous>>`, expected `string`.
in Unknown (at ProfileInfo.js:214)
in Trans (at ProfileInfo.js:211)
2019-11-21 18:24:58 +03:00
035d729c9c
web: People: Replaced PrivateRoute to ASC.Web.Common realization
2019-11-21 17:34:17 +03:00
7cb2262837
Merge branch 'master' into feature/asc-web-common
...
# Conflicts:
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/store/people/actions.js
2019-11-20 14:29:52 +03:00
00ea5efa28
Web: Client: added help-button header content to client pages, added new translations, fixed showing FilterInput on accessRight admins sub-page
2019-11-20 09:50:13 +03:00
85bcc75f16
web: People: Moved some common utils to ASC.Web.Common
2019-11-19 15:35:56 +03:00
08e9719114
Web: Client: added EmptyScreenContainer with translations to accessRight admins sub-page
2019-11-19 14:53:13 +03:00
ef0d51ab47
web: People: Moved some common constants to ASC.Web.Common
2019-11-19 14:10:56 +03:00
74530bfa76
Merge branch 'master' into feature/asc-web-common
...
# Conflicts:
# products/ASC.People/Client/src/App.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
2019-11-19 13:34:36 +03:00
2a9e3d1870
web: People: Replaced services folder to ASC.Web.Common realization
2019-11-19 12:40:33 +03:00
629d426a55
Web: Client: refactoring accessRight sub-pages code
2019-11-19 09:25:48 +03:00
c8c037d48b
Web: Client: added changeOwner page with translations
2019-11-18 16:12:59 +03:00
da027e13af
Web: Client: added pageLoader to accessRights sub-pages, added advanced selector to owner page added new translations
2019-11-18 13:15:17 +03:00
85d6847e29
web: Client: Fixed warnings
2019-11-18 10:15:19 +03:00
b38b9b2a2a
web: Client: Replaced services folder to ASC.Web.Common realization
2019-11-18 10:14:44 +03:00
23e3d28857
web: Replaced history to asc-web-common variant
2019-11-15 16:44:54 +03:00
a75d6e7ecc
web: Removed auth folder from store (after change to asc-web-common variant)
2019-11-15 16:29:49 +03:00
49d5000cd2
Merge branch 'master' into feature/asc-web-common
2019-11-15 15:29:57 +03:00
6797194080
Web: Client: deleted shouldComponentUpdate from accessRight admins page
2019-11-15 14:16:31 +03:00
06e9c901b3
Web: Client: fixed accessRights rerender on owner and admins pages
2019-11-15 14:02:09 +03:00
2d47d639dd
web: People: Replaced auth store to ASC.Web.Common realization
2019-11-15 12:38:31 +03:00
2a1120645a
Web: Client: added lazy loader to tabs, added ownerId to settings controller
2019-11-15 10:19:37 +03:00
cb057a35ea
Merge branch 'master' into feature/asc-web-common
2019-11-14 16:39:54 +03:00
ef1e3eaa1d
web: Client: Replaced auth store to ASC.Web.Common realization
2019-11-14 16:37:41 +03:00
71bdd47708
Web: Client: fixed filter error
2019-11-14 12:58:20 +03:00
4c2e1a065b
Web: Client: added tabs routing to accessRights page
2019-11-14 12:08:11 +03:00
f498ee5a29
Web: Client: fixed logout on changePassword page
2019-11-14 09:56:06 +03:00
d741353116
Web: Client: fixed accessRights page crash, removed api getAdmins
2019-11-14 09:00:21 +03:00
71a1ead564
Web: Client: fixed owner avatar on accessRights page
2019-11-13 16:38:53 +03:00
17ef3569ee
Merge branch 'master' into feature/asc-web-common
2019-11-13 16:14:32 +03:00
