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