Commit Graph

9691 Commits

Author SHA1 Message Date
ef686d78ac
Merge pull request #168 from ONLYOFFICE/features/jenkins-test
Jenkinsfile: run test
2021-01-13 13:31:46 +03:00
ae69a9559e Files: removed temp 2021-01-13 12:41:29 +03:00
60562d69a3 Files: test fix 2021-01-13 10:21:29 +03:00
b7d3cd8650 Files: test 2021-01-12 22:42:17 +03:00
88eac5b10a Files: test 2021-01-12 21:51:39 +03:00
a65aa18c17 Files: temp fix 2021-01-12 21:35:56 +03:00
2bbf510768 Files: test. Fix cache 2021-01-12 21:11:01 +03:00
f6ca373137 MemoryCache -> IMemoryCache 2021-01-12 20:51:14 +03:00
9f8b36da5c Files: tests. log 2021-01-12 19:00:22 +03:00
19c9001082 Files: fix test 2021-01-12 18:32:05 +03:00
122048dd49 Files: temp fix 2021-01-12 18:27:56 +03:00
5289f92935 Files: temp fix 2021-01-12 18:01:38 +03:00
e9bb7cf4b0
Merge pull request #170 from ONLYOFFICE/bugfix/recycle-bin-style-fix
web: client: fix recycle bin node style
2021-01-12 17:51:19 +03:00
f21d81fe57 Files: fix long operations 2021-01-12 17:23:56 +03:00
Vladislav Makhov
7dc14d3688 web: client: fix recycle bin node style 2021-01-12 17:22:28 +03:00
d118a9d5c8 Files: fix tests 2021-01-12 16:46:55 +03:00
13cf5e5ad0 Files: tests. long operations 2021-01-12 16:00:05 +03:00
c00e37d127
Merge pull request #169 from ONLYOFFICE/bugfix/private-room-switcher
web: client: fix switcher render
2021-01-12 15:42:21 +03:00
Vladislav Makhov
173cb950e7 web: client: fix switcher render 2021-01-12 15:27:35 +03:00
1b1d57ba35 Files: fix tests 2021-01-12 13:43:44 +03:00
682ca73a91 Files: fix tests 2021-01-12 13:16:11 +03:00
abaf8df8dc Files: test. Show error 2021-01-12 12:26:09 +03:00
5dbd0653f5 Files: test. fix order 2021-01-12 11:35:10 +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
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
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