Commit Graph

869 Commits

Author SHA1 Message Date
Ilya Oleshko
4ff81ac474 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-27 08:57:49 +03:00
925a584b63 web: People: Added loading filter by url on first loading 2019-09-26 17:01:21 +03:00
Ilya Oleshko
c29a18dba6 web: People: Fixed fields at profile viewer. 2019-09-26 16:36:47 +03:00
9ba5348863 web: People: Moved setup of filter url to people/actions.js 2019-09-26 16:36:33 +03:00
Ilya Oleshko
fb88adaa5c web: People: Fixed ComboBox property at profile actions. 2019-09-26 16:35:02 +03:00
586ee3b2f7 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
Conflicts:
	products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
2019-09-26 15:45:30 +03:00
c8b909b156 web: People: Filter Section re-written to class with setup of url by filter 2019-09-26 15:43:21 +03:00
Daniil Senkiv
fd08ae9039 Web.Client: Confirm: added changeEmail sub-component 2019-09-26 12:45:10 +03:00
710a3f62fa Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-25 18:56:28 +03:00
NikolayRechkin
206e4bedc1 web: people: added a default selection text for a filter 2019-09-25 13:51:40 +03:00
NikolayRechkin
65c0f21416 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-25 12:35:16 +03:00
NikolayRechkin
097b44b47f web: people: added translations 2019-09-25 12:34:28 +03:00
5f0f148394 web: People: Change getSelectorUserList url to optimazed 2019-09-25 11:52:39 +03:00
d4cc3f0c78 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-25 10:48:07 +03:00
Daniil Senkiv
a6e7f5ab8d People.Client: separated getting invite links 2019-09-25 10:43:14 +03:00
1e274cc63f web: People: Added opportunity to delete group 2019-09-25 09:46:45 +03:00
17616763af web: People: Added isDisabled for inputs with inLoading 2019-09-25 09:46:12 +03:00
396b08527f Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-25 09:13:11 +03:00
NikolayRechkin
7bcf2a6bf8 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-25 09:04:30 +03:00
NikolayRechkin
14f654d10c web: people: new avatar editor 2019-09-24 17:17:10 +03:00
NikolayRechkin
1a98489513 People: changed photo upload function 2019-09-24 17:07:24 +03:00
6d815608a0 ConfirmAuth: PasswordChange 2019-09-24 15:27:13 +03:00
11fc9d2a01 web: People: Added fetchPeopleByFilter after save group 2019-09-24 15:27:06 +03:00
f6af4ed7e0 web: People: Refactoring: moved all inline functions; Renamed state props and methods;
Added onSelectedItemClose
2019-09-24 14:24:00 +03:00
dec4bb266e DI: configuration 2019-09-24 13:32:12 +03:00
85abad1f94 web: People: Added condition for fetchSelectorUsers call 2019-09-24 11:01:02 +03:00
8ffe04e518 web: People: Fixed groupManager id set 2019-09-24 10:59:46 +03:00
4543a739e6 web: People: Added display selected groupManager 2019-09-24 10:02:08 +03:00
8ab67fffa7 web: People: Added resetGroup call after save group 2019-09-24 09:37:46 +03:00
00849598f0 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	products/ASC.People/Server/Controllers/GroupController.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-23 19:27:36 +03:00
23c00b458b Auth: added additional roles 2019-09-23 18:36:22 +03:00
ac924cd5b7 web: People: Fixed updateGroup 2019-09-23 17:44:50 +03:00
855fce1380 web: People: Added fetchSelectorUsers() 2019-09-23 17:44:27 +03:00
4ede6be2fc Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-23 17:31:11 +03:00
188fe16feb web: People: Added fetchSelectorUsers() 2019-09-23 17:30:58 +03:00
fb933d113a People: fixed update group method 2019-09-23 15:46:42 +03:00
6de13b9d50 DI: configuration 2019-09-23 15:20:08 +03:00
48678ba02d Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-23 12:48:02 +03:00
a3b1846e41 web: People: Fixed Failed prop type: Invalid prop size of value base supplied to SearchIcon, expected one of ["small","medium","big","scale"]. 2019-09-23 12:47:51 +03:00
Daniil Senkiv
5d5f923add People.Client: Reassign: fixed warnings 2019-09-23 12:11:45 +03:00
a4b9be2438 web: People: Fixed Failed prop type: Invalid prop size of value base supplied to SearchIcon, expected one of ["small","medium","big","scale"]. 2019-09-23 12:01:45 +03:00
e119b7a333 web: People: Fixed showing of groupMember 2019-09-23 12:01:24 +03:00
cf2fe0107d Web: People: added "about" page routing 2019-09-23 10:42:15 +03:00
84d4cda3c5 web: People: Fixed reset of targerGroup by ArrowPathIcon click 2019-09-23 10:22:28 +03:00
3e0f946372 DI: PathUtils 2019-09-21 19:39:17 +03:00
1e946b19b6 DI: refactoring 2019-09-20 18:53:27 +03:00
8184492a4f DI: ConfigurationManager 2019-09-20 18:08:45 +03:00
7bb42748b7 DI TenantManager 2019-09-20 15:20:03 +03:00
df9b6efa92 Merge branch 'master' into refactoring/di
# Conflicts:
#	products/ASC.People/Server/Controllers/GroupController.cs
2019-09-20 14:27:03 +03:00
a6c8ad75f0 People: check date 2019-09-20 14:07:57 +03:00
85cfe85252 People: added group model 2019-09-20 13:43:13 +03:00
d37120a7e8 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-20 13:42:13 +03:00
6fef43210d web: People: Added dirty hack for displaying SearchIcon in GroupAction 2019-09-20 13:40:59 +03:00
Daniil Senkiv
4fc450d8e8 People.Client: added Reassign empty page, added translations 2019-09-20 12:28:18 +03:00
e5753d5131 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-20 11:22:40 +03:00
2839b5e131 web: People: Added api for create/update group 2019-09-20 11:21:40 +03:00
e13049c21f DI: CommonLinkUtility 2019-09-19 18:55:44 +03:00
409da28d4b DI: SubscriptionManager 2019-09-19 16:43:28 +03:00
e4a54eadf1 web: People: Styled GroupAction page 2019-09-19 16:14:35 +03:00
7a9635ec2c web: components: Turn off custom scroll on GroupAction (issue: cur render AdvancedSelector) 2019-09-19 16:13:51 +03:00
Daniil Senkiv
1fb77a6606 People.Client: Invite dialog: used redux, localStorage, reduced re-rendering 2019-09-19 15:30:53 +03:00
Daniil Senkiv
1d6d7baa91 People.Client: added new package 2019-09-19 15:27:26 +03:00
7ceb117690 DI: CoreConfiguration 2019-09-19 14:34:54 +03:00
a3dfbb6fbf Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-19 09:53:39 +03:00
Daniil Senkiv
a541a3b187 People.Client: Invite dialog: reduced the number of requests 2019-09-18 18:31:30 +03:00
a07cbe30f4 DI: CoreSettings 2019-09-18 18:19:30 +03:00
Daniil Senkiv
27672cbbd4 People.Client: Invite dialog: added copying after opening 2019-09-18 18:18:18 +03:00
4489d01b82 DI: PaymentManager, AuthorizationManager 2019-09-18 17:18:44 +03:00
c9311e53c8 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-18 16:55:54 +03:00
6ab71a7b65 DI: tenantManager 2019-09-18 16:33:01 +03:00
Ilya Oleshko
d98353d43c web: People: Fixed ComboBox usage at GroupActions component 2019-09-18 16:29:03 +03:00
c171e2c903 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
#	common/ASC.IPSecurity/ASC.IPSecurity.csproj
#	common/ASC.Resource.Manager/ASC.Resource.Manager.csproj
#	common/ASC.VoipService/ASC.VoipService.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Core/ASC.Web.Core.csproj
#	web/ASC.Web.Studio/ASC.Web.Studio.csproj
2019-09-18 13:32:39 +03:00
7c3217f506 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-18 13:22:25 +03:00
165cba3a0a Web: update yarn lock files 2019-09-18 11:30:38 +03:00
bcdbcf5ccc DI: TenantManager 2019-09-18 11:25:57 +03:00
c54fb37203 Web: removed react-datepicker.css 2019-09-18 11:20:09 +03:00
b07f0fd623 web: People: Added styled-components to GroupAction + added SearchInput 2019-09-18 11:17:56 +03:00
b45fcbbe0e web: People: GroupAction re-written to class and connected to real data in redux 2019-09-18 10:23:11 +03:00
f34dca4ebb DI: ApiDateTime 2019-09-17 18:38:06 +03:00
4e2c04c9f7 DI: TenantManager 2019-09-17 15:42:32 +03:00
Daniil Senkiv
093c786b86 People.Client: Invite dialog: fix 2019-09-17 10:09:14 +03:00
Ilya Oleshko
e62511f472 web: People: Fixed edit button scale property for profile viewer. 2019-09-17 09:42:00 +03:00
Ilya Oleshko
6bb228ef27 web: People: Added context options for disabled, enabled and email activation at profile viewer. 2019-09-17 09:27:45 +03:00
Daniil Senkiv
84c2f3faed People.Client: added Invite dialog component 2019-09-17 09:16:42 +03:00
547e589420 Removed TenantProvider 2019-09-16 17:51:39 +03:00
Ilya Oleshko
2d33072d9d web: People: Added modal dialogs for changing email, phone and email activation. Rewritten ProfileInfo component as a class. 2019-09-16 15:43:19 +03:00
de16476542 Merge branch 'master' into refactoring/di
# Conflicts:
#	common/ASC.Api.Core/Core/ApiContext.cs
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
2019-09-16 15:35:44 +03:00
NikolayRechkin
83b1c13ef1 web: People: create an avatar for a new user 2019-09-16 15:20:24 +03:00
81394a6f1e revert 431fb76773 2019-09-16 12:24:06 +03:00
86c5e64b20 added AuthByClaim 2019-09-16 12:21:10 +03:00
98daea7115 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
2019-09-13 17:47:23 +03:00
bdb5b05748 ASC.People: ProfileAction: sending email change instructions 2019-09-13 17:45:22 +03:00
431fb76773 PeopleController: removed CheckImgFormat 2019-09-13 16:33:01 +03:00
NikolayRechkin
d0521e0321 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-13 14:58:37 +03:00
NikolayRechkin
8923113f11 web: People: small fix 2019-09-13 14:57:02 +03:00
NikolayRechkin
f84c88e090 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-13 14:43:51 +03:00
NikolayRechkin
25ae6b8b05 web: People: creating a user avatar 2019-09-13 14:41:15 +03:00
473207f9a4 DI: BaseSettings 2019-09-13 14:18:27 +03:00
2f3729e1ee ASC.People: ProfileAction: sending password change instructions 2019-09-13 13:59:11 +03:00
3a0231504b ASC.People: ProfileAction: added GroupSelector 2019-09-13 12:47:25 +03:00
c188a32bfe ASC.People: ProfileAction: added GroupSelector 2019-09-13 12:42:05 +03:00
13644338b7 ASC.People: ProfileAction: translation 2019-09-13 12:17:14 +03:00
d8cd5f7b9e ASC.People: ProfileAction: added GroupSelector 2019-09-13 12:08:07 +03:00
0c9c1b41b7 ASC.People: ProfileAction: added GroupSelector 2019-09-12 18:39:54 +03:00
deb8231f26 revert f85711b736 2019-09-12 14:34:58 +03:00
308455265a ASC.People: ProfileAction: translation 2019-09-12 11:49:59 +03:00
d24c5bd54b grammar fix 2019-09-12 11:38:04 +03:00
776516ec0a DI: people 2019-09-12 10:57:59 +03:00
a566c63195 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-12 10:08:51 +03:00
936e7cbb40 ASC.People: selectors: added deep clone at toEmployeeWrapper 2019-09-12 10:04:22 +03:00
e0cb81adc4 Merge branch 'master' into refactoring/di
# Conflicts:
#	products/ASC.People/Server/Controllers/PeopleController.cs
2019-09-11 21:21:21 +03:00
dd1cd3aee4 Api: added confirm auth scheme 2019-09-11 18:53:40 +03:00
5492cad9f5 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-11 16:59:08 +03:00
aa7efdaf2e ASC.People: ProfileAction: changed fields to class components + using new DatePicker 2019-09-11 16:53:09 +03:00
1530ec842e DI: WebImageSupplier,WebItemSettings, SettingsManager 2019-09-11 13:42:52 +03:00
2dd1b4c29f Restored and update yarn.lock files 2019-09-11 12:23:23 +03:00
63cabe4c8a web: components: Applied temp fix for security vulnerabilities js-yaml used by babel-plugin-inline-react-svg (https://github.com/airbnb/babel-plugin-inline-react-svg/issues/45) 2019-09-11 12:10:20 +03:00
c34db98d6b suppress warning: NU1701 for release configuration 2019-09-10 18:20:17 +03:00
491ee035a2 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-10 18:03:33 +03:00
d128720a6f ASC.People: ProfileAction: fix departments field 2019-09-10 18:02:12 +03:00
c50b5b0fc9 csproj: remove pdb file from release build configuration 2019-09-10 16:38:20 +03:00
Ilya Oleshko
4d71432f44 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-10 16:18:26 +03:00
7cd8e53d2c Merge branch 'master' into refactoring/di 2019-09-10 16:15:15 +03:00
02efce033f Api: added confirm auth scheme 2019-09-10 15:42:15 +03:00
a45e348b61 ASC.People: ProfileAction: add department button added 2019-09-10 15:21:00 +03:00
Ilya Oleshko
c66c8fd078 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-10 15:13:25 +03:00
Ilya Oleshko
5ec4564f5e web: People: Fixed containerWidth property and translation usage for userContent component. 2019-09-10 15:13:02 +03:00
3e5bcc9d02 ASC.People: ProfileAction: render fixed 2019-09-10 13:51:48 +03:00
118da8c35a ASC.People: ProfileAction: responsive fields 2019-09-10 12:50:45 +03:00
7b4639e18a ASC.People: ProfileAction: fixed Contact Information fields styles 2019-09-10 12:31:04 +03:00
31df2011bb Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-10 11:59:23 +03:00
f59125723a ASC.People: ProfileAction: added Contact Information & Social Profiles fields 2019-09-10 11:58:06 +03:00
87bb67fd99 ASC.People: change user contacts selector 2019-09-10 11:56:04 +03:00
Ilya Oleshko
9554659199 web: People: Added containerWidth property for userContent component. 2019-09-10 11:54:30 +03:00
3d01752e93 ASC.People: don't save empty user contacts 2019-09-10 11:53:47 +03:00
0a5ef37043 Getting STORAGE_ROOT from env variable 2019-09-09 18:04:28 +03:00
e2a4311a29 Dependency injection
Packages updated
2019-09-09 15:56:33 +03:00
3e7f38a6d8 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-09 14:10:32 +03:00
8a4e9158bf ASC.People: merge actions & selectors 2019-09-09 13:50:55 +03:00
5ac14818af web: components: Moved some packages to devDependencies 2019-09-09 12:58:09 +03:00
7ed1236abd Update yarn.lock files 2019-09-09 10:43:24 +03:00
ac501a9525 web: components: Add react-datepicker.css 2019-09-09 10:43:04 +03:00
3774aaea72 Merge branch 'master' into refactoring/asc-web-components
# Conflicts:
#	web/ASC.Web.Components/package.json
2019-09-07 12:01:00 +03:00
0355919f7d Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-06 12:09:56 +03:00
NikolayRechkin
a5953f11df web: People: filter fixed 2019-09-06 11:20:13 +03:00
427ded5ca7 ASC.People: ProfileAction: Update: changed modal dialogs interface 2019-09-05 17:47:17 +03:00
Ilya Oleshko
7d0a528fee web: People: ProfileAction: PasswordInput component applied 2019-09-05 15:11:48 +03:00
Ilya Oleshko
cdb98b27a3 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-05 15:04:20 +03:00
Ilya Oleshko
bd47ce3bfd web: People: Added loading password settings from api 2019-09-05 15:03:00 +03:00
4753c3c3de ASC.People: fix styles in ModalDialog component 2019-09-05 12:41:59 +03:00
3c2d99a64e ASC.People: ProfileAction: Update: user type change fixed 2019-09-05 12:32:20 +03:00
39d332e10e ASC.People: ProfileAction: refactoring 2019-09-04 15:19:46 +03:00
e3f341c032 ASC.People: ProfileAction: added simple email validation 2019-09-04 14:57:16 +03:00
8f76138886 ASC.People: ProfileAction: added tabIndex to components 2019-09-04 14:13:11 +03:00
b130cca7f7 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-04 13:46:32 +03:00
52f96ef66e ASC.People: device moved to utils 2019-09-04 13:30:15 +03:00
d5c0e09f35 web: People: Added opportunity to change Edit group to Create Group + added tab index and auto focus 2019-09-04 12:55:12 +03:00
f64def66cb web: People: ProfileAction: styles for form field components 2019-09-04 12:22:34 +03:00
68fdab0ba9 web: People: Added edit group header text 2019-09-04 11:52:16 +03:00
0ab5e70836 web: People: Fixed history undefined 2019-09-04 11:48:42 +03:00
4e0598613b web: People: Added required props (fixed console errors in GroupAction) 2019-09-04 10:33:55 +03:00
b66fc9156a web: People: Removed redux-form package 2019-09-04 09:51:30 +03:00
e13a95a622 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-04 09:49:17 +03:00
832347cbc7 web: People: Implemented loading real data on edit group 2019-09-04 09:49:06 +03:00
238e103440 Optimization 2019-09-03 15:23:58 +03:00
dbb84caeb7 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-03 14:41:16 +03:00
b7e5a04137 People: fix delete route 2019-09-03 14:10:32 +03:00
e07895c1a4 web: People: Denied self removing by Owner 2019-09-03 14:09:15 +03:00
Daniil Senkiv
a6d0002a32 People.Client: Article: added new translation 2019-09-03 13:55:19 +03:00
b4438b5be9 web: People: Changed request method 2019-09-03 13:53:19 +03:00
a3046b8c49 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-03 13:47:48 +03:00
Daniil Senkiv
e606867476 People.Client: fixed webpack config for moving translation resources 2019-09-03 13:35:50 +03:00
a26d8d24ce Api: added CustomJsonOptionsWrapper. optimization 2019-09-03 12:31:15 +03:00
2a10fd2872 web: People: Implemented OnDelete by Group buttons menu 2019-09-03 11:04:12 +03:00
Daniil Senkiv
5128a3e882 People.Client: deleted unsused i18n config 2019-09-03 10:34:21 +03:00
Daniil Senkiv
d3de82615a People.Client: ProfileAction: fixed translation 2019-09-03 10:33:09 +03:00
Daniil Senkiv
e17d731a70 People.Client: Home: fixed translation 2019-09-03 10:32:18 +03:00
474380d774 web: People: Implemented onDeleteProfileEverClick 2019-09-03 10:26:41 +03:00
Daniil Senkiv
43cb5a34e5 People.Client: translated Article component 2019-09-03 10:23:13 +03:00
7f85f3616e web: People: Fixed reload input in ModalDialog of onChangeEmailClick 2019-09-03 09:56:08 +03:00
b842f2d86f Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-03 09:30:07 +03:00
Daniil Senkiv
f246a518cf
People.Client: fix 2019-09-02 20:04:43 +03:00
Daniil Senkiv
f000ea297a People.Client: fixed Layout component after (855a56d568) 2019-09-02 18:12:10 +03:00
967068a728 UserInfo: optimization 2019-09-02 18:09:45 +03:00
b15bb1bef9 web: People: Implemented onChangePasswordClick 2019-09-02 17:31:05 +03:00
Daniil Senkiv
855a56d568 People.Client: translated Layout component 2019-09-02 17:25:09 +03:00
Daniil Senkiv
405271c701 People.Client: fixed Home component in addition to (e7f38390c7) 2019-09-02 17:06:47 +03:00
397dc64bb2 web: People: Fixed reset empty filter 2019-09-02 16:59:09 +03:00
9a5b513607 web: People: fix api call 2019-09-02 16:46:53 +03:00
8828cdc25c Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-02 16:37:47 +03:00
288ee66c0e web: People: Implemented onDeleteSelfProfileClick 2019-09-02 16:37:32 +03:00
Daniil Senkiv
c60352195d People.Client: translated Error component 2019-09-02 16:34:16 +03:00
a643750162 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-02 12:48:56 +03:00
7d3b23ca30 web: People: Implemented onSendMessageClick with sms creation on Mobile + Added new package "react-device-detect" 2019-09-02 12:48:47 +03:00
565eb4523a Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-02 12:32:06 +03:00
8c504826f6 web: People: ProfileAction: fixed work with store 2019-09-02 12:29:36 +03:00
5f0452633a web: People: Applied resendUserInvites for Group buttons menu 2019-09-02 11:55:43 +03:00
629eb1e943 web: People: Changed toast.error for future translation 2019-09-02 11:44:06 +03:00
6ec9c449f5 web: People: Added and applied resendUserInvites for Context menu 2019-09-02 11:37:42 +03:00
afc3303301 web: components: Removed react-calendar-v2.13.2.tgz 2019-09-02 10:13:37 +03:00
09535f8a30 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-02 09:24:26 +03:00
4b65925600 web: People: Implemented onChangeEmailClick 2019-08-30 18:15:52 +03:00
da37dbea6b web: People: Implemented onDeleteProfileEverClick 2019-08-30 18:04:49 +03:00
d75af2980a web: People: Moved buttons for Dialog to state 2019-08-30 17:55:17 +03:00
75431b5250 web: People: Implemented onDeleteProfileClick 2019-08-30 17:49:35 +03:00
Daniil Senkiv
431c7af595 People.Client: translated GroupAction component 2019-08-30 16:47:24 +03:00
Daniil Senkiv
d3444f0f87 People.Client: renamed translated key 2019-08-30 16:25:56 +03:00
eeebe87b97 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
Conflicts:
	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
2019-08-30 16:00:13 +03:00
12747318c6 Optimization 2019-08-30 15:40:57 +03:00
Daniil Senkiv
e7f38390c7 People.Client: translated Home component 2019-08-30 15:39:25 +03:00
Daniil Senkiv
22488cc872 People.Client: moved customNames.js 2019-08-30 15:38:53 +03:00
0b26057a54 web: People: Implemented onChangePasswordClick 2019-08-30 15:06:55 +03:00
e4a739c62a web: People: ProfileAction: navigation changed 2019-08-30 14:47:13 +03:00
adadbe9fe3 web: People: Implemented onEmailSentClick 2019-08-30 14:35:23 +03:00
2589021fcf web: People: Fixed display context menu options on self profile 2019-08-30 14:30:57 +03:00
7e24bb4e1c web: People: Fixed comment 2019-08-30 14:29:19 +03:00
NikolayRechkin
d67dc7f61e web: People: fix tree menu 2019-08-30 13:57:25 +03:00
f46637780a web: People: ProfileAction: DepartmentField validation added 2019-08-30 13:17:34 +03:00
6c06d615ec web: People: Profile: resetProfile returned 2019-08-30 13:15:49 +03:00
93566622a6 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-30 11:36:27 +03:00
6218363b52 web: People: Added change group tree by filter 2019-08-30 11:36:19 +03:00
ea417b6386 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-08-30 10:27:21 +03:00
a738b80490 web: People: ProfileAction: added sample modal dialog 2019-08-30 10:26:34 +03:00
9d5c5e5e8c web: People: Fixed route to edit self profile on user 2019-08-30 10:07:43 +03:00
f10842c737 web: People: Restored start script as react-app-rewired 2019-08-30 09:49:12 +03:00
Daniil Senkiv
9288ef6b11 People.Client: ProfileAction: updated translations after (5513658526) 2019-08-29 17:21:35 +03:00
fc89fa9c5d web: People: ProfileAction translations 2019-08-29 16:47:32 +03:00
3f4a5475fd Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createUserForm.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/locales/en/translation.json
2019-08-29 16:46:11 +03:00
5513658526 web: People: ProfileAction: form field components 2019-08-29 16:35:54 +03:00
761b4cbe23 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
Conflicts:
	web/ASC.Web.Components/package.json
	web/ASC.Web.Components/yarn.lock
2019-08-29 16:25:31 +03:00
2aeec3ea68 web: New packages fixes 2019-08-29 16:23:47 +03:00
Ilya Oleshko
4a83ed26cb web: People: Changed mapping of users to use RowContainer. 2019-08-29 16:04:18 +03:00
Daniil Senkiv
aa67df0ed7 People.Client: Profile, ProfileActions: removed plurals translation 2019-08-29 15:40:31 +03:00
Daniil Senkiv
ac033f3ecc People.Client: Profile: added custom translated keys 2019-08-29 15:19:14 +03:00
Daniil Senkiv
a926ddb921 People.Client: ProfileAction: added custom translated keys 2019-08-29 14:32:48 +03:00
Daniil Senkiv
f0288226eb People.Client: fixed i18n configs for showing translations in development environment 2019-08-29 12:07:05 +03:00
Daniil Senkiv
0581ba79b5 People.Client: deleted unused translations 2019-08-29 12:04:16 +03:00
b95922b877 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-29 09:40:59 +03:00
4f4aca88a9 web: Update packages 2019-08-29 09:40:44 +03:00
972ff20694 web: People: ProfileAction translations 2019-08-28 18:32:10 +03:00
b6e46a305c Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/Form/userForm.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/index.js
#	web/ASC.Web.Components/src/components/input-block/index.js
#	web/ASC.Web.Components/src/index.js
2019-08-28 18:23:16 +03:00
26451fdf49 web: People: ProfileAction without reduxForm 2019-08-28 18:09:26 +03:00
Daniil Senkiv
7f887dfebe People.Client: translated ProfileActions component 2019-08-28 12:02:21 +03:00
d16d5f1251 Kafka: create only one producer for instance
UserPhotoManager: optimization
2019-08-27 17:57:06 +03:00
Daniil Senkiv
6f60ebf51a People.Client: translated Profile component 2019-08-27 16:15:07 +03:00
Daniil Senkiv
019c126e90 People.Client: fixed webpack config (f5744070ae) 2019-08-27 16:00:46 +03:00
Daniil Senkiv
81f8ee817b People.Client: removed i18n function 2019-08-27 11:00:51 +03:00
Daniil Senkiv
f5744070ae People.Client: added webpack config for moving translation resources 2019-08-27 10:59:07 +03:00
Daniil Senkiv
3b83a376a3 People.Client: added independent resource files and instances of i18next for all project and profile component 2019-08-27 10:56:41 +03:00
Daniil Senkiv
42614e8a34 People.Client: added packages and changed scripts 2019-08-27 10:47:51 +03:00
6cae722b9d kafka disabled by default 2019-08-23 15:49:23 +03:00
NikolayRechkin
8677d3c236 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-08-23 12:51:35 +03:00
NikolayRechkin
efa072eb60 web: People: fix filter 2019-08-23 12:51:13 +03:00
2ec9fe41e9 web: People: ProfileAction: converting employee wrapper to member model 2019-08-23 11:28:16 +03:00
9af50a83b0 web: People: profile actions: fix response error checking 2019-08-23 11:26:37 +03:00
fe2ecf4773 web: People: Added opportunity to change employee type 2019-08-22 17:11:38 +03:00
Ilya Oleshko
2a3ad06117 web: People: Profile: Redesigned on styled components. Added pending indicators. 2019-08-22 16:41:05 +03:00
9583a96103 web: People: Added selection of group filter by TreeMenu 2019-08-21 17:54:37 +03:00
4131663a64 web: People: Fixed display Group filter label 2019-08-21 17:52:33 +03:00
7b69190cbc Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-21 16:53:23 +03:00
efa7dbd1d4 web: People: Added opportunity to Enable/Disable group of users 2019-08-21 16:53:09 +03:00
6df790280b web: People: ProfileAction: added departments field 2019-08-21 16:39:32 +03:00
c9be143015 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-08-21 14:15:06 +03:00
da13d9f650 web: People: ProfileAction: fix form validation 2019-08-21 14:14:59 +03:00
5eda1cb8c0 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-21 14:14:28 +03:00
4c73b14d69 web: People: Re-written updateUserStatus with new action setUser;
Moved resetFilter to actions;
2019-08-21 14:14:18 +03:00
098f2f0669 web: People: ProfileAction: merge form files 2019-08-21 14:07:13 +03:00
78ebffd910 web: People: added create/update profile actions to store 2019-08-21 13:56:03 +03:00
a357935725 web: People: fix ProfileAction fields 2019-08-21 11:22:44 +03:00
d5410def67 web: People: ProfileAction: using DateInput in ReduxForm fixed 2019-08-20 18:22:33 +03:00
e2ed5a88e8 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/Form/userForm.js
2019-08-20 17:48:13 +03:00
a25bf70fa8 web: People: styled ProfileAction 2019-08-20 17:45:10 +03:00
4db40b548d Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-20 16:48:52 +03:00
84e35f90ef web: People: Added group selector in Filter 2019-08-20 16:28:26 +03:00
Ilya Oleshko
0d53d45b46 web: People: Redesigned mapping of users to Row and RowContent components. 2019-08-20 16:08:59 +03:00
Daniil Senkiv
bdb166bc25 Web/People: fixed translation function 2019-08-20 12:34:16 +03:00
b53b79b8f9 Updated yarn.lock files 2019-08-20 10:23:15 +03:00
9967c04b7c web: People: Added enable/disable user by context menu 2019-08-19 16:59:37 +03:00
Daniil Senkiv
ac6ce19963 People: Client: fixed labels of filter 2019-08-19 15:27:44 +03:00
Daniil Senkiv
14b9104705 Web: People: Profile/Section/Body: translated existing words in current version [EN] 2019-08-19 14:21:47 +03:00
Daniil Senkiv
d7fce7998e Web: People: translated existing words in current version, Home [EN] 2019-08-19 14:20:43 +03:00
cc2ea5f5eb Fixed yarn.lock files 2019-08-19 14:13:09 +03:00
225e01df23 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-19 13:30:28 +03:00
79178a0edc Changed folder for asc-web-components (npm-local/ -> packages/); Added react-calendar v2.13.2 (with important fix) 2019-08-19 13:30:18 +03:00
Ilya Oleshko
0ad354b05f web: Components: Fixed structure of PeopleRow component on Row.People 2019-08-19 10:13:26 +03:00
9aa41e2039 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-19 09:03:35 +03:00
458393d187 web: People: Changed loading init user info to async function 2019-08-16 17:57:28 +03:00
b14b178223 web: People: Moved handler to separated const 2019-08-16 17:36:44 +03:00
5fab8c84a2 web: People: Refactoring: Removed useless comment 2019-08-16 17:35:39 +03:00
Ilya Oleshko
b757ee5217 web: People: Redesigned mapping of users to PeopleRow component. Fixed row height for scroll. 2019-08-16 16:37:47 +03:00
Daniil Senkiv
fa8f00d17a Web: People: translated existing words in current version, Filter [EN] 2019-08-16 16:23:35 +03:00
Daniil Senkiv
4fa64cff70 Web: People: translated existing words in current version, userForm [EN] 2019-08-16 15:32:17 +03:00
35028de860 web: People: styled ProfileAction 2019-08-16 13:39:06 +03:00
36009e6d32 web: People: styled ProfileAction 2019-08-16 13:34:36 +03:00
14f7ffdfdf Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-08-16 13:26:57 +03:00
5dd8b1bd39 web: People: styled ProfileAction 2019-08-16 13:25:52 +03:00
Ilya Oleshko
74eb7a141f web: People: Fixed displaying checkbox at row for users 2019-08-16 10:44:23 +03:00
Daniil Senkiv
fff4269767 Web: People: translated existing words in current version, Body [EN] 2019-08-15 19:17:51 +03:00
e11a3d0b08 People: fixed count 2019-08-15 18:54:56 +03:00
Daniil Senkiv
848ec61fa6 Web: People: translated existing words in current version, MainButton [EN] 2019-08-15 18:52:35 +03:00
Daniil Senkiv
980a132917 Web: People: translated existing words in current version, Header [EN] 2019-08-15 18:51:08 +03:00
Daniil Senkiv
b6f83d8d7c Web: People: translated existing words in current version, Paging [EN] 2019-08-15 18:49:25 +03:00
9e32ad4b6c IDE0063 2019-08-15 18:08:40 +03:00
5150f9e05c Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 17:01:20 +03:00
6bc2c24ad3 web: People: Back to PageLayout 2019-08-15 17:01:09 +03:00
9bee426464 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
Conflicts:
	products/ASC.People/Client/src/components/Layout.js
2019-08-15 16:52:56 +03:00
5dcbe56092 web: People: Decreased count of PeopleLayout render 2019-08-15 16:27:50 +03:00
Daniil Senkiv
937c1de58f Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 16:08:44 +03:00
Daniil Senkiv
edad39ed33 Web: People: translated Layout [EN] 2019-08-15 16:07:16 +03:00
58fb60ba65 IDE0007 2019-08-15 16:03:57 +03:00
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
93ae8acba9 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 14:54:26 +03:00
Ilya Oleshko
5765554125 web: People: Profile: Fixed departments link type and isSelf option 2019-08-15 14:53:49 +03:00
2ac4246122 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 14:53:17 +03:00
65563552fa Packages updated 2019-08-15 14:33:57 +03:00
6a1220efe2 web: People: Added styled-components 2019-08-15 13:30:55 +03:00
697af9ca32 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-15 12:11:11 +03:00
Ilya Oleshko
0045a52a6a web: People: Profile: Fixed context options mapping 2019-08-15 11:16:19 +03:00
427b880f3b web: People: Refactoring: Moved function 2019-08-15 10:50:54 +03:00
d4d0cd687d web: People: Refactoring: Removed useless imports; 2019-08-15 10:50:31 +03:00
Ilya Oleshko
9486d11f56 web: People: Profile: Moved back to PageLayout 2019-08-15 10:21:04 +03:00
4e70bd627f Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-14 17:52:12 +03:00
1ecb618bfb web: people: Added restricted prop to PrivateRoute (to prevent direct movement to Admin's functional) 2019-08-14 17:52:03 +03:00
Ilya Oleshko
e3fd281af4 web: People: Fixed paging options. Fixed totalPages checking. 2019-08-14 17:24:41 +03:00
3c436e5b65 web: People: Hidden edit profile for User viewer 2019-08-14 16:56:35 +03:00
Ilya Oleshko
d440e0d3ed web: People: Fixed defaultPageItem and defaultCountItem paging options. Fixed totalPages rounding. 2019-08-14 15:56:30 +03:00
3028f4ef33 web: People: Hidden "filter-status" for User viewer 2019-08-14 15:44:15 +03:00
861febbe0f web: People: Added reset empty filter handler 2019-08-14 14:33:56 +03:00
95cb4dc503 web: People: Setup context menu for users in list 2019-08-14 10:29:22 +03:00
783c2c3593 web: People: Commented lazy loading 2019-08-14 09:26:16 +03:00
e63901c754 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-13 17:48:17 +03:00
6e71569c12 web: People: Init translation 2019-08-13 17:48:04 +03:00
a9ce68847f web: client: Init translation 2019-08-13 17:47:40 +03:00
d70375a52e web: People: Removed isHovered 2019-08-13 17:45:13 +03:00
d7376418f8 Removed unused resources 2019-08-13 16:05:36 +03:00
7a99918c29 web: components: Added CustomScrollbarsVirtualList for FixedSizeList in react-window package 2019-08-13 15:04:56 +03:00
dc33d6566c web: People: Added setup defaultSelectedKeys for TreeMenu 2019-08-13 12:32:30 +03:00
f107416e66 web: People: Moved getTreeGroups back to PeopleTreeMenu 2019-08-12 18:01:44 +03:00
d6ca19d216 web: People: Simplified People TreeMenu; Added selection of group with changing header; 2019-08-12 17:56:29 +03:00
b675e8108d Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-12 16:01:35 +03:00
17805a596c web: People: Added loading settings from api 2019-08-12 16:01:26 +03:00
731ddefc82 Added CultureMiddleware and DisposeMiddleware 2019-08-12 15:52:55 +03:00
Ilya Oleshko
1f15d582e8 web: People: Added paging option placeholders 2019-08-12 14:13:31 +03:00
a26a6db0ea Api: added settings controller 2019-08-12 13:53:12 +03:00
7a0c416400 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
Conflicts:
	web/ASC.Web.Components/src/index.js
2019-08-09 17:59:55 +03:00
da510a0b4b web: People: Added EmptyScreenContainer for empty filter results 2019-08-09 17:57:24 +03:00
49b259abff refactoring 2019-08-09 15:28:19 +03:00
236c59e1bf web: People: Implemented page changing in People paging 2019-08-09 11:20:32 +03:00
4d9db01c58 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-08-08 17:43:10 +03:00
f0d2854071 People: fix search by filter 2019-08-08 17:42:29 +03:00