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
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
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
NikolayRechkin
c0c69badf3
first version of a progressive web application
2019-12-03 17:04:40 +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
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
3832e78b3d
web: Common: Moved ModuleTile from asc-web-components to asc-web-common
2019-12-03 15:10:07 +03:00
913bfd3213
Merge branch 'master' into feature/advanced-selector-v2
2019-12-02 16:34:06 +03:00
885b108cd1
Web: Client: removed reactstrap from Home page
2019-11-29 13:25:07 +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
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
f46c12cc32
Update yarn.lock files
2019-11-27 14:26:20 +03:00
506704c54a
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Components/src/components/help-button/index.js
2019-11-27 14:14:07 +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
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
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
8a7644e565
Merge branch 'master' into feature/asc-web-common
2019-11-13 12:33:45 +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
e69d2900ef
Merge branch 'master' into feature/asc-web-common
...
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
2019-11-13 10:55:42 +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
19acdd4a6e
web: Common: Init commit of new js library for common code of any App in AppServer
2019-11-12 14:55:22 +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
df36ffbf68
Merge branch 'master' into feature/advanced-selector-v2
2019-11-11 09:45:41 +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
0ca200bdea
Merge branch 'master' into feature/advanced-selector-v2
2019-11-07 14:01:59 +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
e722f09829
web: Client: Update yarn.lock
2019-11-06 11:09:59 +03:00
559c87a450
Merge branch 'master' into feature/advanced-selector-v2
...
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
2019-11-06 10:50:05 +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
dc3ccbe7b7
Web: Client: refactoring accessRights code, added new translations, refactoring api requests
2019-11-01 15:09:16 +03:00
Daniil Senkiv
d7369489e1
Web.Client: Settings: remove redux usage in Layout sub-components
2019-11-01 14:31:59 +03:00
Daniil Senkiv
1d5baa847f
Web.Client: Settings: added utils
2019-11-01 12:17:12 +03:00
Daniil Senkiv
9ee8282c14
Web.Client: Settings: refactoring
2019-11-01 12:15:23 +03:00
b8b0a64fb2
Web: Client: fixed imports after rename folder
2019-11-01 09:49:40 +03:00
770fdbc691
Web: Client: fixed AdvancedSelector search on accessRights page, rename people folder with actions to setting
2019-11-01 09:36:35 +03:00
7cda5b4bbe
Web: Client: fixed update listUsers for AdvancedSelector on accessRights page
2019-10-31 16:31:48 +03:00
c94a3a005d
Web: Client: added AdvancedSelector to accessRights page with search, added function add new users
2019-10-31 10:22:44 +03:00
Daniil Senkiv
7bc53607c4
Web.Client: Settings: fixed: translations not applied on following a '/settings' link
2019-10-30 15:40:55 +03:00
Daniil Senkiv
a7ab8f48e0
Web.Api: SettingsController: added new model for timezones, changed api method
2019-10-30 14:33:27 +03:00
Daniil Senkiv
fafa3f5ec0
Revert "Web.Api: SettingsController: added new model for timezones"
...
This reverts commit 43c445d31b
2019-10-30 11:02:46 +03:00
Daniil Senkiv
43c445d31b
Web.Api: SettingsController: added new model for timezones
2019-10-30 09:49:38 +03:00
010397f3b0
Web: Client: code refactoring, added delete administrator button
2019-10-29 16:55:25 +03:00
88f364473e
Web: Client: added field admins and owner to redux, added new actions
2019-10-29 16:52:37 +03:00
7a8d7368d2
Web: Client: added new api methods getUserList, changeProductAdmin, getUserById, renamed people to settings in the rootReducer
2019-10-29 16:51:10 +03:00
Daniil Senkiv
1a9cfd4e33
Web.Client: Settings: used settings tree for showing current settings
2019-10-29 13:57:39 +03:00
Daniil Senkiv
41de179671
Web.Client: Settings: added and applied translations
2019-10-29 13:56:09 +03:00
Daniil Senkiv
b9faf28210
Web.Client: Settings: passed right prop currentModuleId to Layout, changed prop currentModuleId from Settings
2019-10-29 09:14:12 +03:00
c43ce99a9b
web: Components: Added loading for options parts
2019-10-28 17:45:47 +03:00
Daniil Senkiv
167a9734d9
Web.Client: Settings: Article: Body: applied Link component to tree nodes instead of plain text
2019-10-28 17:16:59 +03:00
