|
|
6ab71a7b65
|
DI: tenantManager
|
2019-09-18 16:33:01 +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 |
|
|
|
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 |
|
|
|
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 |
|
