Commit Graph

9931 Commits

Author SHA1 Message Date
Vladislav Makhov
70e406d77e web: client: fix open location of added provider 2021-01-12 12:07:39 +03:00
5dbd0653f5 Files: test. fix order 2021-01-12 11:35:10 +03:00
Ilya Oleshko
80bf09b5d8 Web: Files : Article: Returned expanded icon for common folder 2021-01-12 11:33:02 +03:00
42e4fdcb37 Jenkins: remove temp 2021-01-12 10:32:55 +03:00
7e80f26bc9 MessagesRepository: fix 2021-01-12 10:27:48 +03:00
b149a5f3a5 Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations 2021-01-12 09:49:04 +03:00
Artem Tarasov
fddae00ffd Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-12 09:49:54 +03:00
Artem Tarasov
28c93bc32d Web: Files: Settings: removed unknown symbol in the window for adding a new account. 2021-01-12 09:49:24 +03:00
4aae74ed48 Web: Files: fixed files operations 2021-01-12 09:48:55 +03:00
Vladislav Makhov
7ad7d4556e web: common: fix links in tpi settings 2021-01-12 09:27:04 +03:00
Vladislav Makhov
745bd8be2c web: common: bump version 2021-01-12 09:25:42 +03:00
84a6f19e15 Files: fix test 2021-01-11 22:03:11 +03:00
ac3f877a7c Files: fix test 2021-01-11 21:22:53 +03:00
9375dfd540 Files: fix test 2021-01-11 21:16:40 +03:00
441cf7e7cd Files: Test. Fix path 2021-01-11 20:50:17 +03:00
5bf44cbcff Test: fix 2021-01-11 20:19:43 +03:00
8529593c42 Jenkinsfile: run test 2021-01-11 19:51:45 +03:00
f66060fff1 Web: Files: Added new events handlers for DocsAPI SDK 2021-01-11 14:34:45 +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
Ilya Oleshko
48b1d7b73e Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2021-01-11 11:38:17 +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
Ilya Oleshko
8ed73077da Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2020-12-30 14:57:22 +03:00
3bdd023006 Merge branch 'master' into develop 2020-12-30 14:54:44 +03:00
Ilya Oleshko
73c7a529df Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2020-12-30 14:45:28 +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