Commit Graph

742 Commits

Author SHA1 Message Date
20760b8ce2 girignore 2022-01-31 12:30:11 +03:00
eb75805c88 Merge remote-tracking branch 'origin/fix/v7-fix-bugs' into release/v7.1.0 2022-01-10 17:44:17 +03:00
e872a4c0ac . 2021-12-29 10:53:42 +03:00
ecbc73d33b OdfFormatWriter - add convert math equation in spreadsheets and presentation 2021-12-23 20:37:19 +03:00
4f9d22bcb0 Merge branch 'feature/odf' into develop 2021-12-23 20:17:10 +03:00
7a261ba649 Some fixes 2021-12-23 11:19:43 +03:00
efeaf9b8d1 fix bug #54623 2021-12-20 17:29:34 +03:00
a3b83ecace diakrit. symbols
semi results
2021-12-20 14:04:17 +03:00
d21ad2ae43 Brackets 2021-12-15 10:46:28 +03:00
1c9b9d5e0f . 2021-12-10 13:59:07 +03:00
d612b64b4b Merge branch 'release/v7.0.0' into develop 2021-12-10 12:04:00 +03:00
f2db638138 Update MathConverter.cpp
Fix some bugs of Large Operators
2021-12-07 01:54:13 +03:00
c036733ff8 fix bug #54187 2021-12-02 19:21:24 +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
231daf9977 Fix build 2021-11-14 11:52:11 +03:00
f6908517e2 fix build 2021-11-01 11:01:55 +03:00
1e9e2ab603 Merge branch 'release/v7.0.0' into develop 2021-10-29 16:19:54 +03:00
2481578533 Add support vs2019 & v8 8.9 2021-10-21 15:05:17 +03:00
e65851ef3b fix bug #53032 2021-10-20 10:36:36 +03:00
9e58de380e Merge remote-tracking branch 'origin/release/v7.0.0' into develop 2021-10-19 21:06:11 +03:00
efde950a11 for bug #52781 2021-10-19 20:13:58 +03:00
37a851ef98 . 2021-10-14 13:09:47 +03:00
9099a04b2d fix build linux 2021-10-14 12:36:41 +03:00
42e515dfec . 2021-10-14 11:08:50 +03:00
15da75c473 fix build 2021-10-14 10:31:20 +03:00
6f01769c4d fix build 2021-10-13 10:32:35 +03:00
7956395c7c . 2021-10-12 13:28:48 +03:00
d5cbd33a59 restore 2021-10-12 12:45:01 +03:00
afbb6fe4ff fix qt project & build 2021-10-11 23:29:58 +03:00
8e4750bb0b Merge branch 'feature/odf' into feature/odf2 2021-10-11 09:40:00 +03:00
57f1438949 cleaning of code 2021-10-08 16:38:31 +03:00
45b6929dd4 gitignore stuff 2021-10-08 16:35:14 +03:00
4ac1c8c928 some debug stuff 2021-09-15 21:45:26 +03:00
761ceab8d2 Merge commit '8c726e475a562e64a39d36cac32226249a3f7697' into feature/odf 2021-09-07 12:10:14 +03:00
78bc7afa13 Merge remote-tracking branch 'origin/fix/v6.4.1-fix-bugs2' into fix/v6.5.0-fix-bugs 2021-09-06 17:33:26 +03:00
8742086a0a fix bug #52344 2021-09-06 17:32:41 +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
ac98378b4b fix bad temp directory 2021-08-31 19:39:52 +03:00
34a525e74d Some stuff 2021-08-30 21:30:22 +03:00
8c0f2a6b2c fix bug #52240 2021-08-30 15:02:26 +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
cb86631775 Merge pull request #689 from ONLYOFFICE/release/v6.4.0
Release/v6.4.0
2021-08-16 09:37:27 +03:00
3e97080d33 fix bug #51949 2021-08-13 15:57:28 +03:00
5d917b93e3 Merge remote-tracking branch 'origin/release/v6.4.0' into develop 2021-08-12 18:49:22 +03:00
8d6402acdd fix bug #51935 2021-08-12 18:44:01 +03:00
65d846b761 fix bug #51937 2021-08-12 18:28:51 +03:00