Commit Graph

2223 Commits

Author SHA1 Message Date
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
Daniil Senkiv
05762f9825 Web.Client: Login: fixed changing email input 2019-09-23 17:21:54 +03:00
12b6b06533 Config: added cultures 2019-09-23 16:22:14 +03:00
859bda608b Settings: added get cultures method 2019-09-23 16:19:01 +03:00
fb933d113a People: fixed update group method 2019-09-23 15:46:42 +03:00
Daniil Senkiv
cf0e438985 Web.Client: added handler for confirmedEmail in Login 2019-09-23 15:26:20 +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
5333930da9 Web.Client: Confirm: createUser: removed wrappers 2019-09-23 12:31:03 +03:00
Daniil Senkiv
31967bf9a1 Web.Client: Confirm: createUser: refactoring 2019-09-23 12:27:05 +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
Daniil Senkiv
49ee05a926 Web.Client: Confirm: changed routing 2019-09-23 11:48:33 +03:00
dafe2d478a Web: Client: added "changePassword" page 2019-09-23 10:47:45 +03:00
4d71a82119 Web: Client: added new words in translation.json 2019-09-23 10:44:09 +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
f992e1a763 DI: IConfiguration 2019-09-20 17:21:41 +03:00
e7b7cabdd2 DI: TenantManager 2019-09-20 17:04:06 +03:00
181e570ce1 DI: CommonServiceProvider 2019-09-20 16:06:10 +03:00
41b4a909cd DI: TenantManager 2019-09-20 15:47:00 +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
0e10323e30 BaseCommonLinkUtility optimization 2019-09-20 12:30:27 +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
2e68bf04d5 web: Client: Init empty confirm pages with routing 2019-09-20 11:22:32 +03:00
2839b5e131 web: People: Added api for create/update group 2019-09-20 11:21:40 +03:00
Daniil Senkiv
d511e14e8e Web.Core: CommonLinkUtility: fixed generating link for creating user through invitation link 2019-09-20 10:58:07 +03:00
Ilya Oleshko
a07e79c3cc Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-20 09:04:17 +03:00
Ilya Oleshko
ea88d77509 web: Components: Added tests for DropDown component. 2019-09-20 09:04:02 +03:00
381b038d70 Web: Client: fixed "About" page styles 2019-09-20 09:02:29 +03:00
c3a600b2eb web: components: bump version 2019-09-20 09:00:44 +03:00
50ccad7cd4 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-20 09:00:30 +03:00
bae55e3bf8 Web: Components: added new tests, fixed date-picker bug 2019-09-20 09:00:11 +03:00
e13049c21f DI: CommonLinkUtility 2019-09-19 18:55:44 +03:00