Commit Graph

790 Commits

Author SHA1 Message Date
13316ce210 fix bug #59012 2022-09-13 18:14:45 +03:00
70f2a11c75 fix bug #58908 2022-09-08 16:24:11 +03:00
1b5ec0a65c fix bug #58918 2022-09-07 15:01:54 +03:00
2f6aebcad5 fix bug #58676 2022-08-31 20:20:40 +03:00
43fcaadcb1 fix bug #58699 2022-08-26 20:22:01 +03:00
91af8c2b62 fix bug #58677 2022-08-24 12:31:20 +03:00
2d7a8a5b75 for bug #56669 2022-08-19 12:48:04 +03:00
f422a6ed01 fix bug #58546 2022-08-18 11:34:59 +03:00
1035103910 fix test projects 2022-08-15 08:49:47 +03:00
818d813b98 ffix bug #58484 2022-08-11 12:03:37 +03:00
81e6c62c5a fix bug #58243 2022-08-08 18:09:52 +03:00
54b3fc1866 Merge remote-tracking branch 'origin/hotfix/v7.1.1' into fix/hotfix-v7.1.1-conflicts
# Conflicts:
#	Common/3dParty/html/css/src/CCompiledStyle.cpp
#	Common/3dParty/html/css/src/CCssCalculator_Private.cpp
#	Common/3dParty/html/css/src/ConstValues.h
#	Common/3dParty/html/css/src/xhtml/CDocumentStyle.cpp
#	Common/3dParty/html/htmltoxhtml.h
#	Common/Network/FileTransporter/src/FileTransporter_win.cpp
#	HtmlFile2/htmlfile2.cpp
#	HtmlFile2/test/main.cpp
#	PdfWriter/PdfRenderer.cpp
#	PdfWriter/PdfRenderer.h
2022-07-18 17:41:10 +03:00
5c44484c24 fix images from word 2003 xml 2022-07-13 12:21:31 +03:00
adfc2ef30d office 2003 xml -> docx (with fix errors format) 2022-07-08 17:13:29 +03:00
77a07b09a5 fix bug #57274 2022-05-26 12:05:28 +03:00
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