Commit Graph

722 Commits

Author SHA1 Message Date
d612b64b4b Merge branch 'release/v7.0.0' into develop 2021-12-10 12:04:00 +03:00
c036733ff8 fix bug #54187 2021-12-02 19:21:24 +03:00
9834392df8 fix bug #54186 2021-12-01 10:44:04 +03:00
d71477e8a3 fix bug #54184 2021-11-30 17:49:51 +03:00
c100d54aa5 fix bug #54187 2021-11-30 16:28:13 +03:00
7b49631c73 Merge remote-tracking branch 'origin/release/v7.0.0' into develop
# Conflicts:
#	PdfReader/old/XRef.cpp
2021-11-29 11:15:53 +03:00
cac9293d87 fix bug #54116 2021-11-25 22:20:08 +03:00
5ff7ca9b4c Merge remote-tracking branch 'origin/release/v7.0.0' into develop 2021-11-09 12:29:37 +03:00
c82c994184 fix bug #53435 2021-11-02 12:04:38 +03:00
f6908517e2 fix build 2021-11-01 11:01:55 +03:00
d5cbd33a59 restore 2021-10-12 12:45:01 +03:00
25fb7daee9 back 2021-10-12 12:26:32 +03:00
8e4750bb0b Merge branch 'feature/odf' into feature/odf2 2021-10-11 09:40:00 +03:00
45b6929dd4 gitignore stuff 2021-10-08 16:35:14 +03:00
761ceab8d2 Merge commit '8c726e475a562e64a39d36cac32226249a3f7697' into feature/odf 2021-09-07 12:10:14 +03:00
84b3883a1f Merge remote-tracking branch 'origin/hotfix/v6.4.1' into release/v6.5.0 2021-09-03 17:02:35 +03:00
53b55326be Merge remote-tracking branch 'origin/hotfix/v6.4.1' into develop 2021-09-01 07:59:02 +03:00
ac98378b4b fix bad temp directory 2021-08-31 19:39:52 +03:00
158546d3fa fix bug #51937 2021-08-25 15:57:32 +03:00
55531d6ede fix bug #51935 2021-08-25 07:52:01 +03:00
5d917b93e3 Merge remote-tracking branch 'origin/release/v6.4.0' into develop 2021-08-12 18:49:22 +03:00
d4708d8d2e fix bug #51923 2021-08-12 17:59:06 +03:00
3729083e3e Merge remote-tracking branch 'origin/release/v6.4.0' into develop 2021-08-04 14:51:56 +03:00
84c4447fa2 fix bug #51648 2021-08-03 17:58:30 +03:00
476ebe6e95 fix bug #51541 2021-07-27 15:58:58 +03:00
ef277b4656 fix bug #51489 2021-07-24 13:20:27 +03:00
383bae3750 fix bug #51327 2021-07-22 18:23:20 +03:00
bbc0f1231d fix issue 1321 2021-07-22 15:23:34 +03:00
208bf78003 fix bug #51328 2021-07-22 15:05:12 +03:00
0fb91dc2f8 Merge remote-tracking branch 'origin/release/v6.4.0' into develop 2021-07-02 10:44:38 +03:00
eb8cea5cb2 for bug #51002 2021-07-02 10:36:44 +03:00
2c45908473 fix bug #50997 2021-06-27 09:47:05 +03:00
0363867177 smart arts 2021-06-11 17:10:37 +03:00
fe1d0e8f4c fractions without wideslash + integrals 2021-06-03 15:55:46 +03:00
54e5f27ced Merge branch 'release/v6.3.0' into develop
# Conflicts:
#	EpubFile/test/main.cpp
2021-05-21 10:20:56 +03:00
501778592b fix bug #50209 2021-05-05 15:42:29 +03:00
443fd59974 Merge branch 'release/v6.3.0' into develop 2021-05-04 10:53:49 +03:00
b97b0bfde3 10 2021-04-30 13:40:29 +03:00
f8f0283b2d fix bug #49686 2021-04-22 18:51:09 +03:00
6676124c5b 7
math serialize
2021-04-12 17:15:02 +03:00
14e3951d7e back vcxproj and add some math files to OdfWriter 2021-04-12 13:49:42 +03:00
0488a8c2c3 for bug #49169 2021-04-09 16:29:06 +03:00
b8f89ecd10 for bug #46292 2021-04-09 16:28:00 +03:00
3fa91220ae openoffice xml 1.0 2021-04-06 05:03:20 +03:00
ee296ff09d math conversation 2021-04-02 07:01:27 +03:00
d586befe30 Merge remote-tracking branch 'origin/feature/odf' into feature/odf 2021-03-31 14:42:38 +03:00
4269b2862f gitignore + start of feature 2021-03-31 14:22:53 +03:00
054f1ef270 . 2021-03-31 11:30:20 +03:00
ca45de67c2 openoffice xml 1.0 2021-03-31 11:25:48 +03:00
1cdefae044 fix bug #46751 2021-03-17 16:22:43 +03:00