Commit Graph

10141 Commits

Author SHA1 Message Date
7f5692e73b Merge pull request #358 from ONLYOFFICE/feature/develop
Feature/develop
v99.99.99.2128
2020-10-11 17:53:28 +03:00
221bd392d4 DocxFormat - glossary - fix bug #46488 2020-10-11 17:52:13 +03:00
b6e188e5cf . 2020-10-10 22:19:48 +03:00
7b9aac8be2 [android][libs] add libEpubFile 2020-10-09 13:55:46 +03:00
19488bff6e Build icu as static library on android 2020-10-09 11:43:21 +03:00
51450a468d . 2020-10-09 09:28:59 +03:00
e67d2f17bd Fix typo v99.99.99.2125 2020-10-08 21:10:52 +03:00
9a9a9277c8 Fix previous commit 2020-10-08 17:37:49 +03:00
90ed77d40d Remove version from icu libs on android 2020-10-08 15:19:15 +03:00
e966ce6cdd Return the error code if can't save to pdf v99.99.99.2123 v99.99.99.2124 2020-10-06 18:46:02 +03:00
d88520764a update fetch.py 2020-10-06 17:27:08 +03:00
7519890d85 update test htmlfile2 v99.99.99.2122 2020-10-05 15:41:30 +03:00
2e47759d84 Merge branch 'feature/develop' into develop
# Conflicts:
#	DesktopEditor/raster/Metafile/Metafile.vcxproj
#	DesktopEditor/raster/Metafile/Metafile.vcxproj.filters
2020-10-05 11:54:19 +03:00
d340d620e5 . 2020-10-05 11:43:26 +03:00
117d026b91 Merge pull request #353 from ONLYOFFICE/feature/develop
.
2020-10-05 11:36:10 +03:00
24492bf2ce . 2020-10-05 11:34:10 +03:00
d2ba7cde6e Merge pull request #352 from ONLYOFFICE/feature/develop
Feature/develop
2020-10-05 11:27:15 +03:00
bf1929f06a Revert "TestMetafile - vc2015"
This reverts commit e26946a579.
2020-10-05 11:26:12 +03:00
df764e1940 . 2020-10-05 11:25:16 +03:00
dbc2763df3 Revert "Revert "TestMetafile - vc2015""
This reverts commit 4d3718e1ff.
2020-10-05 11:18:25 +03:00
4d3718e1ff Revert "TestMetafile - vc2015"
This reverts commit e26946a579.
2020-10-05 11:17:31 +03:00
e26946a579 TestMetafile - vc2015 2020-10-05 11:15:11 +03:00
120c31d8f1 Merge pull request #351 from ONLYOFFICE/feature/develop
DocFormat - glossary
v99.99.99.2121
2020-10-04 17:42:26 +03:00
be2b16b68d DocFormat - glossary 2020-10-04 17:41:16 +03:00
1dc3af61a6 Add changes for previous commit 2020-10-04 14:12:54 +03:00
dc1113f4b6 Andriod builds 2020-10-04 14:12:01 +03:00
1b19574f17 fix warning v99.99.99.2119 v99.99.99.2120 2020-10-02 18:00:41 +03:00
e846282128 fix bug wells-wheels-of-chance 2020-10-02 16:43:43 +03:00
0c54426f3d fix bug 1681_978 2020-10-02 15:35:11 +03:00
6f15f57f97 fix bug pg22642 v99.99.99.2118 2020-10-01 19:14:50 +03:00
383305310c fix bug pg22630 2020-10-01 15:23:49 +03:00
d47775f113 Fixed bugs v6.1.0.2 v99.99.99.2117 v6.1.0.1 2020-09-30 18:31:57 +03:00
d3224e59c3 Merge branch release/v6.0.0 into develop 2020-09-30 15:00:07 +00:00
6cfbd4906a Fixed a bug with font-family 2020-09-30 16:23:36 +03:00
2b3375db10 fix bug 2020-09-30 13:10:11 +03:00
884aa8e156 Fix bug #46475
Add log message when we can't load fontfile
2020-09-30 12:47:29 +03:00
3aefe16c66 [x2t] For Revision: b0e6574f49 v99.99.99.2116 v99.99.99.2115 2020-09-29 19:50:44 +03:00
923a461866 [x2t] Add lnNumType to Editor.bin 2020-09-29 19:50:44 +03:00
a2a36d8497 [x2t] For Revision: b0e6574f49 2020-09-29 19:50:44 +03:00
496bfd50c6 [x2t] Add commentsUserData.xml for comment userdata 2020-09-29 19:50:44 +03:00
2747bc9a2c [x2t] Add commentsExtensible.xml reading 2020-09-29 19:50:44 +03:00
5f3fc17d6c CElement 2020-09-29 19:05:40 +03:00
9e053c2ae2 CElement 2020-09-29 18:27:36 +03:00
4570a9c3ed more warnings v99.99.99.2114 2020-09-29 11:24:33 +03:00
047ccd1348 gcc warnings 2020-09-29 11:09:04 +03:00
0277d4fbfb Fix previous commit v99.99.99.2113 2020-09-29 10:04:04 +03:00
294bf17dd0 without auto 2020-09-29 09:56:32 +03:00
30673f8623 Convert codepages with CoreFoundation on ios 2020-09-29 09:13:57 +03:00
f333a31b17 Fixed warnings 2020-09-28 22:43:51 +03:00
971d35be22 Fix typo v99.99.99.2110 2020-09-28 20:11:22 +03:00