Commit Graph

6621 Commits

Author SHA1 Message Date
e4897160a9 fixed SendEmailActivationInstructions 2021-03-22 18:56:04 +03:00
fc7bd11088 Fix getshortenlink 2021-03-21 18:29:35 +03:00
335cc31939 Notify: fix 2021-03-21 17:51:49 +03:00
4d5ca86a74 Merge branch 'master' into develop
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/.env
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/helpers/i18n.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/api/modules/index.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/yarn.lock
2021-03-12 19:52:01 +03:00
e8e1a176ea Update yarn.lock files 2021-03-12 18:38:55 +03:00
94b6750a6b web: common: bump version 2021-03-12 18:28:14 +03:00
22c3cfffcd Web: Restored defaultPage 2021-03-12 18:27:52 +03:00
bc8943083f Web: Clinet: Added default params to .env 2021-03-12 18:16:51 +03:00
c2338d6636 Merge branch 'hotfix/v0.0.11' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.0.11 2021-03-12 18:00:33 +03:00
e2061cd427 CustomNamingPeople: fix 2021-03-12 18:01:11 +03:00
b1dfa97386 Web: Client: Added support of homepage 2021-03-12 17:53:02 +03:00
ae7b7484b1 Web: Common: Fixed API proxy issue 2021-03-12 17:35:51 +03:00
b90876c97d Bump version to v0.0.11 2021-03-12 17:20:24 +03:00
Ilya Oleshko
c618740db1 Merge branch 'master' into develop 2021-03-01 16:46:32 +03:00
Ilya Oleshko
0c1689bec5 Bump version to v0.0.10 2021-03-01 16:27:21 +03:00
Ilya Oleshko
66bb7567aa web: common: bump version 2021-03-01 16:25:52 +03:00
Ilya Oleshko
cb861508d3 Web: Common: Added getting api url from package.json, fixed "hardcode" from api client. 2021-03-01 16:25:41 +03:00
693a633dee fix auth via password 2021-02-26 22:32:03 +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
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
a0ce9e0dc5
Merge branch 'develop' into feature/not-implemented-page 2021-02-20 11:35:52 +03:00
87b1108147 Web: Turned debug in i18n 2021-02-19 21:59:33 +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
e97ba3a8b3 Web: People: Simplified translation 2021-02-19 19:27:13 +03:00
bc30b1311e Auth by thirdparty 2021-02-19 19:16:08 +03:00
Ilya Oleshko
1c01c3ce3a Web: Client: Fixed style for learn more links 2021-02-19 13:26:09 +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
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
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
f36d05ccf4 Web: Fixed work process 2021-02-18 15:52:13 +03:00