Commit Graph

610 Commits

Author SHA1 Message Date
Ilya Oleshko
b6dd65f1c7 Merge branch 'master' into feature/files 2020-06-15 09:22:52 +03:00
Ilya Oleshko
a1f3b4bde0 Web: Removed faker package, updated yarn lock and fixed stories 2020-06-11 15:54:53 +03:00
7ee4237af4 Update storybook packages (Fix ReDoS vulnerability in websocket-extensions) 2020-06-11 15:13:43 +03:00
144877ab38 Update yarn.lock files 2020-06-08 12:00:05 +03:00
NikolayRechkin
64811dbd39 update yarn.lock files 2020-05-21 15:35:28 +03:00
Daniil Senkiv
71e5e3c73c Web.Client: fix 09474e8be9 2020-03-20 11:15:27 +03:00
15c5114a10 Update yarn.lock files 2020-03-18 13:08:58 +03:00
Daniil Senkiv
730ca469a1 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
#	products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/src/store/files/reducers.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-03-17 09:07:39 +03:00
Ilya Oleshko
8b1568701f Web.Client: Settings: Fixed admin`s row width 2020-03-16 12:19:32 +03:00
0bcfec5a19 Update yarn.lock files 2020-03-16 11:20:25 +03:00
eb21f8a957 Update yarn.lock files 2020-03-16 10:37:55 +03:00
dependabot[bot]
2f8f43a03a
Bump acorn from 5.7.3 to 5.7.4 in /web/ASC.Web.Client
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-16 07:22:50 +00:00
e4af4d168f Update yarn.lock files 2020-02-26 10:23:38 +03:00
2ccd226940 web: clients: Fixed CRA proxy bug; 2020-02-26 10:02:37 +03:00
f3731820cb Web: Client: change title of pages, added new translations 2020-02-18 13:15:02 +03:00
0eb0048596 Web: Client: change title of pages 2020-02-17 16:50:42 +03:00
35ee20c957 Web: Client: added logo icons 2020-02-14 16:05:32 +03:00
Ilya Oleshko
e99d1acc3c Web: Common: Layout: Added use of icons from module 2020-02-12 16:18:23 +03:00
NikolayRechkin
396ef70d49 web: client: small fix a loader 2020-02-06 16:13:05 +03:00
Daniil Senkiv
fff197c90c Web.Client: i18n config: debug only in development mode 2020-02-05 15:45:12 +03:00
Daniil Senkiv
77f88297ed Web.Client: removed useless changeLanguage function 2020-02-05 10:57:49 +03:00
Daniil Senkiv
ea3ab6c723 Web.Client: Settings: hidden whiteLabel page 2020-02-03 17:40:48 +03:00
Daniil Senkiv
99e9aee6df Web.Client: Settings: AccessRights: passed groupsCaption prop to AdvancedSelectors from redux 2020-02-03 17:22:22 +03:00
Daniil Senkiv
f9b390e8e7 Web.Client: Settings: added request for new customNames if user without user language changed portal language 2020-02-03 17:01:15 +03:00
Daniil Senkiv
a4d2b2ecff Web.Client: Settings: Customization: added handling error for restore greeting title 2020-02-03 16:45:12 +03:00
Daniil Senkiv
93a844e5dd Web.Client: Customization: fixed working with translations 2020-02-03 16:36:15 +03:00
3d1e4cc5f5 Web: Client: fixed accessRight admins page 2020-02-03 16:01:03 +03:00
cebb0122db web: Client: Fixed logout redirect on sing out click (issue: unknown 't' function) 2020-02-03 11:38:53 +03:00
f6ac92ad3d web: Client: Removed useless variable 2020-02-03 11:37:27 +03:00
f0cec97c3e web: common: Added ErrorBoundary component with componentDidCatch and new Error520Container show 2020-02-03 11:36:25 +03:00
f3e670e393 web: Common: Extended PeopleSelector component with Me option 2020-02-02 17:33:44 +03:00
Daniil Senkiv
33a841715b Web.Client: Settings: Common: fixed changing language 2020-01-31 15:48:41 +03:00
Daniil Senkiv
13929cabf3 Web.Client: Settings: Customization: replaced i18n method 2020-01-29 13:21:01 +03:00
Daniil Senkiv
f78f0cd374 i18n.reloadResources: fixed for reducing reloading translations 2020-01-29 13:15:46 +03:00
Daniil Senkiv
2f953e4de9 Merge branch 'master' into feature/translations 2020-01-28 17:13:00 +03:00
Daniil Senkiv
756df5b71b Web.Client: Settings: customization: fixed style 2020-01-28 16:10:58 +03:00
Daniil Senkiv
3d82ffcdcd Web.Client: Settings: removed useless container for header 2020-01-28 14:50:23 +03:00
Daniil Senkiv
60ceba9699 web.Client: fixed translation keys 2020-01-28 10:01:25 +03:00
Daniil Senkiv
96c7143192 Merge branch 'master' into feature/translations 2020-01-27 14:49:26 +03:00
effad5439c web: Added dummy Documents product 2020-01-27 14:07:02 +03:00
Daniil Senkiv
8713184d56 Web.Client: removed useless i18n config 2020-01-26 15:05:26 +03:00
Daniil Senkiv
ec2a58e5d5 Web.Client: Home: added ru translation 2020-01-26 15:02:53 +03:00
Daniil Senkiv
d0eebbe6fd Web.Client: Settings: access rights: added translations 2020-01-26 14:47:15 +03:00
Daniil Senkiv
9d82e657ed Merge branch 'master' into feature/translations
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/constants/index.js
2020-01-26 14:12:37 +03:00
Daniil Senkiv
2e7b7ff9e8 Web.Client/Common: fixed problem with working if user without user language changed portal language 2020-01-24 21:46:25 +03:00
ec7299aabf web: Common: Added ComingSoon page 2020-01-24 17:48:36 +03:00
f776054b35 ASC.Web.Client: Settings: AccessRights: hid modules tab 2020-01-24 15:50:02 +03:00
9d3af6d50e ASC.Web.Client: Settings: Whitelabel: initial focus setting 2020-01-24 11:27:01 +03:00
Daniil Senkiv
46c4bca51d web.client: Settings: Customization: triggered change combobox language after changing user language 2020-01-23 13:52:19 +03:00
Daniil Senkiv
120944cb25 Web.Client: Settings: Article: Body: fixed re-render after changing language, if user language not defined 2020-01-22 16:00:42 +03:00
Daniil Senkiv
44b7d5cbf0 Web.Client: Settings: fixed: initial language value is getting from localStorage 2020-01-21 12:09:56 +03:00
Daniil Senkiv
da1d88643d Web.Client: Home: changed redux to localStorage for storing language value 2020-01-21 12:01:53 +03:00
Daniil Senkiv
2cef64a69d Web.Client: Confirm: changed redux to localStorage for storing language value 2020-01-21 11:57:35 +03:00
Daniil Senkiv
2abf7d9ed2 Web.Client: About: changed redux to localStorage for storing language value 2020-01-21 11:37:39 +03:00
Daniil Senkiv
8c2f4dda75 Web.Client: Settings: Customization: added error handling for API requests 2020-01-20 16:49:16 +03:00
Daniil Senkiv
28b0eced9d People/Web.Client: selecting portal language, if user language not defined 2020-01-20 14:17:39 +03:00
13f63cf7b5 web: Client: Update all dependencies 2020-01-15 12:03:43 +03:00
Ilya Oleshko
232633a41d Web: Client: Security: Fixed filter sorting style 2019-12-27 15:58:18 +03:00
05674c5677 web: Client: Fixed 'countElements' is assigned a value but never used no-unused-vars 2019-12-26 15:40:44 +03:00
c8e7bc7cb6 web: Update yarn.lock files 2019-12-25 16:59:00 +03:00
Daniil Senkiv
157f1c7d10 web.components: EmailInput: changed util for validating email, applied changes to EmailInput component. Applied EmailInput changes for all using places. Fixed readme.
Added new translations for validation errors.
2019-12-23 12:02:03 +03:00
b686e99f16 web: Common: Moved Layout and PageLayout to asc-web-common 2019-12-20 14:35:53 +03:00
218ece84e4 Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
2019-12-19 10:15:25 +03:00
082c3b4576 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-12-19 09:59:21 +03:00
49661f1b31 Web: Client: fixed paging on accessRight admins page 2019-12-19 09:59:10 +03:00
Ilya Oleshko
dd783b55c7 Web: Client: Fixed css style for ComboBox on customization page 2019-12-19 09:44:00 +03:00
063ec687f2 web: Client: Fixed license on About page 2019-12-19 09:28:53 +03:00
857a64979c Web: Client: fixed admins settings page horizontal scroll 2019-12-19 09:04:37 +03:00
4079f59b1e Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
#	web/ASC.Web.Components/src/components/advanced-selector/index.js
# Modified:
#       web/ASC.Web.Components/src/components/AdvancedSelector/AdvancedSelector.js
2019-12-18 15:11:09 +03:00
9eed971545 web: Common: Added user role to PeopleSelector 2019-12-18 13:59:08 +03:00
2ab8a79ecd Web: Client: fixed horizontal scroll on about page 2019-12-18 11:29:10 +03:00
e63e98db9c Web: Client: fixed about page text warning 2019-12-17 09:35:23 +03:00
d63af4b637 web: client: Fixed double set of isOpen property for Selectors 2019-12-16 14:23:24 +03:00
0b8ee14130 Web: Client: fixed about page, added new translations 2019-12-16 11:52:56 +03:00
06c220634a web: client: Applied changes in AdvancedSelector on OwnerSettings page 2019-12-15 21:51:51 +03:00
84f6fba008 web: client: Applied changes in AdvancedSelector on AdminsSettings page 2019-12-15 21:39:34 +03:00
77b1f2b252 web: Update yarn.lock files 2019-12-15 18:26:17 +03:00
3b88c07178 Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/src/components/index.js
#	web/ASC.Web.Common/yarn.lock
#	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/index.js
#       web/ASC.Web.Components/src/components/examples/people.selectors.stories.js [removed]
#
2019-12-14 12:32:31 +03:00
5eeff88737 web: New packages fixes 2019-12-13 16:58:09 +03:00
NikolayRechkin
3fb01e78ac web: forbade a scalability 2019-12-13 13:25:09 +03:00
NikolayRechkin
07e3cefb5c web: use Service Worker in production 2019-12-13 10:19:03 +03:00
Daniil Senkiv
0bf04e8800 web.components: EmailInput: fixed readme, fixed export email utils, applied to creareUser page 2019-12-11 16:41:38 +03:00
9ddbbdc52e
Merge pull request #15 from ONLYOFFICE/feature/pwa
Feature/pwa
2019-12-11 15:23:38 +03:00
Daniil Senkiv
d62de9827e 1. Web.Components: Text: change proptype fontSize from [number, string] to string. Applied to other components.
2. Web.Components: Link: fixed isTextOverflow prop working
3.  Web.Components: RadioButtonGroup, RadioButton: fixed readme
2019-12-10 17:12:38 +03:00
Daniil Senkiv
440c4cb528 Merge branch 'master' into refactoring/text-heading
# Conflicts:
#	web/ASC.Web.Components/src/components/modal-dialog/index.js
2019-12-10 12:20:26 +03:00
NikolayRechkin
4bb2b08d2e Merge branch 'master' into feature/pwa 2019-12-10 10:37:41 +03:00
26d3e3d29d
Merge pull request #13 from ONLYOFFICE/Refactoring/remove-react-bootstrap
Refactoring/remove react bootstrap
2019-12-10 10:26:08 +03:00
Daniil Senkiv
6b6c4569cf Merge branch 'master' into refactoring/text-heading 2019-12-10 09:36:05 +03:00
Daniil Senkiv
b0b1b45127 Web.components: RadioButtonGroup: added new props: width, orientation, changed proptype spacing from number to string, applied changes to other components 2019-12-10 09:28:45 +03:00
8c0fc47251 web: Client: Changed AdvancedSelector to PeopleSelector 2019-12-09 17:20:42 +03:00
1d475151c1 Web: Client: remove bootstrap peer dependency jquery 2019-12-09 15:37:07 +03:00
a77aef1970 Merge branch 'master' into Refactoring/remove-react-bootstrap
# Conflicts:
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
2019-12-09 15:29:04 +03:00
Daniil Senkiv
d3f06c8d3e Merge branch 'master' into refactoring/text-heading 2019-12-09 15:24:23 +03:00
Daniil Senkiv
f275c5b258 web.common: renamed Heading component to Headline 2019-12-09 15:12:25 +03:00
452a3ebc4a 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
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
2019-12-09 15:10:01 +03:00
306e861879 web: Client: Update packages 2019-12-09 14:21:23 +03:00
750bd11adf web: Update packages React, Redux 2019-12-09 13:46:20 +03:00
7ded8ae4cd web: Components: Update packages (storybook, babel, jest, css-loader, postcss) 2019-12-09 12:33:39 +03:00
3f9ec420be web: Update yarn.lock files 2019-12-09 11:47:14 +03:00
c477b3b61b web: Update yarn.lock files 2019-12-09 09:19:26 +03:00
cfccfd4093 Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
#	web/ASC.Web.Common/package.json
2019-12-09 09:16:18 +03:00
45f94155ab web: Common: Added and applied new displayType "auto" for AdvancedSelector v2 2019-12-08 21:47:45 +03:00
6ada25a873 Web: Client: fixed Home page styles 2019-12-07 10:08:28 +03:00
Daniil Senkiv
24d06b6fbe Web.common: added Heading component, applied to web.client and people modules 2019-12-06 16:13:48 +03:00
4b51e4ad4f Merge branch 'master' into Refactoring/remove-react-bootstrap
# Conflicts:
#	products/ASC.People/Client/src/custom.scss
#	web/ASC.Web.Client/src/custom.scss
#	web/ASC.Web.Common/.storybook/styles.scss
#	web/ASC.Web.Components/.storybook/styles.scss
2019-12-06 15:58:10 +03:00
8e0cf2da5e Web: Client: removed ReactToastify styles 2019-12-06 15:50:07 +03:00
b15bc4fc67 Web: Client: removed bootstrap from module client 2019-12-06 12:04:06 +03:00
86a0a6b48c Merge branch 'master' into Refactoring/remove-react-bootstrap 2019-12-06 10:51:04 +03:00
a6bb507317 Web: Client: added Client base styles 2019-12-06 10:43:33 +03:00
105b4bdd3a Web: Client: fixed accessRights admins page styles 2019-12-06 09:54:32 +03:00
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