Commit Graph

3265 Commits

Author SHA1 Message Date
Ilya Oleshko
0275ef2cf0 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-11-19 15:21:24 +03:00
Ilya Oleshko
e5256f8ca9 web: Components: Fixed Avatar component readme 2019-11-19 15:21:11 +03:00
e581e976f8 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-11-19 14:53:26 +03:00
08e9719114 Web: Client: added EmptyScreenContainer with translations to accessRight admins sub-page 2019-11-19 14:53:13 +03:00
325a42f66b web: components: row: added custom shouldComponentUpdate function 2019-11-19 14:33:33 +03:00
ef0d51ab47 web: People: Moved some common constants to ASC.Web.Common 2019-11-19 14:10:56 +03:00
b71faa8cb1 web: components: row-container: fix context-menu position 2019-11-19 13:49:46 +03:00
Ilya Oleshko
c83088b0de web: components: bump version 2019-11-19 13:35:50 +03:00
Ilya Oleshko
9bfa54ba66 web: Components: Fixed opening outside borders of screen for DropDown component 2019-11-19 13:35:42 +03:00
74530bfa76 Merge branch 'master' into feature/asc-web-common
# Conflicts:
#	products/ASC.People/Client/src/App.js
#	web/ASC.Web.Client/src/store/settings/actions.js
#	web/ASC.Web.Client/src/store/settings/reducer.js
2019-11-19 13:34:36 +03:00
Ilya Oleshko
314d07b534 web: Components: Fixed DropDown story 2019-11-19 13:34:28 +03:00
2a9e3d1870 web: People: Replaced services folder to ASC.Web.Common realization 2019-11-19 12:40:33 +03:00
629d426a55 Web: Client: refactoring accessRight sub-pages code 2019-11-19 09:25:48 +03:00
afc2ef8ffd Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-11-18 16:13:05 +03:00
c8c037d48b Web: Client: added changeOwner page with translations 2019-11-18 16:12:59 +03:00
Ilya Oleshko
78b2962830 web: components: bump version 2019-11-18 14:29:55 +03:00
Ilya Oleshko
397b3c283b web: Components: Fixed ignoring height auto on IOS devices in Icons component 2019-11-18 14:29:38 +03:00
18b0cdab2d web: People: Moved api methods: resendUserInvites and getShortenedLink into ASC.Web.Common 2019-11-18 13:52:37 +03:00
3685d7d59b Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-11-18 13:15:24 +03:00
da027e13af Web: Client: added pageLoader to accessRights sub-pages, added advanced selector to owner page added new translations 2019-11-18 13:15:17 +03:00
a6506dccb7 Web: Components: removed selection to tabs container 2019-11-18 12:40:21 +03:00
Ilya Oleshko
502060e4b2 web: People: Fixed rendering of data preview before import. 2019-11-18 11:57:54 +03:00
85d6847e29 web: Client: Fixed warnings 2019-11-18 10:15:19 +03:00
b38b9b2a2a web: Client: Replaced services folder to ASC.Web.Common realization 2019-11-18 10:14:44 +03:00
Ilya Oleshko
fda6450756 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-11-18 09:40:46 +03:00
f1a8774136 Merge branch 'master' into feature/asc-web-common 2019-11-18 09:27:17 +03:00
203c2e1e3f added Logs into .gitignore 2019-11-18 09:26:34 +03:00
162225a118 fixed config 2019-11-15 18:06:02 +03:00
23e3d28857 web: Replaced history to asc-web-common variant 2019-11-15 16:44:54 +03:00
Ilya Oleshko
98ed6e94d3 Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-11-15 16:33:41 +03:00
a75d6e7ecc web: Removed auth folder from store (after change to asc-web-common variant) 2019-11-15 16:29:49 +03:00
cac19cc75e Merge remote-tracking branch 'remotes/origin/master' into feature/layout-scrolling 2019-11-15 15:36:21 +03:00
49d5000cd2 Merge branch 'master' into feature/asc-web-common 2019-11-15 15:29:57 +03:00
59221eaeea web: components: row-container: added useReactWindow prop to README.md 2019-11-15 15:23:05 +03:00
6797194080 Web: Client: deleted shouldComponentUpdate from accessRight admins page 2019-11-15 14:16:31 +03:00
4273d98bbf Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-11-15 14:02:16 +03:00
06e9c901b3 Web: Client: fixed accessRights rerender on owner and admins pages 2019-11-15 14:02:09 +03:00
Ivan Habarov
9a7d50b507 Merge branch 'feature/social-button' 2019-11-15 13:52:02 +03:00
Ivan Habarov
5ce6b015ca Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-11-15 13:51:40 +03:00
Ivan Habarov
f2e8142021 Web: Components: updated README.md 2019-11-15 13:51:07 +03:00
e09008418c Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-11-15 10:45:43 +00:00
740942d938 docker: rename repo 2019-11-15 10:45:27 +00:00
Ivan Habarov
2e1e8fa0b0 Merge branch 'feature/social-button' 2019-11-15 13:24:35 +03:00
Ivan Habarov
379ce96698 Added SocialButton for sign up with a social network 2019-11-15 13:22:03 +03:00
e579b124d9 fixed scope 2019-11-15 13:11:40 +03:00
2d47d639dd web: People: Replaced auth store to ASC.Web.Common realization 2019-11-15 12:38:31 +03:00
Ivan Habarov
960d03b32c Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-11-15 12:32:09 +03:00
Ivan Habarov
946d2ab85f web: components: bump version 2019-11-15 12:30:26 +03:00
711feca435 fixed scope 2019-11-15 12:28:20 +03:00
2aa5cbbc72 web: components: row replaced by class component 2019-11-15 12:18:35 +03:00