Commit Graph

929 Commits

Author SHA1 Message Date
Daniil Senkiv
62d87d2625 People.Client: Dialogs: added ChangePasswordDialog component, applied to Home and ProfileAction component 2019-12-13 20:34:57 +03:00
5eeff88737 web: New packages fixes 2019-12-13 16:58:09 +03:00
Daniil Senkiv
1f82fe7ea7 People.Client: ChangeEmailDialog: deleted unused button 2019-12-13 13:29:49 +03:00
NikolayRechkin
3fb01e78ac web: forbade a scalability 2019-12-13 13:25:09 +03:00
Daniil Senkiv
61c9ad6e3e People.Client: ChangeEmailDialog: added new propTypes 2019-12-13 12:24:52 +03:00
Daniil Senkiv
ad77105f83 PeopleClient: ChangeEmailDialog: added new parameter for disabling buttons 2019-12-13 12:19:45 +03:00
Daniil Senkiv
a0f40567d9 People.Client:Dialogs: added ChangeEmailDialog component, applied to Home and ProfileAction component 2019-12-13 12:01:16 +03:00
Daniil Senkiv
c9bf214df8 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-12-13 10:31:48 +03:00
NikolayRechkin
07e3cefb5c web: use Service Worker in production 2019-12-13 10:19:03 +03:00
2758fb1dfb Merge branch 'master' into feature/ef 2019-12-12 17:53:54 +03:00
Daniil Senkiv
1d084ab4e1 People: applied EmailInput component to ProfileAction component 2019-12-12 15:59:18 +03:00
Ilya Oleshko
b0023c3f14 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-12-11 15:30:35 +03:00
Ilya Oleshko
f7aca727ac Web: People: Fixed usage ComboButton on GroupAction page 2019-12-11 15:25:44 +03:00
9ddbbdc52e
Merge pull request #15 from ONLYOFFICE/feature/pwa
Feature/pwa
2019-12-11 15:23:38 +03:00
Daniil Senkiv
babb7875d5 Merge branch 'master' into refactoring/text-heading
# Conflicts:
#	products/ASC.People/Client/src/components/pages/Import/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Import/Section/Header/index.js
#	web/ASC.Web.Components/src/components/text/index.js
2019-12-11 13:45:04 +03:00
Ilya Oleshko
ff1d6a0603 Web: People: Fixed import page 2019-12-11 11:18:48 +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
NikolayRechkin
f6f12dea46 web: people: small fix 2019-12-10 09:16:21 +03:00
33c35b1177 Merge branch 'master' into feature/ef 2019-12-09 21:46:43 +03:00
8c0fc47251 web: Client: Changed AdvancedSelector to PeopleSelector 2019-12-09 17:20:42 +03:00
NikolayRechkin
ca5e501e2b Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-12-09 16:08:48 +03:00
NikolayRechkin
29433b0232 web: people: changed the use of the avatar editor 2019-12-09 16:07:04 +03:00
NikolayRechkin
94581bdd39 People: deleted unused code 2019-12-09 15:59:34 +03:00
f0ce75cf7d Web: People: remove bootstrap peer dependency jquery 2019-12-09 15:36:30 +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
714e8af2b5 web: People: Update packages 2019-12-09 14:26:42 +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
4fd452e603 web: People: Replaced AdvancedSelector to GroupSelector 2019-12-06 16:47:22 +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
8c289784a8 Web: People: removed ReactToastify styles 2019-12-06 15:49:45 +03:00
08db3b32b3 Merge branch 'master' into feature/ef
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
2019-12-06 12:25:18 +03:00
fc5ea3d5fa Merge branch 'master' into Refactoring/remove-react-bootstrap 2019-12-06 12:15:53 +03:00
c9939b0da1 .net core up to 3.1 2019-12-06 12:12:51 +03:00
2652c02add Web: People: removed bootstrap from people module 2019-12-06 12:03:29 +03:00
86a0a6b48c Merge branch 'master' into Refactoring/remove-react-bootstrap 2019-12-06 10:51:04 +03:00
6fbaee10f5 Web: People: added People base styles 2019-12-06 10:43:11 +03:00
Daniil Senkiv
3f7a026c36 People: deleted unused code 2019-12-05 20:01:34 +03:00
Daniil Senkiv
781833d38d moved actions from web.common to web.client and people modules 2019-12-05 20:00:53 +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
d564e6d9be web: People: Changed AdvancedSelector to PeopleSelector 2019-12-04 17:53:01 +03:00
a047332f9c Merge branch 'master' into feature/ef 2019-12-04 13:42:31 +03:00
ea60dbe63f DI: AccountLinker 2019-12-04 13:39:18 +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
17f99fb6f1 Web: People: removed reactstrap from people module 2019-12-04 10:11:13 +03:00
73d9ad590e Web: People: removed README.md 2019-12-04 10:09:36 +03:00
3dc8c87a94 EF: DbTenantService 2019-12-03 18:20:21 +03:00
NikolayRechkin
c0c69badf3 first version of a progressive web application 2019-12-03 17:04:40 +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
Daniil Senkiv
ece2a12763 People.Client: Article: MainButton: fixed after (1ccb08b70d), fixed copying after displaying dialog 2019-12-02 16:55:16 +03:00
997cfa5fda EF: Updated Dependencies. Optimized logging and userPhotoManager 2019-11-29 12:22:20 +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
ae4a3af443 ASC.Web.Common: made a general layout for all clients 2019-11-28 16:36:55 +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
a6a28a4a72
Merge pull request #10 from ONLYOFFICE/feature/asc-web-common
Feature/asc web common
2019-11-27 10:04:51 +03:00
4e69ebebd2 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	web/ASC.Web.Components/src/components/field-container/README.md
#	web/ASC.Web.Components/src/components/field-container/index.js
2019-11-26 14:20:14 +03:00
74a624a8b9 update yarn.lock files 2019-11-26 14:04:37 +03:00
19fcc09e25 People.Client: ProfileAction: fix warnings:
- Warning: validateDOMNesting(...): <p> cannot appear as a descendant of <p>.
- Warning: validateDOMNesting(...): <table> cannot appear as a descendant of <p>.
2019-11-26 11:56:51 +03:00
14f92deedb Merge branch 'master' into feature/asc-web-common 2019-11-26 11:42:57 +03:00
a2c8fae6a4 web: People: Fixed broken logo on login from People page 2019-11-26 09:52:34 +03:00
3fdf474e25 web: People: Fixed login from People page 2019-11-26 09:48:27 +03:00
0639865df0 Web: People: fixed toolitp font on create user page 2019-11-25 16:34:33 +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
538511a4dc EF: options 2019-11-25 14:49:21 +03:00
de2603bea9 Web: People: fixed tooltip text on edit profile page 2019-11-25 14:16:19 +03:00
af3a819b1a Web: People: fixed tooltips font on profile edit page 2019-11-25 13:31:37 +03:00
3586867429 EF: DbUserService 2019-11-25 12:49:12 +03:00
e1b8682025 global replace HelpButtonHeaderContent with helpButtonHeaderContent 2019-11-25 12:00:40 +03:00
10fd09750d Merge branch 'master' into feature/asc-web-common 2019-11-22 16:49:04 +03:00
1043cbc68b web: Common: Removed old not used code 2019-11-22 15:40:51 +03:00
7976dfdb77 web: Components: Added export PublicRoute, PublicRoute 2019-11-22 14:52:04 +03:00
59d4674885 web: Common: Added PrivateRoute 2019-11-22 14:41:57 +03:00
9052dae3ca People.Client: GroupAction: responsive design 2019-11-22 12:14:50 +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
63b839ef3a People.Client: ProfileAction: validate trimmed field values 2019-11-21 13:53:01 +03:00
2a0812c8c5 People.Client: ProfileAction: added scroll to fields with errors 2019-11-21 13:40:34 +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
4d2db41258 Merge branch 'master' into feature/layout-scrolling 2019-11-20 11:41:10 +03:00
3080756461 web: People: Hide paging if total count less then pageCount 2019-11-20 11:37:17 +03:00
96a3a60c1c web: People: Fixed mass re-render on group-buttons actions 2019-11-20 11:27:33 +03:00
df767e3849 web: People: Fixed setSelected value 2019-11-20 10:44:24 +03:00
83f7201bfa Web: People: added help-button header content to people pages 2019-11-20 09:45:39 +03:00
85bcc75f16 web: People: Moved some common utils to ASC.Web.Common 2019-11-19 15:35:56 +03:00
325a42f66b web: components: row: added custom shouldComponentUpdate function 2019-11-19 14:33:33 +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
18b0cdab2d web: People: Moved api methods: resendUserInvites and getShortenedLink into ASC.Web.Common 2019-11-18 13:52:37 +03:00
Ilya Oleshko
502060e4b2 web: People: Fixed rendering of data preview before import. 2019-11-18 11:57:54 +03:00
d05565107c EF: init commit 2019-11-15 18:04:05 +03:00
23e3d28857 web: Replaced history to asc-web-common variant 2019-11-15 16:44:54 +03:00
Ilya Oleshko
98ed6e94d3 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-11-15 16:33:41 +03:00
a75d6e7ecc web: Removed auth folder from store (after change to asc-web-common variant) 2019-11-15 16:29:49 +03:00
cac19cc75e Merge remote-tracking branch 'remotes/origin/master' into feature/layout-scrolling 2019-11-15 15:36:21 +03:00
49d5000cd2 Merge branch 'master' into feature/asc-web-common 2019-11-15 15:29:57 +03:00
2d47d639dd web: People: Replaced auth store to ASC.Web.Common realization 2019-11-15 12:38:31 +03:00
fcc4e4605f Common nlog config 2019-11-15 11:47:56 +03:00
Ilya Oleshko
66d13c6750 web: People: Added Import page 2019-11-15 11:18:00 +03:00
cb057a35ea Merge branch 'master' into feature/asc-web-common 2019-11-14 16:39:54 +03:00
1b3e977d0e People.Client: GroupAction page has common layout scroll 2019-11-14 15:37:22 +03:00
f8ef4275c7 People.Client: Home page: RowContainer without ReactWindow 2019-11-14 15:28:42 +03:00
02dde786af People.Client: Home page has common layout scroll 2019-11-14 15:15:33 +03:00
04464d52ad Add "AddEnvironmentVariables" setting 2019-11-14 12:21:15 +03:00
175c86fb49 People: auth fixed 2019-11-13 18:11:30 +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
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
14a87d86ff web: Applied server changes in login/logout for all clients 2019-11-13 09:52:03 +03:00
074b8b7f61 People: optimized get all people method 2019-11-12 15:24:59 +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
118bc9e2dd
Merge pull request #7 from ONLYOFFICE/refactoring/di
Refactoring/di
2019-11-12 11:10:31 +03:00
Ilya Oleshko
36471bca55 web: People: Fixed [object Object] error with user title at PeopleRow 2019-11-12 10:19:41 +03:00
26c8d56219 DI: refactoring. Added EmployeeWraperHelper 2019-11-11 18:42:07 +03:00
e9b6976187 Renamed all "*factory" classes to "*Extension" 2019-11-11 14:50:46 +03:00
df36ffbf68 Merge branch 'master' into feature/advanced-selector-v2 2019-11-11 09:45:41 +03:00
50f06898d7 Merge branch 'master' into refactoring/di
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2019-11-10 18:22:02 +03:00
32781a87e2 DI: refactoring. Extract settings helpers 2019-11-08 15:21:51 +03:00
Ilya Oleshko
cf402ced13 web: People: Removed unused function from PeopleRow 2019-11-08 15:03:30 +03:00
Ilya Oleshko
d14d647efb web: People: Addition for commit (029b8f94d1) 2019-11-08 14:51:48 +03:00
Ilya Oleshko
029b8f94d1 web: People: Hide Settings for People module administrator 2019-11-08 14:48:54 +03:00
Ilya Oleshko
90059f4c8b Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-11-08 08:48:12 +03:00
Ilya Oleshko
4fe4ce164d web: People: Fixed isAdmin selector, now checking module admin 2019-11-07 17:07:55 +03:00
Daniil Senkiv
1ccb08b70d People.Client: Article: MainButton: added conditional rendering for InviteDialog component 2019-11-07 16:29:57 +03:00
Ilya Oleshko
b7428a2fa6 web: People: Fixed delete profile and self delete profile actions at profile view page 2019-11-07 15:08:01 +03:00
0ca200bdea Merge branch 'master' into feature/advanced-selector-v2 2019-11-07 14:01:59 +03:00
Ilya Oleshko
b984a8cbcb web: People: Redesigned display of list of user groups. 2019-11-07 12:12:08 +03:00
Ilya Oleshko
decd932548 web: People: Fixed fetching profile after avatar saving action at profile view page 2019-11-07 09:50:52 +03:00
Ilya Oleshko
793a008a49 web: People: Reworked email actions at profile view page 2019-11-07 09:49:50 +03:00
db4ef4a17a DI: Log. refactoring. 2019-11-06 18:03:09 +03:00
Ilya Oleshko
8e2ff9f218 web: People: Reworked profile view page from functional approach to class 2019-11-06 14:51:31 +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