Commit Graph

10253 Commits

Author SHA1 Message Date
ececaee42b ooxml strict ole 2020-11-05 15:12:58 +03:00
3be538f3d2 Fix merging from release/v6.1.0 v99.99.99.2169 v99.99.99.2164 v99.99.99.2167 v99.99.99.2165 v99.99.99.2168 2020-11-02 15:28:33 +03:00
3a312ef626 Merge remote-tracking branch 'origin/release/v6.1.0' into develop 2020-11-02 11:16:17 +03:00
6ddf737959 [x2t] For bug 47175; Add opening/saving SuppressLineNumbers v6.1.0.42 2020-11-01 10:09:21 +03:00
f3c552ec6d Fix linux build 2020-10-31 14:51:05 +03:00
0c0124a9e0 Add test for embeded mode 2020-10-31 14:45:54 +03:00
101b43a25a Merge pull request #398 from ONLYOFFICE/feature/k61
Fix work with icudatadir
v6.1.0.40 v6.1.0.41
2020-10-30 13:27:36 +03:00
00079a0f40 Fix work with icudatadir 2020-10-30 13:24:56 +03:00
8b523427bf Merge pull request #397 from ONLYOFFICE/feature/metafile
Feature/metafile
2020-10-30 11:23:54 +03:00
b2c645c4a2 Merge pull request #396 from ONLYOFFICE/fix/v6.1.0-fixBug3
Fix/v6.1.0 fix bug3
2020-10-29 21:19:26 +03:00
14ef010529 OdfFormat - fix user file 2020-10-29 21:17:39 +03:00
a365f6d4cd OdfFormat - fix bug #47146 2020-10-29 19:35:29 +03:00
3ca9fc67ae Merge pull request #395 from ONLYOFFICE/feature/k61
Switch zlib to 1.2.11 (graphics)
v6.1.0.39
2020-10-29 18:44:50 +03:00
442c8a327e Switch zlib to 1.2.11 (graphics) 2020-10-29 18:43:46 +03:00
3e5bc50e3d fix bag 2020-10-29 18:00:31 +03:00
96b69dd772 Fix macos build 2020-10-29 14:42:40 +03:00
c0d2e29dee Merge pull request #394 from ONLYOFFICE/feature/k61
Fix macos build
2020-10-29 14:42:35 +03:00
a3be72b2d5 Fix build for macos 2020-10-29 12:50:37 +03:00
7e55bd6f18 Merge pull request #393 from ONLYOFFICE/feature/k61
Fix build for macos
2020-10-29 12:49:58 +03:00
f9b5f8ba01 Fix the issue with reading CCITFax images 2020-10-28 21:14:01 +03:00
0603ec54dd Merge pull request #391 from ONLYOFFICE/fix/1
.
v6.1.0.37 v6.1.0.38
2020-10-28 16:48:53 +03:00
4c3ef986ab . 2020-10-28 16:49:24 +03:00
966d0898d4 Merge pull request #390 from ONLYOFFICE/fix/pdfw
PdfWriter => ft2104
2020-10-28 09:12:26 +03:00
c43a6d707c PdfWriter => ft2104 2020-10-28 09:06:06 +03:00
e6fbf954fe Merge pull request #389 from ONLYOFFICE/feature/ft2104
Feature/ft2104
2020-10-27 20:36:14 +03:00
3e2aed5193 Merge pull request #388 from ONLYOFFICE/fix/v6.1.0_fix_bugs2
TxtFormat - fix bug #45695
2020-10-27 20:04:42 +03:00
6f316910e2 TxtFormat - fix bug #45695 2020-10-27 19:57:11 +03:00
6aa15e467b . 2020-10-27 12:45:45 +03:00
009579b0da Switch to ft 2.10.4 2020-10-27 12:24:10 +03:00
00ef7bb822 Merge pull request #387 from ONLYOFFICE/fix/v6.1.0_fix_bugs2
DocFormat - fix bug #46844, #46843, #45728
v6.1.0.33
2020-10-26 20:01:23 +03:00
ccec2e1759 DocFormat - fix bug #46844, #46843, #45728 2020-10-26 20:00:25 +03:00
684aed5d00 Merge pull request #386 from ONLYOFFICE/fix/android_save
Fix uninitialized data
2020-10-26 16:33:19 +03:00
ea3d928f4d Fix uninitialized data 2020-10-26 16:32:27 +03:00
a0892f45dc Merge pull request #385 from ONLYOFFICE/fix/v6.1.0_fix_bugs
DocFormat - fix bugs #47057, #46115
v6.1.0.32 v6.1.0.31
2020-10-24 14:40:56 +03:00
aa0b274729 DocFormat - fix bugs #47057, #46115 2020-10-24 14:39:39 +03:00
647d8ce95b Merge pull request #384 from ONLYOFFICE/feature/develop
.
2020-10-24 12:11:29 +03:00
485c166a87 . 2020-10-24 12:10:30 +03:00
1576c783dc Merge pull request #383 from ONLYOFFICE/fix/addLibDependency
Fix/add lib dependency
v6.1.0.30 v6.1.0.29
2020-10-22 19:03:44 +03:00
ff1eb08d42 [android][editors] add setIcuDataPath 2020-10-22 18:31:34 +03:00
074b533883 [android][libs] add libEpubFile 2020-10-22 18:31:31 +03:00
4e1804e159 Merge remote-tracking branch 'origin/release/v6.1.0' into develop 2020-10-22 15:56:11 +03:00
ba63a63e81 Merge pull request #382 from ONLYOFFICE/feature/develop
.
2020-10-22 15:37:40 +03:00
04ef857a1f . 2020-10-22 15:35:43 +03:00
60a3d3ad19 Merge pull request #381 from ONLYOFFICE/fix/v6.1.0-Y
x2t - for bug #47036
2020-10-22 15:33:54 +03:00
541664df92 x2t - for bug #47036 2020-10-22 15:32:02 +03:00
d0ca5d1d55 Merge pull request #380 from ONLYOFFICE/feature/develop
.
v99.99.99.2150 v99.99.99.2149
2020-10-21 13:14:43 +03:00
5680ea4c96 . 2020-10-21 13:13:20 +03:00
3423936326 Merge pull request #378 from ONLYOFFICE/feature/dev_to_61
.
v6.1.0.28
2020-10-21 12:09:23 +03:00
800f6434e1 . 2020-10-21 12:09:07 +03:00
668bf4e412 Merge pull request #377 from ONLYOFFICE/feature/dev_to_61
Feature/dev to 61
2020-10-21 11:45:59 +03:00