Commit Graph

10562 Commits

Author SHA1 Message Date
7852dac3ca Files: fix saveediting 2021-02-26 17:07:08 +03:00
2215e0f329
Merge pull request #195 from ONLYOFFICE/feature/dataannotations
delete dataannotations
2021-02-25 21:35:50 +03:00
dccbe81002 DataAnnotations: fix 2021-02-25 21:18:27 +03:00
Diana
5c3f2975e8 fix NotMapped 2021-02-25 13:23:26 +03:00
Diana
f1091f409a fix dataannotations 2021-02-25 12:00:53 +03:00
38a00bdd7d Merge branch 'develop' into feature/dataannotations 2021-02-24 15:38:34 +03:00
d696f18801 Jenkinsfile: fix notify 2021-02-24 15:37:40 +03:00
a586f8fee6
Merge pull request #196 from ONLYOFFICE/feature/mobx
Feature/mobx
2021-02-23 16:26:16 +03:00
846af80668 Update react-script and yarn.lock files 2021-02-23 15:56:29 +03:00
5807e0c402 web: common: bump version 2021-02-23 12:50:20 +03:00
7c4c0bd1ce web: components: bump version 2021-02-23 12:49:56 +03:00
d270048827 Web: Removed commented code 2021-02-23 12:46:33 +03:00
f5d1b6fc2b Web: Common: Removed redux + fixed storybook start 2021-02-23 12:46:01 +03:00
ef067c6040 Web: Client: Moved translations to public folder 2021-02-23 12:10:31 +03:00
63584c3cc4 Web: Fixed displaying version 2021-02-23 12:06:59 +03:00
c32a2b64dc Web: Client: Fixed open third-party dialog 2021-02-23 12:01:29 +03:00
7fc22ca874 Web: Fixed cast to boolean 2021-02-23 12:00:44 +03:00
09a600b042 Web: Client: Added config 2021-02-23 11:59:24 +03:00
Diana
4ddd2cebec delete dataannotations 2021-02-20 22:02:12 +03:00
b9a8f7b178 Web: Common: fixed getting modules 2021-02-20 20:17:27 +03:00
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