|
|
1043cbc68b
|
web: Common: Removed old not used code
|
2019-11-22 15:40:51 +03:00 |
|
|
|
7976dfdb77
|
web: Components: Added export PublicRoute, PublicRoute
|
2019-11-22 14:52:04 +03:00 |
|
|
|
59d4674885
|
web: Common: Added PrivateRoute
|
2019-11-22 14:41:57 +03:00 |
|
|
|
035d729c9c
|
web: People: Replaced PrivateRoute to ASC.Web.Common realization
|
2019-11-21 17:34:17 +03:00 |
|
|
|
7cb2262837
|
Merge branch 'master' into feature/asc-web-common
# Conflicts:
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/store/people/actions.js
|
2019-11-20 14:29:52 +03:00 |
|
|
|
4d2db41258
|
Merge branch 'master' into feature/layout-scrolling
|
2019-11-20 11:41:10 +03:00 |
|
|
|
3080756461
|
web: People: Hide paging if total count less then pageCount
|
2019-11-20 11:37:17 +03:00 |
|
|
|
96a3a60c1c
|
web: People: Fixed mass re-render on group-buttons actions
|
2019-11-20 11:27:33 +03:00 |
|
|
|
df767e3849
|
web: People: Fixed setSelected value
|
2019-11-20 10:44:24 +03:00 |
|
|
|
83f7201bfa
|
Web: People: added help-button header content to people pages
|
2019-11-20 09:45:39 +03:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
