|
|
6c80ebdff0
|
Merge branch 'develop' into feature/mobx
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/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/store/group/actions.js
# products/ASC.People/Client/src/store/people/actions.js
# products/ASC.People/Client/src/store/people/selectors.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Common/src/components/Layout/index.js
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header-nav.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header-unauth.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/nav-item.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/store/auth/actions.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/store/auth/selectors.js
# web/ASC.Web.Components/src/components/loader/types/rombs.js
|
2021-02-20 17:31:58 +03:00 |
|
|
|
dd362f3725
|
Merge pull request #193 from ONLYOFFICE/feature/not-implemented-page
Feature/not implemented page
|
2021-02-20 11:54:01 +03:00 |
|
|
|
a0ce9e0dc5
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-20 11:35:52 +03:00 |
|
Vladislav Makhov
|
697c6fc8b8
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-20 10:46:33 +03:00 |
|
|
|
87b1108147
|
Web: Turned debug in i18n
|
2021-02-19 21:59:33 +03:00 |
|
|
|
d8bd3f6e7c
|
Web: Files: Simplified translation
|
2021-02-19 21:57:01 +03:00 |
|
|
|
19c7104d3d
|
Web: Removed useless dev packages + fixed warnings of building
|
2021-02-19 20:51:44 +03:00 |
|
|
|
85a500eac6
|
Web: Client: Simplified translation
|
2021-02-19 20:26:41 +03:00 |
|
|
|
d2e46c396f
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-19 19:27:23 +03:00 |
|
|
|
e97ba3a8b3
|
Web: People: Simplified translation
|
2021-02-19 19:27:13 +03:00 |
|
|
|
3274bd0f21
|
ResManager: fix
|
2021-02-19 19:17:06 +03:00 |
|
|
|
bc30b1311e
|
Auth by thirdparty
|
2021-02-19 19:16:08 +03:00 |
|
Ilya Oleshko
|
7717784b46
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-19 16:23:23 +03:00 |
|
Ilya Oleshko
|
def9397e9e
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2021-02-19 16:23:05 +03:00 |
|
Vladislav Makhov
|
a7208bf244
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-19 16:08:39 +03:00 |
|
Vladislav Makhov
|
0b1f8cb22d
|
web: people: change prop to primitive value
|
2021-02-19 16:05:20 +03:00 |
|
|
|
7ce0aa896d
|
Jenkins: fixed tests
|
2021-02-19 15:07:44 +03:00 |
|
|
|
7e32c26241
|
Files: fixed tests
|
2021-02-19 14:52:29 +03:00 |
|
Ilya Oleshko
|
1c01c3ce3a
|
Web: Client: Fixed style for learn more links
|
2021-02-19 13:26:09 +03:00 |
|
|
|
3f35977864
|
Web: Files: fixed Header rerender
|
2021-02-19 13:22:38 +03:00 |
|
Ilya Oleshko
|
fb25c6adf6
|
web: common: bump version
|
2021-02-19 13:22:06 +03:00 |
|
Ilya Oleshko
|
d8d850b089
|
Web: Client: Open app link allowed only for IOS devices, added learn more links
|
2021-02-19 13:21:33 +03:00 |
|
Ilya Oleshko
|
e49a502e9a
|
Web: Common: Added originUrl and helpUrl for modules, added description for dummy modules
|
2021-02-19 13:20:17 +03:00 |
|
|
|
2cc2685a6a
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-19 12:29:29 +03:00 |
|
|
|
faae49a0e1
|
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
|
2021-02-19 12:21:19 +03:00 |
|
|
|
e2cc45d1d1
|
Web: Files: fixed Home component rerender
|
2021-02-19 12:21:09 +03:00 |
|
|
|
24d0b0e672
|
Thridparty: fixed RemoveProvider method
|
2021-02-19 12:11:04 +03:00 |
|
Ilya Oleshko
|
6325ea33f7
|
web: common: bump version
|
2021-02-19 11:17:48 +03:00 |
|
Ilya Oleshko
|
38ef5a69bd
|
Web: Common: Changed position of settings element inside NavMenu
|
2021-02-19 11:17:37 +03:00 |
|
Ilya Oleshko
|
ebc6d5942e
|
Web: Client: Changed main container for ComingSoonPage at desktop version
|
2021-02-19 10:53:04 +03:00 |
|
Ilya Oleshko
|
fcf70b711a
|
web: common: bump version
|
2021-02-18 16:38:14 +03:00 |
|
Ilya Oleshko
|
9e95383d63
|
Web: Common: Fixed of modules order. Added new style for NavItem separator.
|
2021-02-18 16:38:07 +03:00 |
|
Ilya Oleshko
|
b53557cedc
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-18 15:56:39 +03:00 |
|
Ilya Oleshko
|
24e912f3bc
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2021-02-18 15:56:17 +03:00 |
|
Ilya Oleshko
|
1e10146d3c
|
web: common: bump version
|
2021-02-18 15:55:34 +03:00 |
|
Ilya Oleshko
|
cb72f2241b
|
Web: Added product version badge
|
2021-02-18 15:55:26 +03:00 |
|
Ilya Oleshko
|
07077ee655
|
Web: Common: Removed unused property
|
2021-02-18 15:53:42 +03:00 |
|
|
|
2e7e60e0c0
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-18 15:52:21 +03:00 |
|
|
|
f36d05ccf4
|
Web: Fixed work process
|
2021-02-18 15:52:13 +03:00 |
|
Vladislav Makhov
|
753d1472b7
|
web: people: hide unused props
|
2021-02-18 15:15:14 +03:00 |
|
Vladislav Makhov
|
474fe57466
|
web: people: remove console.log
|
2021-02-18 13:24:34 +03:00 |
|
|
|
47d8405a01
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-18 12:55:46 +03:00 |
|
|
|
a59ffc0a81
|
Web: Enabled wdy in People and Files
|
2021-02-18 12:55:37 +03:00 |
|
|
|
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 |
|
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 |
|
Vladislav Makhov
|
f5cf3683f4
|
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
|
2021-02-17 19:22:12 +03:00 |
|
