Commit Graph

9680 Commits

Author SHA1 Message Date
Sergey Kirichenko
4d9a7d597a
Merge pull request #165 from ONLYOFFICE/feature/docker-appserver
Cosmetic modify Dockerfile-app
2020-12-30 11:45:41 +03:00
Artem Tarasov
f419dadb6f Web: Common: Layout: fix resize event listener for safari versions less then 14 2020-12-30 11:35:24 +03:00
Sergey Kirichenko
f11758af1c Cosmetic modify Docker-app 2020-12-30 10:51:40 +03:00
bf5781c2c0 fix startup 2020-12-29 19:45:18 +03:00
74aa0abca8 Bump version to v0.0.6 2020-12-29 19:43:37 +03:00
00e0eb44dd
Merge pull request #161 from ONLYOFFICE/feature/change-owner-panel
Feature/change owner panel
2020-12-29 18:49:15 +03:00
d54a5a0656 Added reqDesktop on DocEditor page 2020-12-29 18:43:12 +03:00
fa7c2bf9f1 Merge branch 'develop' into feature/asc-files-tests 2020-12-29 18:37:28 +03:00
7b4dc42620 Fix displaying header pre-loader on Desktop 2020-12-29 17:19:02 +03:00
f2ccfb8d31 Merge branch 'develop' into feature/change-owner-panel 2020-12-29 17:16:37 +03:00
Steklov Sergei
faa8c66d09
Add source branch variable to docker hub build environment (#163) 2020-12-29 17:08:38 +03:00
058d905286 Merge branch 'develop' into feature/change-owner-panel 2020-12-29 16:27:43 +03:00
32d9331c7d Web: Files: fixed isCanShare selector 2020-12-29 16:22:24 +03:00
Vladislav Makhov
e6cf51575a Merge branch 'develop' into feature/desktop-view 2020-12-29 16:08:08 +03:00
1e69a3a416 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2020-12-29 16:05:02 +03:00
43bd3f6541 Files: openedit. EncryptionKeys 2020-12-29 16:04:50 +03:00
f5d9aca8c7 Merge branch 'develop' into feature/change-owner-panel 2020-12-29 15:41:56 +03:00
eeb0ab8779 Web: Files: fixed access selectors 2020-12-29 15:37:38 +03:00
Ilya Oleshko
6b1a853ac4
Merge pull request #162 from ONLYOFFICE/feature/upgrade-dependencies
Feature/upgrade dependencies
2020-12-29 14:35:06 +03:00
39a0cb99de Update yarn.lock files 2020-12-29 14:03:05 +03:00
e70e845c5f web: common: bump version 2020-12-29 13:52:50 +03:00
675599c57d web: components: bump version 2020-12-29 13:52:38 +03:00
23a5935e5d Merge branch 'develop' into feature/upgrade-dependencies 2020-12-29 13:40:46 +03:00
Vladislav Makhov
a4c4637453 Fix notification 2020-12-29 13:20:25 +03:00
e550726db8 Web: Files: added change owner to context menu 2020-12-29 09:42:41 +03:00
9d802dd929 Web: Files: update change owner panel styles 2020-12-29 09:41:29 +03:00
5a40792e9d Web: Files: added change owner panel actions, added import 2020-12-29 09:40:22 +03:00
6e58a4caa6 Web: Files: updated getFilesContextOptions selector 2020-12-29 09:36:40 +03:00
ceaf1c230a Web: Files: added ChangeOwnerPanel 2020-12-29 09:34:51 +03:00
Vladislav Makhov
7dfdae8a72 Merge branch 'develop' into feature/desktop-view 2020-12-29 09:33:55 +03:00
12881aa2c6
Use master as default branch for build (#160)
* Use master as default branch for build

* Update build

* Update push
2020-12-28 20:13:33 +03:00
f18d535cb1 Merge branch 'develop' into feature/upgrade-dependencies 2020-12-28 18:30:50 +03:00
a9dc75376d
Merge pull request #159 from ONLYOFFICE/feature/11.0.2
moved from 2e37dcd0
2020-12-28 18:25:26 +03:00
Vladislav Makhov
d840506715 Fix desktop styles 2020-12-28 16:49:01 +03:00
0ae7f84de6 SocketIO: fix 2020-12-28 16:47:59 +03:00
e6943a4544 Merge branch 'develop' into feature/11.0.2 2020-12-28 16:28:26 +03:00
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
Vladislav Makhov
737605b01e Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/locales/en/translation.json
#	products/ASC.Files/Client/src/components/panels/SharingPanel/locales/ru/translation.json
2020-12-28 11:34:26 +03:00
a21fff2ab1 Fix warning " > react-tooltip@3.11.6" has incorrect peer dependency "react@>=^16.0.0". 2020-12-28 11:04:34 +03:00
Vladislav Makhov
2ff0b2471d Add isEditor param to regDesktop 2020-12-28 10:40:50 +03:00
Vladislav Makhov
17fd85b5c7 Update props validation 2020-12-28 10:39:30 +03:00
Vladislav Makhov
4c5131211c Fix styles 2020-12-28 10:37:53 +03:00
Ilya Oleshko
6bfe934057
Merge pull request #158 from ONLYOFFICE/bugfix/sharing-panel-refactoring
Bugfix/sharing panel refactoring
2020-12-28 09:38:29 +03:00
16b312b7fb Merge branch 'develop' into bugfix/sharing-panel-refactoring 2020-12-28 09:28:38 +03:00
2fdcbee8ef Files: pass CallbackUrl. Fix trackedit. 2020-12-25 23:25:37 +03:00
472cb4bb0b Fix warning Resolution field "js-yaml@3.13.1" is incompatible with requested version "js-yaml@~3.7.0" 2020-12-25 18:10:54 +03:00
2be04b3bc0 Update package.json and yarn.lock files 2020-12-25 17:48:11 +03:00
04e387f8d0 web: common: bump version 2020-12-25 17:03:03 +03:00
d31d0c7d03 Web: Common: fixed PeopleSelector employee status PropType 2020-12-25 17:01:42 +03:00
d09bc13b93 Web: Files: fixed share translations 2020-12-25 17:00:09 +03:00