|
85bcc75f16
|
web: People: Moved some common utils to ASC.Web.Common
|
2019-11-19 15:35:56 +03:00 |
|
|
325a42f66b
|
web: components: row: added custom shouldComponentUpdate function
|
2019-11-19 14:33:33 +03:00 |
|
|
ef0d51ab47
|
web: People: Moved some common constants to ASC.Web.Common
|
2019-11-19 14:10:56 +03:00 |
|
|
74530bfa76
|
Merge branch 'master' into feature/asc-web-common
# Conflicts:
# products/ASC.People/Client/src/App.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
|
2019-11-19 13:34:36 +03:00 |
|
|
2a9e3d1870
|
web: People: Replaced services folder to ASC.Web.Common realization
|
2019-11-19 12:40:33 +03:00 |
|
|
18b0cdab2d
|
web: People: Moved api methods: resendUserInvites and getShortenedLink into ASC.Web.Common
|
2019-11-18 13:52:37 +03:00 |
|
Ilya Oleshko
|
502060e4b2
|
web: People: Fixed rendering of data preview before import.
|
2019-11-18 11:57:54 +03:00 |
|
|
d05565107c
|
EF: init commit
|
2019-11-15 18:04:05 +03:00 |
|
|
23e3d28857
|
web: Replaced history to asc-web-common variant
|
2019-11-15 16:44:54 +03:00 |
|
Ilya Oleshko
|
98ed6e94d3
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2019-11-15 16:33:41 +03:00 |
|
|
a75d6e7ecc
|
web: Removed auth folder from store (after change to asc-web-common variant)
|
2019-11-15 16:29:49 +03:00 |
|
|
cac19cc75e
|
Merge remote-tracking branch 'remotes/origin/master' into feature/layout-scrolling
|
2019-11-15 15:36:21 +03:00 |
|
|
49d5000cd2
|
Merge branch 'master' into feature/asc-web-common
|
2019-11-15 15:29:57 +03:00 |
|
|
2d47d639dd
|
web: People: Replaced auth store to ASC.Web.Common realization
|
2019-11-15 12:38:31 +03:00 |
|
|
fcc4e4605f
|
Common nlog config
|
2019-11-15 11:47:56 +03:00 |
|
Ilya Oleshko
|
66d13c6750
|
web: People: Added Import page
|
2019-11-15 11:18:00 +03:00 |
|
|
cb057a35ea
|
Merge branch 'master' into feature/asc-web-common
|
2019-11-14 16:39:54 +03:00 |
|
|
1b3e977d0e
|
People.Client: GroupAction page has common layout scroll
|
2019-11-14 15:37:22 +03:00 |
|
|
f8ef4275c7
|
People.Client: Home page: RowContainer without ReactWindow
|
2019-11-14 15:28:42 +03:00 |
|
|
02dde786af
|
People.Client: Home page has common layout scroll
|
2019-11-14 15:15:33 +03:00 |
|
|
04464d52ad
|
Add "AddEnvironmentVariables" setting
|
2019-11-14 12:21:15 +03:00 |
|
|
175c86fb49
|
People: auth fixed
|
2019-11-13 18:11:30 +03:00 |
|
|
17ef3569ee
|
Merge branch 'master' into feature/asc-web-common
|
2019-11-13 16:14:32 +03:00 |
|
|
c12141897f
|
web: Added check of isAxiosError ("Network error" for example)
|
2019-11-13 16:12:46 +03:00 |
|
|
242c544557
|
web: Changed redirect methods to error pages
|
2019-11-13 15:35:56 +03:00 |
|
|
e69d2900ef
|
Merge branch 'master' into feature/asc-web-common
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
|
2019-11-13 10:55:42 +03:00 |
|
|
14a87d86ff
|
web: Applied server changes in login/logout for all clients
|
2019-11-13 09:52:03 +03:00 |
|
|
074b8b7f61
|
People: optimized get all people method
|
2019-11-12 15:24:59 +03:00 |
|
|
19acdd4a6e
|
web: Common: Init commit of new js library for common code of any App in AppServer
|
2019-11-12 14:55:22 +03:00 |
|
|
118bc9e2dd
|
Merge pull request #7 from ONLYOFFICE/refactoring/di
Refactoring/di
|
2019-11-12 11:10:31 +03:00 |
|
Ilya Oleshko
|
36471bca55
|
web: People: Fixed [object Object] error with user title at PeopleRow
|
2019-11-12 10:19:41 +03:00 |
|
|
26c8d56219
|
DI: refactoring. Added EmployeeWraperHelper
|
2019-11-11 18:42:07 +03:00 |
|
|
e9b6976187
|
Renamed all "*factory" classes to "*Extension"
|
2019-11-11 14:50:46 +03:00 |
|
|
df36ffbf68
|
Merge branch 'master' into feature/advanced-selector-v2
|
2019-11-11 09:45:41 +03:00 |
|
|
50f06898d7
|
Merge branch 'master' into refactoring/di
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2019-11-10 18:22:02 +03:00 |
|
|
32781a87e2
|
DI: refactoring. Extract settings helpers
|
2019-11-08 15:21:51 +03:00 |
|
Ilya Oleshko
|
cf402ced13
|
web: People: Removed unused function from PeopleRow
|
2019-11-08 15:03:30 +03:00 |
|
Ilya Oleshko
|
d14d647efb
|
web: People: Addition for commit (029b8f94d1 )
|
2019-11-08 14:51:48 +03:00 |
|
Ilya Oleshko
|
029b8f94d1
|
web: People: Hide Settings for People module administrator
|
2019-11-08 14:48:54 +03:00 |
|
Ilya Oleshko
|
90059f4c8b
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2019-11-08 08:48:12 +03:00 |
|
Ilya Oleshko
|
4fe4ce164d
|
web: People: Fixed isAdmin selector, now checking module admin
|
2019-11-07 17:07:55 +03:00 |
|
Daniil Senkiv
|
1ccb08b70d
|
People.Client: Article: MainButton: added conditional rendering for InviteDialog component
|
2019-11-07 16:29:57 +03:00 |
|
Ilya Oleshko
|
b7428a2fa6
|
web: People: Fixed delete profile and self delete profile actions at profile view page
|
2019-11-07 15:08:01 +03:00 |
|
|
0ca200bdea
|
Merge branch 'master' into feature/advanced-selector-v2
|
2019-11-07 14:01:59 +03:00 |
|
Ilya Oleshko
|
b984a8cbcb
|
web: People: Redesigned display of list of user groups.
|
2019-11-07 12:12:08 +03:00 |
|
Ilya Oleshko
|
decd932548
|
web: People: Fixed fetching profile after avatar saving action at profile view page
|
2019-11-07 09:50:52 +03:00 |
|
Ilya Oleshko
|
793a008a49
|
web: People: Reworked email actions at profile view page
|
2019-11-07 09:49:50 +03:00 |
|
|
db4ef4a17a
|
DI: Log. refactoring.
|
2019-11-06 18:03:09 +03:00 |
|
Ilya Oleshko
|
8e2ff9f218
|
web: People: Reworked profile view page from functional approach to class
|
2019-11-06 14:51:31 +03:00 |
|
|
559c87a450
|
Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
|
2019-11-06 10:50:05 +03:00 |
|
Ilya Oleshko
|
b07a6eb570
|
web: People: Added ru translations at profile page.
|
2019-11-06 09:54:00 +03:00 |
|
|
77085f7510
|
web: People: Fixed api getUser refactoring bug
|
2019-11-05 13:31:03 +03:00 |
|
|
d7a4dd7fed
|
Merge branch 'master' into refactoring/di
|
2019-11-01 12:41:30 +03:00 |
|
|
0be2995e83
|
DI: filters and handlers
|
2019-11-01 12:37:02 +03:00 |
|
|
a35a457f6e
|
DI: refactoring. Web.Api
|
2019-10-31 16:54:43 +03:00 |
|
|
402c4d908d
|
DI: refactoring
|
2019-10-31 14:28:30 +03:00 |
|
Ilya Oleshko
|
23ae30ce13
|
web: People: Fixed display of parameters of contextual options depending on user status
|
2019-10-31 13:24:21 +03:00 |
|
Ilya Oleshko
|
3d5d7f24f1
|
web: People: Added edit avatar action and translates at profile view page.
|
2019-10-30 14:16:56 +03:00 |
|
|
0bbc383266
|
Merge branch 'master' into refactoring/di
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/Notify/StudioNotifyService.cs
|
2019-10-30 11:45:55 +03:00 |
|
Ilya Oleshko
|
7f6fff7836
|
web: People: Fixed context button options. Added actions for change email and change password.
|
2019-10-29 17:04:55 +03:00 |
|
Ilya Oleshko
|
a67a2e0951
|
web: People: Redesigned display of list of user groups. Added display of Title and actions on elements.
|
2019-10-29 13:29:44 +03:00 |
|
Ilya Oleshko
|
3cf0782f89
|
web: People: Fixed duplication of parameters at profile view component
|
2019-10-29 13:27:33 +03:00 |
|
Daniil Senkiv
|
b9faf28210
|
Web.Client: Settings: passed right prop currentModuleId to Layout, changed prop currentModuleId from Settings
|
2019-10-29 09:14:12 +03:00 |
|
|
c43ce99a9b
|
web: Components: Added loading for options parts
|
2019-10-28 17:45:47 +03:00 |
|
|
d2cca81175
|
web: Components: Split AdvancedSelector to several parts + added InfinitLoader
|
2019-10-27 21:30:04 +03:00 |
|
Daniil Senkiv
|
272a79286e
|
People.Client: added settings link in modules
|
2019-10-25 21:20:11 +03:00 |
|
Ilya Oleshko
|
2f238700b2
|
web: People: Profile view page divided into subcomponents
|
2019-10-24 14:27:05 +03:00 |
|
|
8ca3a63e24
|
DI: refactoring
|
2019-10-22 19:08:37 +03:00 |
|
|
726ca634e4
|
Revert "removed ConfigurationManager"
This reverts commit c03be150f4 .
ProgressQueue init
|
2019-10-22 16:48:48 +03:00 |
|
Ilya Oleshko
|
611da8e80a
|
web: People: Fixed style errors at EditButton and TooltipIcon
|
2019-10-22 14:54:44 +03:00 |
|
|
78584b78a3
|
DI: removed LogManager
|
2019-10-22 14:21:44 +03:00 |
|
Ilya Oleshko
|
ad5f58a81f
|
web: People: Added update of user information when changing status
|
2019-10-22 13:52:48 +03:00 |
|
|
337238c87c
|
Removed CommonServiceProvider
|
2019-10-21 18:05:36 +03:00 |
|
|
53d2aaa4e3
|
DI: DbManager
|
2019-10-21 16:50:20 +03:00 |
|
|
29c235b5a1
|
Web: People: fixed email tooltip translation
|
2019-10-21 16:22:37 +03:00 |
|
|
e0b5661188
|
DI: dbManager
|
2019-10-21 15:52:16 +03:00 |
|
|
e82366a2cd
|
DI: dbManager
|
2019-10-21 15:33:02 +03:00 |
|
|
6e332d6804
|
Web: People: added email tooltip to createUserForm, updated translations
|
2019-10-21 15:01:17 +03:00 |
|
|
f11ed0ceef
|
Web: People: fixed tooltipLanguage position on profile
|
2019-10-21 12:07:30 +03:00 |
|
|
10855fe3be
|
Web: People: fixed "NotFoundLanguage" translation link
|
2019-10-21 09:00:43 +03:00 |
|
|
247a3b787f
|
DI: DbManager
|
2019-10-18 17:22:40 +03:00 |
|
|
09881619b8
|
DI: DbManager
|
2019-10-18 16:29:24 +03:00 |
|
|
5b117629f3
|
Web: People: added help-button to language on profile page
|
2019-10-18 15:15:12 +03:00 |
|
|
219036d4a4
|
DI: HttpContext
|
2019-10-18 11:48:27 +03:00 |
|
|
2135c01d88
|
Web: People: deleted unused tooltip code
|
2019-10-18 09:53:06 +03:00 |
|
|
6b2f6b0a7b
|
DI: log
|
2019-10-17 18:55:35 +03:00 |
|
|
0b52757164
|
Web: People: remove tooltip from profile
|
2019-10-17 16:15:04 +03:00 |
|
|
0f4c3bec04
|
Web: People: replace tooltip
|
2019-10-17 13:54:06 +03:00 |
|
|
dea3e9eff3
|
Web: People: fixed tooltip, fixed translations to tooltip
|
2019-10-14 15:43:59 +03:00 |
|
|
5ec41ccaff
|
DI: removed appSettings
|
2019-10-14 11:23:45 +03:00 |
|
|
9759b54104
|
web: People: Fixed translation "NotFoundLanguage" key (issue: custom links in translation)
|
2019-10-14 10:31:50 +03:00 |
|
|
7c05ba927b
|
DI: KafkaCache
|
2019-10-11 18:03:03 +03:00 |
|
|
a9c1b5411b
|
Web: People: added tooltip icon with translations to profile
|
2019-10-11 11:57:22 +03:00 |
|
|
28b44eb6a0
|
Web: Client: fixed tooltip position
|
2019-10-11 10:16:45 +03:00 |
|
|
eb39c52754
|
Web: People: fix tooltip errors
|
2019-10-11 09:16:45 +03:00 |
|
|
37a0f05a3a
|
Web: People: added tooltip to fields "email" and "type" with translations to updateUserForm
|
2019-10-10 15:12:37 +03:00 |
|
|
2ebe431c98
|
DI: configuration
|
2019-10-10 11:52:21 +03:00 |
|
|
74d8709f62
|
DI: configuration
|
2019-10-09 19:08:37 +03:00 |
|
|
515f7de555
|
DI: Configuration
|
2019-10-09 18:04:46 +03:00 |
|
|
38bfd6e5d6
|
Web: People: fixed calendar style, added new translations
|
2019-10-09 16:15:19 +03:00 |
|
|
687199cebf
|
Web: People: fixed date-picker on "updateUserForm" page, added calendar header
|
2019-10-09 14:22:07 +03:00 |
|
|
cd63121dc7
|
web: People: Added api client with common settings for all requests
|
2019-10-08 10:59:45 +03:00 |
|
|
67c9a08604
|
web: Added api client with common settings for all requests
|
2019-10-07 14:34:10 +03:00 |
|
|
ea71ac3f3c
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-10-04 09:22:56 +03:00 |
|
|
521abaada9
|
web: People: Refactoring:
+ Moved checkResponseError to utils.js;
+ Fixed actions after saving group;
+ Re-written fetchPeople action
|
2019-10-04 09:22:46 +03:00 |
|
Daniil Senkiv
|
2ed3ee4905
|
Web.Client/Core: added method of deleting self profile
|
2019-10-04 07:58:38 +03:00 |
|
|
86215bd06c
|
web: People: Fixed actions after saving group
|
2019-10-03 14:55:04 +03:00 |
|
|
5a362b47e7
|
web: People: Fixed view/edit self profile on Guest
|
2019-10-02 14:57:58 +03:00 |
|
|
af48c52ad0
|
web: People: Restored PlusIcon
|
2019-10-02 14:25:36 +03:00 |
|
|
7ec76d083c
|
web: People: Added local Error page translate resource path
|
2019-10-02 12:25:59 +03:00 |
|
Daniil Senkiv
|
188443f49f
|
Web.Client: confirmRoute: refactoring
|
2019-10-02 11:31:50 +03:00 |
|
|
534cd98d24
|
web: People: Hide PlusIcon
|
2019-10-01 14:28:20 +03:00 |
|
|
51566c29ea
|
web: Change storing token from cookie to localstorage
|
2019-10-01 12:37:06 +03:00 |
|
|
bfd930b84b
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-10-01 11:47:56 +03:00 |
|
NikolayRechkin
|
99a9e6d156
|
web: people: fixed the style of the menu
|
2019-10-01 11:46:22 +03:00 |
|
|
99ba2483c8
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-10-01 11:37:59 +03:00 |
|
|
f089f50372
|
web: People: Added translations for People Error
|
2019-10-01 11:37:51 +03:00 |
|
NikolayRechkin
|
acd456b8a0
|
web: people: fix headers
|
2019-10-01 10:07:39 +03:00 |
|
|
b3deacd821
|
web: People: Applied changes in AdvancedSelector
|
2019-09-30 15:54:41 +03:00 |
|
NikolayRechkin
|
82e0066fc7
|
web: people: fix
|
2019-09-30 15:40:28 +03:00 |
|
NikolayRechkin
|
4493418a12
|
web: people: small fix header
|
2019-09-30 15:37:06 +03:00 |
|
|
b8b0692f85
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-30 12:21:09 +03:00 |
|
|
3288fb3b84
|
web: Added translation of Layout for People/Web clients
|
2019-09-30 12:20:56 +03:00 |
|
NikolayRechkin
|
cc72feb99a
|
web: people: added translations
|
2019-09-30 11:30:39 +03:00 |
|
NikolayRechkin
|
4fe6fac93f
|
web: components: small fix avatar editor
|
2019-09-30 11:29:33 +03:00 |
|
NikolayRechkin
|
a6fc4580c5
|
web: people: changed translations to ProfileAction
|
2019-09-30 10:45:45 +03:00 |
|
|
26427e5de6
|
web: People: Styled SectionHeaderContent
|
2019-09-29 17:35:34 +03:00 |
|
|
576ec16dab
|
web: People: Fixed translation
|
2019-09-29 17:34:43 +03:00 |
|
|
402d56691b
|
web: People: Applied translations to Home
|
2019-09-29 16:36:35 +03:00 |
|
|
6fb0c4a9f5
|
web: People: Applied translations to Article
|
2019-09-29 16:09:54 +03:00 |
|
|
1e7d1610fc
|
web: People: Changed language state mapping
|
2019-09-29 15:29:19 +03:00 |
|
|
e0578eb7d4
|
web: People: Applied translations to GroupAction
|
2019-09-29 15:15:55 +03:00 |
|
|
6f760e47f0
|
web: People: Applied translations to ProfileAction
|
2019-09-29 15:04:52 +03:00 |
|
|
a2279296ee
|
web: People: Removed useless code
|
2019-09-29 14:49:50 +03:00 |
|
|
77cec30c75
|
web: People: Fixed displaying edit button label
|
2019-09-29 14:48:19 +03:00 |
|
|
63c730e7fd
|
web: People: Fixed showing socialContacts
|
2019-09-29 14:45:09 +03:00 |
|
|
cdf09b4272
|
web: People: Fixed translation.json
|
2019-09-29 14:40:03 +03:00 |
|
|
983270b8a6
|
web: People: Changed fakeLanguages to translations
|
2019-09-29 14:24:13 +03:00 |
|
|
d3b208b6a5
|
Web: People: Implemented opportunity to change culture in Profile
|
2019-09-29 13:50:18 +03:00 |
|
|
0f97fb0653
|
web: People: Added loading cultures and changing profile language
|
2019-09-29 12:09:57 +03:00 |
|
|
5e2823974e
|
DI: configuration
|
2019-09-27 18:12:13 +03:00 |
|
Ilya Oleshko
|
d29383b0a4
|
web: People: Fixed error if empty departments in view profile.
|
2019-09-27 17:26:04 +03:00 |
|
|
4f5b3af681
|
web: People: Changed setup filter EmployeeStatus
|
2019-09-27 17:06:14 +03:00 |
|
|
2d0ca402c8
|
web: People: Changed group link click (issue: styled Link router errors)
|
2019-09-27 17:01:44 +03:00 |
|
|
9583b5e1f7
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-27 15:45:22 +03:00 |
|
Ilya Oleshko
|
575c85437a
|
web: People: Added transition to user groups in the view profile.
|
2019-09-27 15:44:48 +03:00 |
|
|
35d19ddcf5
|
web: People: Fixed history go back
|
2019-09-27 15:38:27 +03:00 |
|
|
387ce4e9ad
|
DI: configuration
|
2019-09-27 14:51:09 +03:00 |
|
|
1b293c6112
|
web: People: Fixed set filter by url
|
2019-09-27 14:42:17 +03:00 |
|
NikolayRechkin
|
00d17e2c38
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-27 14:05:51 +03:00 |
|
NikolayRechkin
|
507a78c0e3
|
web: people: create an avatar for a new user
|
2019-09-27 14:05:35 +03:00 |
|
|
d8fb67f683
|
Merge branch 'master' into refactoring/di
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# web/ASC.Web.Api/Controllers/AuthenticationController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Core/Notify/StudioNotifyService.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
# web/ASC.Web.Core/Utility/CommonLinkUtility.cs
|
2019-09-27 13:45:37 +03:00 |
|
Ilya Oleshko
|
ac8c69821e
|
web: People: Fixed empty culture at profile viewer.
|
2019-09-27 12:36:31 +03:00 |
|
Ilya Oleshko
|
9512c0b9c8
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-27 12:20:32 +03:00 |
|
|
48b2726d78
|
Confirm: added uid to activation link
|
2019-09-27 12:20:10 +03:00 |
|
Ilya Oleshko
|
bae91ab561
|
web: People: Fixed email link errors and locale selector width at profile viewer.
|
2019-09-27 12:20:05 +03:00 |
|
NikolayRechkin
|
1d8e175089
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-09-27 11:52:26 +03:00 |
|
NikolayRechkin
|
9a2a659430
|
web: people: fixed create user
|
2019-09-27 11:52:17 +03:00 |
|
|
30f9612eec
|
web: People: Fixed paging by filter url
|
2019-09-27 10:06:47 +03:00 |
|
|
74c5873c5d
|
web: People: Changed DEFAULT_EMPLOYEE_STATUS to Active
|
2019-09-27 10:06:12 +03:00 |
|
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 |
|