IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,571 Commits 38 Branches 22 Tags 359 MiB
c618740db1
Commit Graph

10571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ilya Oleshko
c618740db1 Merge branch 'master' into develop 2021-03-01 16:46:32 +03:00
Alexey Safronov
31bdb22955
Merge pull request #197 from ONLYOFFICE/hotfix/web-api-config 
Hotfix/web api config
 2021-03-01 16:44:02 +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
pavelbannov
f734a91d82 Files: fix SaveEditing 2021-03-01 14:38:55 +03:00
pavelbannov
2b3d534628 ResManager: fix 2021-03-01 11:49:42 +03:00
pavelbannov
b223c5006b ResourceManager: fix 2021-02-28 15:40:50 +03:00
pavelbannov
693a633dee fix auth via password 2021-02-26 22:32:03 +03:00
pavelbannov
7852dac3ca Files: fix saveediting 2021-02-26 17:07:08 +03:00
Pavel Bannov
2215e0f329
Merge pull request #195 from ONLYOFFICE/feature/dataannotations 
delete dataannotations
 2021-02-25 21:35:50 +03:00
pavelbannov
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
pavelbannov
38a00bdd7d Merge branch 'develop' into feature/dataannotations 2021-02-24 15:38:34 +03:00
pavelbannov
d696f18801 Jenkinsfile: fix notify 2021-02-24 15:37:40 +03:00
Alexey Safronov
a586f8fee6
Merge pull request #196 from ONLYOFFICE/feature/mobx 
Feature/mobx
 2021-02-23 16:26:16 +03:00
AlexeySafronov
846af80668 Update react-script and yarn.lock files 2021-02-23 15:56:29 +03:00
AlexeySafronov
5807e0c402 web: common: bump version 2021-02-23 12:50:20 +03:00
AlexeySafronov
7c4c0bd1ce web: components: bump version 2021-02-23 12:49:56 +03:00
AlexeySafronov
d270048827 Web: Removed commented code 2021-02-23 12:46:33 +03:00
AlexeySafronov
f5d1b6fc2b Web: Common: Removed redux + fixed storybook start 2021-02-23 12:46:01 +03:00
AlexeySafronov
ef067c6040 Web: Client: Moved translations to public folder 2021-02-23 12:10:31 +03:00
AlexeySafronov
63584c3cc4 Web: Fixed displaying version 2021-02-23 12:06:59 +03:00
AlexeySafronov
c32a2b64dc Web: Client: Fixed open third-party dialog 2021-02-23 12:01:29 +03:00
AlexeySafronov
7fc22ca874 Web: Fixed cast to boolean 2021-02-23 12:00:44 +03:00
AlexeySafronov
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
gopienkonikita
b9a8f7b178 Web: Common: fixed getting modules 2021-02-20 20:17:27 +03:00
AlexeySafronov
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
Alexey Safronov
dd362f3725
Merge pull request #193 from ONLYOFFICE/feature/not-implemented-page 
Feature/not implemented page
 2021-02-20 11:54:01 +03:00
Alexey Safronov
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
AlexeySafronov
87b1108147 Web: Turned debug in i18n 2021-02-19 21:59:33 +03:00
AlexeySafronov
d8bd3f6e7c Web: Files: Simplified translation 2021-02-19 21:57:01 +03:00
AlexeySafronov
19c7104d3d Web: Removed useless dev packages + fixed warnings of building 2021-02-19 20:51:44 +03:00
AlexeySafronov
85a500eac6 Web: Client: Simplified translation 2021-02-19 20:26:41 +03:00
AlexeySafronov
d2e46c396f Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx 2021-02-19 19:27:23 +03:00
AlexeySafronov
e97ba3a8b3 Web: People: Simplified translation 2021-02-19 19:27:13 +03:00
pavelbannov
3274bd0f21 ResManager: fix 2021-02-19 19:17:06 +03:00
pavelbannov
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
pavelbannov
7ce0aa896d Jenkins: fixed tests 2021-02-19 15:07:44 +03:00
pavelbannov
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
gopienkonikita
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