Commit Graph

268 Commits

Author SHA1 Message Date
c12141897f web: Added check of isAxiosError ("Network error" for example) 2019-11-13 16:12:46 +03:00
242c544557 web: Changed redirect methods to error pages 2019-11-13 15:35:56 +03:00
ccb8cbd7f9 web: Client: Added check for undefined result 2019-11-13 15:16:38 +03:00
a9f394a10b web: Client: Added check authorization in confirmRoute.js 2019-11-13 12:33:11 +03:00
Daniil Senkiv
5c61500118 Web.Client: Settings: added WhiteLabel page with getting logo urls, sizes, text for logo; added function for generating (drawing) logo 2019-11-13 12:22:50 +03:00
54fa1c1c8d Web: Client: removed cookie from confirmRoute 2019-11-13 11:08:39 +03:00
6f13d071bf Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-11-13 10:55:15 +03:00
28e83c13ff Web: Client: replaced reducer accessRight settings, added "set full admin" method to accessRights page 2019-11-13 10:55:08 +03:00
e596497e15 web: removed universal-cookie 2019-11-13 10:04:35 +03:00
14a87d86ff web: Applied server changes in login/logout for all clients 2019-11-13 09:52:03 +03:00
Daniil Senkiv
629f9a4656 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-11-12 11:23:04 +03:00
a79c5c02e4 Web: Client: fixed TabContainer rerender on accessRights page 2019-11-12 09:57:49 +03:00
Daniil Senkiv
239c56813d Web.Client: Settings: fixed problem with defining path 2019-11-11 16:53:35 +03:00
86e4bbeca5 Web: Client: added Tabs container to accessRight page 2019-11-11 16:42:03 +03:00
ebd5b238cd Web: Client: added sorter by first name/last name to accessRights page, added translations, applied a field filter for api requests 2019-11-11 13:57:19 +03:00
9640fb7633 Web: Client: added loader on accessRights page 2019-11-11 09:45:52 +03:00
ed4269eb83 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-11-08 15:41:10 +03:00
ffa5ba9a1f Web: Client: added filterInput to accessRights page 2019-11-08 15:41:03 +03:00
Ilya Oleshko
7a569af04c Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-11-08 14:52:13 +03:00
Ilya Oleshko
4e1ae0d953 web: Client: Hide Settings for People module administrator 2019-11-08 14:49:12 +03:00
19b1a0a825 Web: Client: fixed paging navigation on accessRights page, deleted OwnerId from settingController 2019-11-08 14:05:06 +03:00
b66970c03a Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-11-08 11:29:03 +03:00
88ab13fcc6 Web: Client: fixed paging on accessRights page 2019-11-08 11:28:56 +03:00
Daniil Senkiv
fd0d8b48be Web.Client: added expanded message fro authorized users 2019-11-08 10:56:47 +03:00
Daniil Senkiv
282cf20997 Web.Client: Settings: Customization: fixed in constructor: select first item in timezone and language comboboxes, if not found current value from redux 2019-11-08 10:55:35 +03:00
cddd6ce1ed Web: Client: fixed paging visibility 2019-11-08 09:48:57 +03:00
43fb0bd7b5 Web: Client: added paging to accessRights page, added new translations, added filter to accessRights page, renamed actions, deleted unused selectors, added filter to getListAdmins api 2019-11-08 09:27:00 +03:00
Daniil Senkiv
6ccca21fb3 Web.Client: Settings: Customization: fixed: select first item in timezone and language comboboxes, if not found current value from redux 2019-11-07 17:12:00 +03:00
Daniil Senkiv
e6f13f3dfb web.Client: saved culture and greetingSettings after logout; deleted unused data "settingsTree" 2019-11-07 10:14:26 +03:00
Daniil Senkiv
dc09621f5d Web.Api: added unconditional getting greetingSettings;
Web.Client: moved greetingSettings from setting reducer to auth reducer
2019-11-07 10:06:13 +03:00
Daniil Senkiv
5a9ea7618a Web.Client: Settings: customization: fixed component lifecycle 2019-11-06 17:02:39 +03:00
Daniil Senkiv
011683b777 Web.Client: Settings: Customization: greeting settings: fixed and separated logic for save and restore buttons 2019-11-06 14:48:32 +03:00
Daniil Senkiv
7d159d8659 Web.Client/Server: renamed companyName to greetingSettings 2019-11-06 14:32:04 +03:00
Daniil Senkiv
656d82010b Web.Client: applied getting companyName(greetingTitle) to all Confirm sub-components, removed customNames file 2019-11-06 14:17:13 +03:00
Daniil Senkiv
a877f9d0dd Web.Client/Server: added getting companyName from initial api request, applied to Login component 2019-11-06 14:14:23 +03:00
87e76575d8 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	web/ASC.Web.Client/src/store/settings/reducer.js
2019-11-06 11:38:07 +03:00
95c1746c04 Web: Client: fixed showing admins and users on accessRights page, renamed reducer fields 2019-11-06 11:35:09 +03:00
Daniil Senkiv
e8d1c3bb46 Web.Client: Login: applied greetingTitle to login page 2019-11-05 17:14:56 +03:00
Daniil Senkiv
a914ace184 Web.Client: Settings: Customization: applied dropDownMaxHeight prop after changes (00b421556b) 2019-11-05 17:03:04 +03:00
Daniil Senkiv
a153d90082 Web.Client/Server: Settings: added changing greetingTitle 2019-11-05 16:15:47 +03:00
9d114185ad Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
#	web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
2019-11-05 15:16:33 +03:00
e9ffc8f363 Web: Client: added loader to accessRights page, fixed selected users bug, replace selector functions, added new translations 2019-11-05 15:13:21 +03:00
77085f7510 web: People: Fixed api getUser refactoring bug 2019-11-05 13:31:03 +03:00
Daniil Senkiv
bee0c91442 Web.Client: Settings: applied current translation keys 2019-11-05 11:51:27 +03:00
Daniil Senkiv
3c36446d2b Web.Client: Settings: change link in settingsTree 2019-11-05 11:19:26 +03:00
Daniil Senkiv
ba88e13503 Web.Client: Settings: Layout: refactoring, rewritten utils function for settingsTree with any nesting, added new functions 2019-11-05 10:45:16 +03:00
Daniil Senkiv
fd1f1aaa93 Web.Client: Settings: settingsTree: added tKey property for translation keys, remove title unused property 2019-11-05 10:40:39 +03:00
Daniil Senkiv
7e7af6a1cf Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-11-05 10:36:29 +03:00
Daniil Senkiv
61ac78982b Web.client: Settings: Body: Header: deleted unused state variable 2019-11-01 16:12:48 +03:00
Daniil Senkiv
76383bbb91 Web.client: Settings: moved settingsTree from constants to utils 2019-11-01 16:11:35 +03:00