Commit Graph

9760 Commits

Author SHA1 Message Date
4aae74ed48 Web: Files: fixed files operations 2021-01-12 09:48:55 +03:00
9767111de3 Web: Files: fixed thirdparty route 2021-01-11 13:34:29 +03:00
ebaf9ccecd Web: Files: fix merge 2021-01-11 13:24:07 +03:00
5489d74b27 Web: Files: fixed getFilesList selector 2021-01-11 13:03:58 +03:00
328afa8111 Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations
# Conflicts:
#	products/ASC.Files/Client/src/store/files/selectors.js
2021-01-11 12:41:28 +03:00
c7c9225923 Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.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/locales/en/translation.json
#	products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
#	products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2021-01-11 12:37:31 +03:00
60022bbc06 Update yarn.lock files 2020-12-30 21:33:07 +03:00
1ca1fb5bac
Merge pull request #167 from ONLYOFFICE/feature/desktop-view
Feature/desktop view
2020-12-30 20:20:21 +03:00
Vladislav Makhov
1f8769cd6b Update yarn.lock 2020-12-30 19:51:17 +03:00
Vladislav Makhov
d87f9d0864 web: common: bump version 2020-12-30 19:45:24 +03:00
Vladislav Makhov
b2c6669e42 web: components: bump version 2020-12-30 19:45:01 +03:00
f40b347289
Merge branch 'develop' into feature/desktop-view 2020-12-30 19:42:59 +03:00
9e5a39c78e Remove useless code 2020-12-30 19:29:47 +03:00
8b42c104a8 Fix group button menu on tablet at desktop 2020-12-30 19:29:18 +03:00
4e938572b8 Fix displaying privacy shield icon 2020-12-30 19:06:26 +03:00
fc55550521
Merge pull request #166 from ONLYOFFICE/feature/asc-files-tests
Feature/asc files tests
2020-12-30 18:03:11 +03:00
53c422c2b2 revert 2020-12-30 18:03:21 +03:00
95f0d03e11 Fix open new document on desktop 2020-12-30 17:56:38 +03:00
Vladislav Makhov
d47f53c775 Fix share button in private room 2020-12-30 17:34:23 +03:00
Vladislav Makhov
97837afaa6 Fix delete button in private room 2020-12-30 17:33:19 +03:00
Vladislav Makhov
44ba6f350f Merge branch 'develop' into feature/desktop-view 2020-12-30 16:20:47 +03:00
Vladislav Makhov
8cec798da7 Remove unused code 2020-12-30 16:17:09 +03:00
3bdd023006 Merge branch 'master' into develop 2020-12-30 14:54:44 +03:00
7db08853e3
Merge pull request #164 from ONLYOFFICE/release/v0.0.6
Release/v0.0.6
2020-12-30 14:40:21 +03:00
Vladislav Makhov
5bc3704ca5 Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
#	products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-12-30 13:11:54 +03:00
Ilya Oleshko
365596cb8c Web: Files : Fixed styles of new-files-panel for mobile 2020-12-30 12:37:48 +03:00
4dfd88daca Files: EncryptionKeysConfig->CryptoEngineId 2020-12-30 12:24:49 +03:00
Artem Tarasov
3a9f3b6e02 Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6 2020-12-30 12:16:26 +03:00
Artem Tarasov
b2317b3a06 Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6 2020-12-30 12:16:05 +03:00
Artem Tarasov
3d7eada1a6 Web: Cluient/Files/People: fix for safari - disabled security zone (white stripes around the edges of the screen in landscape orientation 2020-12-30 12:15:50 +03:00
Ilya Oleshko
5dea8f2409 Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6 2020-12-30 12:13:42 +03:00
Ilya Oleshko
065ae43f0a Web: People : Profile : Fixed autofocus on mobile 2020-12-30 12:13:33 +03:00
Vladislav Makhov
e2b7fecba5 Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6 2020-12-30 12:09:55 +03:00
Vladislav Makhov
27783eaee4 web: files: fix paging 2020-12-30 12:09:28 +03:00
8c8acc089a Web: Files: fixed dropdown in DownloadDialog 2020-12-30 12:07:55 +03:00
0fe23ef361 Merge branch 'develop' into feature/asc-files-tests 2020-12-30 11:48:26 +03:00
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