Commit Graph

812 Commits

Author SHA1 Message Date
7c72b34986 fix bug #57259 2022-05-24 14:37:06 +03:00
94bfcfc9a6 Merge branch release/v7.1.0 into develop 2022-05-16 12:52:12 +00:00
6e936ffafc for bug #56655 2022-04-22 17:21:55 +03:00
6a543bb12d Merge remote-tracking branch 'remotes/origin/release/v7.1.0' into develop 2022-04-12 18:51:22 +03:00
e3b54624c3 fix bug #55849 2022-04-08 11:47:43 +03:00
8bd724353e for bug #55901 2022-04-04 09:50:37 +03:00
fc52fb3c17 Merge pull request #886 from ONLYOFFICE/release/v7.1.0
Release/v7.1.0
2022-03-31 11:39:05 +03:00
96a3ac70ca fix bug #56304 2022-03-28 11:34:36 +03:00
bb9897acbf Merge pull request #878 from ONLYOFFICE/feature/odf_2
Update MathConverter.cpp
2022-03-21 17:44:08 +03:00
e06edbc6fe Update MathConverter.cpp
Annotation
2022-03-21 17:31:07 +04:00
c2c69d2a8e Merge remote-tracking branch 'origin/release/v7.1.0' into develop 2022-03-18 11:11:43 +03:00
fe19e83d1e for bug #55915 2022-03-17 15:09:26 +03:00
43c935b79e Merge branch 'feature/odf_2' into develop 2022-03-11 17:02:05 +03:00
af28e9d319 annotation fix 2022-03-10 13:03:55 +04:00
5b3860103e fix bug #55894 2022-03-10 11:20:34 +03:00
7b853f2136 fix delimetr 2022-02-22 17:09:02 +03:00
e9d42264c0 Merge branch 'feature/odf_2' of https://github.com/ONLYOFFICE/core into feature/odf_2 2022-02-21 15:51:30 +03:00
5abab316fb some fixes 2022-02-21 15:51:01 +03:00
4725acd2e7 Merge branch 'develop' into feature/odf_2 2022-02-18 18:34:22 +03:00
953a14ce13 Merge branch 'release/v7.1.0' into fix/v7.1.0-fix-bugs 2022-02-10 17:54:17 +03:00
b47e7155ab . 2022-02-09 18:35:24 +03:00
cff91a5235 Merge branch 'develop' into feature/odf_2 2022-02-08 09:40:13 +03:00
aecf675627 . 2022-02-08 09:30:23 +03:00
ee3898085c some fixes 2022-02-08 08:01:27 +03:00
915e41e0ac fix bug #55239 2022-02-07 17:03:50 +03:00
b0e9f2a255 fix bug #55235 2022-02-07 14:39:54 +03:00
45121fa2f8 fix 2022-02-04 08:51:32 +03:00
d25a2a79d8 bug 55239 2022-02-03 19:56:21 +03:00
c89a45e08b Revert "girignore"
This reverts commit 20760b8ce2.
2022-02-01 18:37:15 +03:00
41eeaf8cd7 some fixes 2 2022-02-01 10:20:14 +03:00
372366adc0 some fixes 2022-01-31 18:08:34 +03:00
20760b8ce2 girignore 2022-01-31 12:30:11 +03:00
fb6142cb9d Other annotations with some bugs 2022-01-30 19:54:33 +03:00
63ccb0fbee Fractions with Annotations 2022-01-17 18:41:38 +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
57b46c22ef . 2021-12-21 16:36:12 +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