Commit Graph

2064 Commits

Author SHA1 Message Date
a46a092890 DI: TenantManager 2019-09-17 11:07:46 +03:00
547e589420 Removed TenantProvider 2019-09-16 17:51:39 +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
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
25d69a51e3 web: components: bump version 2019-09-13 17:09:33 +03:00
1f0e818767 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	web/ASC.Web.Components/package.json
2019-09-13 17:09:13 +03:00
a74100ad41 Web: Components: fixed calendar locale and theme color props, add new tests 2019-09-13 17:07:03 +03:00
431fb76773 PeopleController: removed CheckImgFormat 2019-09-13 16:33:01 +03:00
f4d4de3cec People: fixed remove photo 2019-09-13 16:19:47 +03:00
bf86c4e4ef People: fixed remove photo 2019-09-13 16:15:51 +03:00
Daniil Senkiv
88f8818d77 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
# Conflicts:
#	web/ASC.Web.Components/package.json
2019-09-13 15:52:42 +03:00
Daniil Senkiv
cec408a75e web: components: bump version 2019-09-13 15:49:31 +03:00
Daniil Senkiv
9b312f9f4a Web.components: Textarea: changed to controlled component 2019-09-13 15:48:55 +03:00
NikolayRechkin
a38e1959be Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-13 15:40:51 +03:00
NikolayRechkin
0332dff111 fixed appsettings.json 2019-09-13 15:40:40 +03:00
Ilya Oleshko
bc0cdc08bd web: components: bump version 2019-09-13 15:39:47 +03:00
Ilya Oleshko
90aff1c805 web: Components: Fixed re-render for RowContainer component 2019-09-13 15:37:55 +03:00
Ilya Oleshko
21c7d8647e web: Components: Fixed re-render for Row component 2019-09-13 15:37:26 +03:00
Ilya Oleshko
03c23871e5 web: Components: Fixed re-render for ContextMenuButton component 2019-09-13 15:35:45 +03:00
Ilya Oleshko
c6d27bdb55 web: Components: Fixed re-render for Avatar component 2019-09-13 15:34:39 +03:00
Ilya Oleshko
96e1d81e86 web: Components: Fixed ESLint warnings and re-render for Link component 2019-09-13 15:30:38 +03:00
Ilya Oleshko
81ed0453b2 Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore 2019-09-13 15:28:51 +03:00
NikolayRechkin
0ef94342fd web: components: bump version 2019-09-13 14:58:58 +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
b196c81209 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-13 14:45:27 +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
ec02fb84f5 web: components: bump version 2019-09-13 14:19:02 +03:00
473207f9a4 DI: BaseSettings 2019-09-13 14:18:27 +03:00
Daniil Senkiv
488d98110f web: components: bump version 2019-09-13 14:17:50 +03:00
Daniil Senkiv
93e901a2cc Web.components: Textarea: added className prop 2019-09-13 14:11:45 +03:00
2f3729e1ee ASC.People: ProfileAction: sending password change instructions 2019-09-13 13:59:11 +03:00
ec5c8dce49 web: components: bump version 2019-09-13 13:46:47 +03:00
70ccd1ceb6 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-13 13:46:07 +03:00
58698064a8 Web: Components: fixed calendar README, fixed calendar re-render, added new test 2019-09-13 13:45:47 +03:00
32bb48817b Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-09-13 12:47:40 +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
Ilya Oleshko
e8b6965821 web: Components: Fixed element property margin for Row component 2019-09-13 11:41:08 +03:00
Ilya Oleshko
9db9a1e769 web: components: bump version 2019-09-13 11:32:11 +03:00
Ilya Oleshko
56a4df6c8e web: Components: Added zIndex property for Backdrop at ModalDialog component 2019-09-13 11:30:31 +03:00
Ilya Oleshko
75f21eacf9 web: Components: Fixed default zIndex property in Backdrop component 2019-09-13 11:29:45 +03:00
Ilya Oleshko
9debe5e176 web: components: bump version 2019-09-13 11:06:58 +03:00
Ilya Oleshko
9df735f0ca web: Components: Fixed hiding page counter in Paging component 2019-09-13 11:06:50 +03:00