Commit Graph

1078 Commits

Author SHA1 Message Date
d612b64b4b Merge branch 'release/v7.0.0' into develop 2021-12-10 12:04:00 +03:00
db83a36fc4 Merge remote-tracking branch 'origin/fix/v7.0.0-ppt' into develop 2021-12-10 10:20:54 +03:00
2e83d4e9c8 fix bug #54460 2021-12-09 12:39:05 +03:00
8293a06d40 Merge pull request #802 from ONLYOFFICE/fix/v7.0.0-ppt
Fix/v7.0.0 ppt
2021-12-09 11:11:51 +03:00
51c33e0701 Merge pull request #801 from ONLYOFFICE/fix/v7.0.0-fix-bugs
Fix/v7.0.0 fix bugs
2021-12-08 20:06:03 +03:00
0756b8ff90 for bug #54311 2021-12-08 20:05:00 +03:00
446ef4d577 fix bug #54333 2021-12-07 18:21:51 +03:00
6e789e0697 Merge pull request #800 from ONLYOFFICE/fix/v7.0.0-ppt
Fix/v7.0.0 ppt
2021-12-07 09:45:48 +03:00
fc2cb5f533 fix bug #54200 2021-12-04 13:00:17 +03:00
82909e892f fix bug #53541 2021-12-02 23:27:42 +03:00
136d123ba2 fix bug #52412 2021-12-02 19:56:30 +03:00
a29d7cb8b3 Merge pull request #797 from ONLYOFFICE/fix/v7.0.0-ppt
Fix/v7.0.0 ppt
2021-12-02 10:05:51 +03:00
3428df7bac fix bug #52780 2021-11-30 19:40:00 +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
c73bd8b904 Merge pull request #788 from ONLYOFFICE/fix/v7.0.0-ppt
Fix/v7.0.0 ppt
2021-11-27 10:35:58 +03:00
f76bf0cee1 add buBlip. bullet as image 2021-11-24 18:41:17 +03:00
0ffc7ef04c add ConvertExtention9() for buBlip 2021-11-23 23:25:13 +03:00
aad0ec464f trying to add blip bullet to fix numbering 2021-11-17 22:54:07 +03:00
3e922260d3 Merge remote-tracking branch 'origin/release/v7.0.0' into develop 2021-11-17 10:57:12 +03:00
b5d2b40acb fix bug #53499 2021-11-15 20:01:15 +03:00
8e67aa129e fix bug #53086 2021-11-15 17:35:07 +03:00
e68e8ba644 fix bug #53666 2021-11-12 16:16:31 +03:00
56cfa9d57d fix part of 53538. Text replaces to '_' 2021-11-10 20:20:58 +03:00
5ff7ca9b4c Merge remote-tracking branch 'origin/release/v7.0.0' into develop 2021-11-09 12:29:37 +03:00
ef970a6009 Merge remote-tracking branch 'origin/feature/ppt_7' into fix/v7.0.0-ppt 2021-11-08 18:08:57 +03:00
17ec7bc611 fix bug #53400 2021-11-02 11:42:57 +03:00
3cb19a4ceb Merge branch 'feature/xlsb2' into feature/xlsb3 2021-10-30 13:06:07 +03:00
1e9e2ab603 Merge branch 'release/v7.0.0' into develop 2021-10-29 16:19:54 +03:00
8044c5157c fix bug #53379 2021-10-27 14:49:03 +03:00
9db42c3494 trying to fix 52749 2021-10-20 18:43:08 +03:00
9e58de380e Merge remote-tracking branch 'origin/release/v7.0.0' into develop 2021-10-19 21:06:11 +03:00
8008ff2e29 fix bug #44721 2021-10-11 11:20:53 +03:00
fe50098db7 Trying to use pptx classes 2021-10-06 23:15:41 +03:00
2c2cfbe07d Merge branch 'feature/xlsb' into feature/xlsb2 2021-10-01 10:31:51 +03:00
461809134c Merge pull request #722 from ONLYOFFICE/release/v6.5.0
Release/v6.5.0
2021-09-26 16:39:51 +03:00
6c2b1bf1a9 fix bug #52667 2021-09-22 16:14:58 +03:00
a705625321 All RoundTrips were rewritten 2021-09-22 14:26:10 +03:00
b75eeaefe6 Merge pull request #718 from ONLYOFFICE/fix/v6.5.0-fix-bugs-ppt
Fix/v6.5.0 fix bugs ppt
2021-09-21 09:22:25 +03:00
1d1054d762 Merge remote-tracking branch 'origin/fix/v6.5.0-fix-bugs-ppt' into feature/ppt_7 2021-09-17 12:59:52 +03:00
8a29a3e9e4 Merge branch 'release/v6.5.0' into develop 2021-09-17 11:56:03 +03:00
c5d85bc2b9 Correct and rewrite roundTrip theme 2021-09-14 16:23:34 +03:00
3c19d5e26e . 2021-09-03 17:26:35 +03:00
9ba942e3a1 fix merge 2021-09-03 17:16:09 +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
53b55326be Merge remote-tracking branch 'origin/hotfix/v6.4.1' into develop 2021-09-01 07:59:02 +03:00
ac98378b4b fix bad temp directory 2021-08-31 19:39:52 +03:00
50a765eb4c fix bug #52259 2021-08-30 15:08:24 +03:00
317d425ff2 [xlsb] add fill data 2021-08-23 14:51:25 +03:00
9098f18db2 Merge remote-tracking branch 'origin/release/v6.4.0' into develop 2021-08-23 10:24:30 +03:00
7950b821a0 fix bug #52046 2021-08-19 20:09:03 +03:00