Commit Graph

383 Commits

Author SHA1 Message Date
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
2bdc1e4a6d fix write application tag 2022-07-11 09:01:21 +03:00
8ec5685786 . 2022-07-10 09:40:44 +03:00
adfc2ef30d office 2003 xml -> docx (with fix errors format) 2022-07-08 17:13:29 +03:00
19bec43364 fix bug #57702 2022-06-23 17:19:06 +03:00
32c752a71f for bug #52363
extend xlsx connection
re-place vba xml in binary
2022-06-23 11:45:31 +03:00
ffebbbe0af doc info 2022-06-09 11:26:03 +03:00
f2b19e9701 . 2022-06-03 22:32:34 +03:00
92e3d6d3cc update core, app from xls, ppt, doc, odf 2022-06-02 17:06:02 +03:00
23d0b0e194 fix bug #57334 2022-05-25 16:51:11 +03:00
c5b124790e . 2022-05-17 15:13:46 +03:00
4ec1a1ec9d fix bug #56901 2022-05-04 10:01:55 +03:00
53b78c1f84 fix bug #56795 2022-04-28 19:29:49 +03:00
add329c8ea fix build 2022-04-10 14:12:21 +03:00
993eb9809d . 2022-04-08 17:25:00 +03:00
e3b54624c3 fix bug #55849 2022-04-08 11:47:43 +03:00
2825342c14 fix bug #56071 2022-03-17 09:16:53 +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
ee3898085c some fixes 2022-02-08 08:01:27 +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
20760b8ce2 girignore 2022-01-31 12:30:11 +03:00
0756b8ff90 for bug #54311 2021-12-08 20:05:00 +03:00
b058f017e0 fix bug #53908
docxf
2021-11-24 18:28:20 +03:00
1e66105813 fix bug #53875 2021-11-18 18:13:57 +03:00
03dec3dcf6 fix bug #53813 2021-11-18 17:22:09 +03:00
eeb982cb64 fix bug #53555 2021-11-08 17:44:00 +03:00
8fe6e1ce23 for bug 53032 2021-10-22 10:13:57 +03:00
53f766271f fix bug #53233 2021-10-21 13:52:28 +03:00
8c212908bd fix bug #52560 2021-10-07 19:08:05 +03:00
931e19048b fix bug #52688 2021-09-23 18:02:43 +03:00
76f94eaacc fix bug #52607 2021-09-16 19:08:03 +03:00
c886e0da68 for bug #52560 - restore all pages 2021-09-16 18:43:59 +03:00
b8d065fcdc fix bug #51751 2021-08-20 11:43:03 +03:00
18db1b9966 fix bug #49738 2021-04-22 17:13:49 +03:00
14a6388688 fix bugs 2021-03-27 17:29:17 +03:00
fe5f9a147e Merge branch 'fix/v6.2.2-fix-bugs' into fix/v6.3.0-fix-bugs 2021-03-27 12:12:45 +03:00
ce173dc575 fix bugs 2021-03-27 10:20:57 +03:00
44a6d0a90b fix bug #49265 2021-03-26 13:44:45 +03:00
5a0226e972 for bug #44144 2021-03-23 17:24:24 +03:00
328ca886c7 Revert "Merge pull request #528 from ONLYOFFICE/feature/ppt_4"
This reverts commit ff0f58cc3c, reversing
changes made to cb6c9838d3.
2021-03-10 15:33:50 +03:00
2708b22cf3 Merge commit 'cb6c9838d349dcc05751c464a9c0c9bfb3dfb86c' into feature/ppt_4 2021-03-10 14:18:09 +03:00
bf8ff829f3 for bug #48756 2021-03-09 14:43:18 +03:00
ec93bce61c Revert "Merge remote-tracking branch 'origin/feature/xlsb' into feature/ppt_4"
This reverts commit 4fa865799b, reversing
changes made to 393bdf3caa.
2021-03-01 15:17:34 +03:00
e148f89897 fix bug #46843; fix bug #45728 2021-02-19 13:40:57 +03:00
9ce9a4aef4 fix bug #48753 2021-02-19 13:37:33 +03:00
d23adf75ef fix bug #48033 2021-02-10 21:01:29 +03:00
898d84cdad fix bug #48395 2021-02-05 13:45:29 +03:00