Commit Graph

838 Commits

Author SHA1 Message Date
a2480098c7 [x2t] For bug 50369; rework ThreadedComment stub message to old comment format 2021-05-26 19:37:06 +03:00
8c95392373 Merge remote-tracking branch 'origin/hotfix/v6.3.1' into develop 2021-05-24 13:13:47 +03:00
6414a49ae1 fix bug #50426 2021-05-21 14:10:26 +03:00
443fd59974 Merge branch 'release/v6.3.0' into develop 2021-05-04 10:53:49 +03:00
68422064cf . 2021-04-30 13:12:37 +03:00
e2227b919d fix bug #50119 2021-04-29 16:05:24 +03:00
c6b6a54d79 . 2021-04-21 12:04:43 +03:00
3c70dc0db4 protectedRanges 2021-04-19 12:29:27 +03:00
0488a8c2c3 for bug #49169 2021-04-09 16:29:06 +03:00
0c2a9ed62c fix XML Spreadsheet 2003 aligments 2021-03-26 13:45:32 +03:00
abb295139b . 2021-03-23 18:22:01 +03:00
5a0226e972 for bug #44144 2021-03-23 17:24:24 +03:00
2871a38cd1 fix bug #49169 2021-03-22 15:17:33 +03:00
7d2c271034 x2t- ... 2021-03-15 21:51:58 +03:00
d3c9d62631 x2t -... 2021-03-13 11:57:46 +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
1a722a46cb fix bug #48580 2021-03-05 09:19:33 +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
83311dcc35 Merge remote-tracking branch 'origin/feature/ppt_4' into develop 2021-03-01 15:16:35 +03:00
4fa865799b Merge remote-tracking branch 'origin/feature/xlsb' into feature/ppt_4 2021-03-01 15:14:41 +03:00
69794961e7 x2t - binary - protection 2021-03-01 14:56:56 +03:00
f2f0fce5fb [x2t] Fix w14:checked reading 2021-02-25 19:25:25 +03:00
b96c53557a Merge pull request #512 from ONLYOFFICE/release/v6.2.0
Release/v6.2.0
2021-02-25 12:24:41 +03:00
fb4d76c5e5 fix signature xlsx 2021-02-18 23:15:39 +03:00
0d3f4612d8 Merge remote-tracking branch 'origin/release/v6.2.0' into develop 2021-02-11 14:12:54 +03:00
abd5588eaf csv_format - fix bug #48393 2021-01-28 18:09:22 +03:00
ccb2957df2 Merge remote-tracking branch 'origin/feature/develop' into develop 2021-01-27 16:00:54 +03:00
5c7a6c03b6 Ooxml, bin - chartEx, chartColors, chartStyle 2021-01-27 15:52:35 +03:00
026c85097f [x2t] For bug 48247 2021-01-21 19:08:31 +03:00
5023e7c206 Merge commit '260765b17ae0621a9ae754d7225d27576738f0a9' into feature/ppt_4 2021-01-15 10:21:54 +03:00
68ef4a93c3 Add FillAudio, but it has bug with node name 2021-01-13 16:48:18 +03:00
dd06c23d8e ms xml office 2003 - fix bugs 2021-01-12 22:34:47 +03:00
7b2f693235 Merge remote-tracking branch 'origin/release/v6.2.0' into feature/develop 2021-01-09 12:26:12 +03:00
ddaafd9190 [x2t] Add opening/saving of combBorder, SpecialFormsHighlight 2020-12-29 18:36:56 +03:00
0cd5815f0d Merge remote-tracking branch 'origin/fix/v6.2.0-fix_bugs' into feature/develop 2020-12-28 11:43:24 +03:00
9416f364a7 Merge branch 'hotfix/v6.1.1' into release/v6.2.0 2020-12-28 11:41:40 +03:00
0f7552c96f Merge branch 'hotfix/v6.1.1' into fix/v6.2.0-fix_bugs 2020-12-28 11:40:48 +03:00
4341a38b83 x2t - fix bug #47747 2020-12-26 14:05:45 +03:00
762266238e x2t - fix bug #48026 2020-12-24 13:36:18 +03:00
a995053d47 x2t- binary - fix bug #48045, fix bug #48099, remove weak encrypt 2020-12-22 18:52:11 +03:00
ceb0d864f5 Pptx Animation to binary (fix bug #42961) 2020-12-14 15:11:45 +03:00
72de286fb2 Merge remote-tracking branch 'origin/develop' into feature/ppt_2_1_merge
# Conflicts:
#	Common/DocxFormat/Source/DocxFormat/FileFactory.cpp
#	EpubFile/src/CEpubFile.cpp
2020-12-10 01:54:31 +03:00
b87b38bb15 . <from develop> 2020-12-10 01:46:42 +03:00
59ccda7344 . 2020-12-10 00:05:36 +03:00
2e0d235e70 Merge pull request #429 from ONLYOFFICE/release/v6.1.0
Release/v6.1.0
2020-11-19 12:00:26 +03:00
1af821d2fe OdfFormat - fix bug #47338; fix bug #47377; fix bug #47379; fix bug #47382 2020-11-13 11:05:53 +03:00
2be7dcb569 ooxml - add Word XML Document - fix bug #47039
read encrypted xml documents
2020-11-09 11:41:12 +03:00
ececaee42b ooxml strict ole 2020-11-05 15:12:58 +03:00
3a312ef626 Merge remote-tracking branch 'origin/release/v6.1.0' into develop 2020-11-02 11:16:17 +03:00