Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,144 Commits 1 Branch 0 Tags 12 MiB
Commit Graph

1144 Commits

Author SHA1 Message Date
Ivan Lanin 900a96addf Bugfix for #236 (OpenOffice crash when opening DOCX) and paragraph style refactoring 2014-05-30 19:59:57 +07:00
Ivan Lanin d3ac5b1fa1 Merge branch '#193' into develop 2014-05-30 13:19:51 +07:00
Ivan Lanin 5c2c687efd #193: Heading numbering 2014-05-30 13:19:10 +07:00
Ivan Lanin a57b28de8f Some adjustments for the new `Line` element #253 2014-05-30 01:05:55 +07:00
Bas-Jan 't Jong 748e16473d Final try to resolve Travis build errors 2014-05-29 18:07:01 +02:00
Bas-Jan 't Jong 0103787873 Second attempt to resolve Travis build errors 2014-05-29 17:44:14 +02:00
Bas-Jan 't Jong 54af93a20a Fixed some Travis build errors 2014-05-29 17:11:54 +02:00
Bas-Jan 't Jong 1580113d7b Added Line element 2014-05-29 16:44:00 +02:00
Ivan Lanin 0fcea8209f Merge pull request #252 from ivanlanin/rtf 
Passed Travis. Merged.
 2014-05-29 18:32:00 +07:00
Ivan Lanin 4bb3ffe5bd Apply #250 fix a minor typo in the text styles example 2014-05-29 18:13:57 +07:00
Ivan Lanin 7a42802b48 RTF reader: Unit tests and some improvements 2014-05-29 18:02:49 +07:00
Ivan Lanin 7c2ad59530 Merge branch 'develop' into rtf 2014-05-29 16:54:13 +07:00
Ivan Lanin e81d92e265 Update changelog, docs, and unit tests for new `Field` element #251 2014-05-29 16:25:39 +07:00
Ivan Lanin 2d88ea22b4 RTF Reader: Split control parsers into functions 2014-05-29 15:09:02 +07:00
Bas-Jan 't Jong 8f74f26fd4 Travis build error fix 2014-05-28 20:35:24 +02:00
Bas-Jan 't Jong 079d08e94a Added Field Element 2014-05-28 17:59:44 +02:00
Bas-Jan 't Jong 9e99080777 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord.git into develop 2014-05-28 17:37:48 +02:00
Ivan Lanin f9a1f34dcb Merge branch 'rtfreader' into rtf 2014-05-28 21:36:30 +07:00
Ivan Lanin 086ac9d363 Merge remote-tracking branch 'upstream/develop' into develop 2014-05-28 21:30:14 +07:00
Ivan Lanin 87f071d1b6 #72: Basic RTF Reader 2014-05-28 21:27:20 +07:00
Progi1984 8c7efde9be Merge pull request #250 from zacharyrankin/master 
Fix a minor typo in the text styles example
 2014-05-28 08:51:29 +02:00
Progi1984 eb32ff2e15 #244 : Fix typo in recipe sample 2014-05-28 08:50:09 +02:00
Zachary Rankin 8ab6f64add Fix a minor typo in the text styles example 2014-05-27 22:05:34 -07:00
Ivan Lanin 88f6518406 Init VERSION and improve requirement checking 2014-05-28 07:42:50 +07:00
Bas-Jan 't Jong 3085445081 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord.git into develop 2014-05-26 21:25:07 +02:00
Ivan Lanin d7f3d25b2a #248 More flexible checking for float value 2014-05-27 01:08:54 +07:00
Ivan Lanin d9a2c4c3ca Bugfix #248: Image: `marginLeft` and `marginTop` cannot accept float value 2014-05-27 00:46:18 +07:00
Bas-Jan 't Jong 36080c14ca Merge branch 'develop' of https://github.com/PHPOffice/PHPWord.git into develop 2014-05-25 22:57:01 +02:00
Ivan Lanin 92c7a24c38 QA: Additional unit tests and docblock fixes 2014-05-25 23:08:02 +07:00
Ivan Lanin dc6c487cd0 Fix test error 2014-05-25 00:43:38 +07:00
Ivan Lanin 1e9a498ca2 QA: Reduce some complexities: https://scrutinizer-ci.com/g/PHPOffice/PHPWord/code-structure/develop?elementType=operation 2014-05-24 15:38:41 +07:00
Ivan Lanin 5ff47f44e9 QA: Misc. bugfixes and docblock improvements 2014-05-24 11:11:12 +07:00
Ivan Lanin e24c16f14b Merge remote-tracking branch 'upstream/master' into develop 2014-05-24 10:59:01 +07:00
Ivan Lanin 248d82d3c3 Add two recipes 2014-05-24 10:53:09 +07:00
Ivan Lanin f1eded7b33 Merge branch 'master' into develop 2014-05-24 10:40:54 +07:00
Ivan Lanin 991016a48b Additional writer test 2014-05-24 10:05:39 +07:00
Ivan Lanin a65c3c3cf1 RTF Writer: Ability to write image 2014-05-23 19:22:40 +07:00
Ivan Lanin e00b551aa2 Breakdown HTML Writer to head and body parts and more cyclomatic complexity reductions 2014-05-23 16:48:11 +07:00
Ivan Lanin d79ca9ae31 Reduce cyclomatic complexity on DocumentProperties and Word2007 Document Writer. 2014-05-23 10:19:57 +07:00
Ivan Lanin 6351792140 Merge remote-tracking branch 'upstream/develop' into develop 2014-05-23 09:07:32 +07:00
Ivan Lanin 045cc87d2d Merge branch 'rtf' into develop 2014-05-23 09:06:15 +07:00
Ivan Lanin e46fecffdd RTF Writer: Ability to write document properties 2014-05-23 09:05:10 +07:00
Roman Syroeshko 571e0841d4 [CHANGED] License has been split into two files as recommended here http://www.gnu.org/licenses/gpl-howto.en.html. 2014-05-22 21:43:19 +04:00
Roman Syroeshko 73bdd4f5a3 [CHANGED] License has been split into two files as recommended here http://www.gnu.org/licenses/gpl-howto.en.html. 2014-05-22 21:39:14 +04:00
Roman Syroeshko 23047c0bf7 [CHANGED] License has been split into two files as recommended here http://www.gnu.org/licenses/gpl-howto.en.html. 2014-05-22 20:49:56 +04:00
Roman Syroeshko 71a1db8650 [CHANGED] License has been split into two files as recommended here http://www.gnu.org/licenses/gpl-howto.en.html. 2014-05-22 20:36:16 +04:00
Ivan Lanin 2086e9e262 Refactor: Reduce cyclomatic complexity 2014-05-22 22:01:21 +07:00
Ivan Lanin fbce1c8fc9 #244: Enable "image float left" 2014-05-22 00:37:50 +07:00
Progi1984 86369ad89b Merge pull request #247 from ivanlanin/master 
PR 0.10.1
 2014-05-21 19:13:01 +02:00
Ivan Lanin 3e0d37ec94 Update changelog 2014-05-22 00:05:12 +07:00