Commit Graph

122 Commits

Author SHA1 Message Date
b47e7155ab . 2022-02-09 18:35:24 +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
0275791b2c fix bug #54461 2021-12-14 17:39:19 +03:00
20eb11bf3f Merge remote-tracking branch 'origin/release/v7.0.0' into develop 2021-12-10 17:09:25 +03:00
e2bae2e187 fix bug #54461 2021-12-10 14:48:08 +03:00
6ae8c69efa Merge remote-tracking branch 'origin/release/v7.0.0' into develop 2021-11-24 18:31:08 +03:00
93ed14aba2 fix bug #53873 2021-11-23 12:43:58 +03:00
8b42268d7e Merge branch 'release/v7.0.0' into develop 2021-11-21 16:12:33 +03:00
b47c766b24 fix bug #53873 2021-11-19 14:25:46 +03:00
06079aa022 fix bug #53873 2021-11-18 19:44:23 +03:00
d5cbd33a59 restore 2021-10-12 12:45:01 +03:00
25fb7daee9 back 2021-10-12 12:26:32 +03:00
45b6929dd4 gitignore stuff 2021-10-08 16:35:14 +03:00
761ceab8d2 Merge commit '8c726e475a562e64a39d36cac32226249a3f7697' into feature/odf 2021-09-07 12:10:14 +03:00
14e3951d7e back vcxproj and add some math files to OdfWriter 2021-04-12 13:49:42 +03:00
ee296ff09d math conversation 2021-04-02 07:01:27 +03:00
4269b2862f gitignore + start of feature 2021-03-31 14:22:53 +03:00
8c986edafe for bug #46726 2021-03-17 09:57:26 +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
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
5c7a6c03b6 Ooxml, bin - chartEx, chartColors, chartStyle 2021-01-27 15:52:35 +03:00
00791b3966 Merge remote-tracking branch 'origin/release/v6.1.0' into develop 2020-11-10 19:33:42 +03:00
a749369c68 DocFormat - fix after testing 2020-11-06 00:42:21 +03:00
3a312ef626 Merge remote-tracking branch 'origin/release/v6.1.0' into develop 2020-11-02 11:16:17 +03:00
14ef010529 OdfFormat - fix user file 2020-10-29 21:17:39 +03:00
6f316910e2 TxtFormat - fix bug #45695 2020-10-27 19:57:11 +03:00
485c166a87 . 2020-10-24 12:10:30 +03:00
b6e188e5cf . 2020-10-10 22:19:48 +03:00
be2b16b68d DocFormat - glossary 2020-10-04 17:41:16 +03:00
eb332c0435 vs2015 2020-09-18 09:01:25 +03:00
5906e23c98 Merge remote-tracking branch 'origin/hotfix/v5.6.4' into fix/v6.0.0-from-v5.6.4 2020-09-04 06:35:23 +03:00
c455f1b420 TxtFormat - fix bug #46437 2020-09-02 21:52:10 +03:00
9d065c546a x2t - fix #45244, ... 2020-07-07 13:34:42 +03:00
f3a807b65e TxtFormat - fix bug #45695 2020-06-25 20:39:15 +03:00
c589d8fe8a [ios][x2t] up formats 2019-02-13 13:59:04 +03:00
815f96a50a Merge remote-tracking branch 'origin/hotfix/v5.2.8' into develop 2019-01-22 15:04:53 +03:00
792a0b35e1 [copyright] For bug 39644
Change address Latvian office.
2019-01-17 17:03:31 +03:00
288d208da3 [copyright] Update Copyright
2018 -> 2019
2019-01-17 16:44:11 +03:00
1493e4a949 [ios][x2t] fixed build 2018-09-28 16:36:12 +03:00
2192bff46b Merge remote-tracking branch 'origin/hotfix/v5.2.1' into develop 2018-09-28 14:39:43 +03:00
c7eb16fa64 x2t - clear compiling warnings 2018-09-28 14:30:27 +03:00
e26f836da7 Merge commit '69d2b12f5315e96442fc5a0620d4f4c2070c4e77' into develop 2018-09-24 18:34:51 +03:00
3e5fed8482 x2t - fix return codes 2018-09-24 17:48:02 +03:00
40476e7555 [ios][x2t] use system libxml2 2018-08-24 14:59:54 +03:00
a9a635747a [ios][x2t] fixed build 2018-08-24 12:50:05 +03:00
6341cdbbdb [x2t] Write application and company name from environment variable 2018-08-09 19:35:51 +03:00
537e774f79 . 2018-05-24 15:08:20 +03:00
449e3fc131 . 2018-05-03 16:18:33 +03:00
85549c5b20 . 2018-04-20 13:35:30 +03:00
684d697cae Remove xml2, agg, freestyle include folders from projects 2018-04-19 16:37:04 +03:00