|
|
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 |
|
