|
|
64c65a4a41
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-18 12:24:28 +03:00 |
|
|
|
561c82bccf
|
Web: Files: fixed files empty screen
|
2021-02-18 12:24:06 +03:00 |
|
Artem Tarasov
|
4f949a4e39
|
Web: LoginMobile: Layout fix
|
2021-02-18 11:54:04 +03:00 |
|
Vladislav Makhov
|
f452ae2eae
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-18 11:52:13 +03:00 |
|
Vladislav Makhov
|
855fd46560
|
web: people: return to set selected mechanism in group button menu
|
2021-02-18 11:52:03 +03:00 |
|
|
|
6e29fce81b
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-18 11:23:21 +03:00 |
|
|
|
d81b0fd770
|
Web: Files: fixed treeFolders
|
2021-02-18 11:23:03 +03:00 |
|
Artem Tarasov
|
ad790e56db
|
Web: LoginMobile: added title in Registration component
|
2021-02-18 01:19:53 +03:00 |
|
Artem Tarasov
|
0d28c30636
|
Web: LoginMobile: replace Header
|
2021-02-18 00:19:17 +03:00 |
|
Artem Tarasov
|
302e9abe8f
|
Web: LoginMobile: refactorung, added Router
|
2021-02-18 00:01:49 +03:00 |
|
Vladislav Makhov
|
f5cf3683f4
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-17 19:22:12 +03:00 |
|
Vladislav Makhov
|
da0d039be7
|
web: people: remove console.log
|
2021-02-17 19:22:04 +03:00 |
|
|
|
fbde2ee6f8
|
Web: Files: move from redux to mobx
|
2021-02-17 18:35:04 +03:00 |
|
|
|
3b659a31f5
|
Web: Files: fixed files creation
|
2021-02-17 18:07:09 +03:00 |
|
|
|
ca166e3c66
|
Web: People: Move from redux to mobx completely
|
2021-02-17 17:53:18 +03:00 |
|
|
|
ac51e3f7a3
|
Nginx: fix routing
|
2021-02-17 16:41:29 +03:00 |
|
Artem Tarasov
|
5e8293023b
|
Web: LoginMobile: refactoring
|
2021-02-17 15:15:59 +03:00 |
|
Vladislav Makhov
|
4029233d32
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-17 12:46:32 +03:00 |
|
Vladislav Makhov
|
98ab4973ae
|
web: people: hide unused code
|
2021-02-17 12:46:21 +03:00 |
|
Vladislav Makhov
|
1042506645
|
web: people: hide unused code
|
2021-02-17 12:30:55 +03:00 |
|
Vladislav Makhov
|
8d4994cb40
|
web: people: add getters
|
2021-02-17 12:30:36 +03:00 |
|
|
|
1ddcca5ed3
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-17 11:20:18 +03:00 |
|
|
|
de57a61c59
|
Web: Files: refactoring
|
2021-02-17 11:20:08 +03:00 |
|
|
|
7da0b78e48
|
CustomingNamingPeople: fix
|
2021-02-16 21:45:17 +03:00 |
|
|
|
38b62a9a95
|
FederatedLogin: added EmbeddedResource callback.htm
|
2021-02-16 19:48:51 +03:00 |
|
Vladislav Makhov
|
4d0fbe8903
|
web: people: add missing observable dependencies in storages
|
2021-02-16 18:11:18 +03:00 |
|
Vladislav Makhov
|
15c80ae139
|
web: people: init refactoring
|
2021-02-16 17:42:33 +03:00 |
|
Vladislav Makhov
|
cb9dbff58f
|
web: people: fix callback param
|
2021-02-16 17:13:26 +03:00 |
|
Vladislav Makhov
|
a683c53735
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-16 16:52:02 +03:00 |
|
|
|
7e86c680e3
|
Web: Files: added files uploader
|
2021-02-16 16:48:04 +03:00 |
|
Ilya Oleshko
|
d818d2272c
|
Web: Client: Added new coming soon module page, fixed route, added translations
|
2021-02-16 16:11:49 +03:00 |
|
Ilya Oleshko
|
81f2458f94
|
Web: Common: Pages: Restored default coming soon error page
|
2021-02-16 16:10:46 +03:00 |
|
Artem Tarasov
|
5d6b66e295
|
Web: LoginMobile: added title for Login page
|
2021-02-16 13:45:28 +03:00 |
|
Artem Tarasov
|
acd417fc9b
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-02-16 13:31:41 +03:00 |
|
Artem Tarasov
|
0b521f6b48
|
Web: LoginMobile: added Header to App
|
2021-02-16 13:31:24 +03:00 |
|
Artem Tarasov
|
0298249ab4
|
Web: LoginMobile: added header
|
2021-02-16 13:30:35 +03:00 |
|
|
|
d7ef3f631b
|
ResxManager: fix
|
2021-02-16 13:24:09 +03:00 |
|
Ilya Oleshko
|
d204c9b6de
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-16 13:22:34 +03:00 |
|
Ilya Oleshko
|
12b3a0a43a
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2021-02-16 13:22:07 +03:00 |
|
Artem Tarasov
|
42cb830a84
|
Web: LoginMobile: added custim.scss, changed webpack config (alias)
|
2021-02-16 12:48:35 +03:00 |
|
|
|
52c9e4daac
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
|
2021-02-16 12:16:13 +03:00 |
|
Vladislav Makhov
|
1d7f8c2e97
|
web: people: fix editing form data injection
|
2021-02-16 12:13:19 +03:00 |
|
|
|
a1fc390bc2
|
Web: Files: created formatsStore
|
2021-02-16 12:01:51 +03:00 |
|
Artem Tarasov
|
b6882bb381
|
Web: LoginMobile: added module LoginMobile
|
2021-02-16 11:00:24 +03:00 |
|
Vladislav Makhov
|
c5ad94e358
|
resolve merge conflicts
|
2021-02-16 10:27:53 +03:00 |
|
Vladislav Makhov
|
09c580e268
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
# Conflicts:
# products/ASC.People/Client/src/components/pages/GroupAction/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
|
2021-02-16 10:20:43 +03:00 |
|
Vladislav Makhov
|
e513ad35c9
|
web: people: hide unused code
|
2021-02-16 10:01:01 +03:00 |
|
Vladislav Makhov
|
86faaad05f
|
web: people: add is People admin getter
|
2021-02-16 10:00:35 +03:00 |
|
Vladislav Makhov
|
702351dbdd
|
web: people: add several func's
|
2021-02-16 09:59:56 +03:00 |
|
Vladislav Makhov
|
9db00e24ae
|
web: people: group button menu fix
|
2021-02-16 09:53:52 +03:00 |
|
