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

813 Commits

Author SHA1 Message Date
Progi1984 439f013e09 Merge pull request #386 from PHPOffice/revert-385-patch-1 
Revert "Fix page break sample code block"
 2014-09-29 17:01:50 +02:00
Progi1984 57c3235365 Revert "Fix page break sample code block" 2014-09-29 17:01:43 +02:00
Progi1984 d39ba21a98 Merge pull request #385 from jaggyspaghetti/patch-1 
Fix page break sample code block
 2014-09-29 17:01:35 +02:00
Jaggy Gauran 7869912348 Fix page break sample code block 2014-09-29 03:07:54 +08:00
Progi1984 d8fbac6407 Merge pull request #289 from chrissharkman/patch-1 
Update elements.rst
 2014-06-24 10:30:46 +02:00
chrissharkman f8389c5d35 Update elements.rst 
it's not perfect, but better than nothing.
 2014-06-24 09:27:18 +02:00
Ivan Lanin 38d3d7be20 Bugfix for #257: HTML Reader: `<p>` and header tags puts no output 2014-06-02 18:30:51 +07:00
Progi1984 39cf5d0b4a Merge pull request #256 from PHPOffice/develop 
PR 0.11.0
 2014-06-01 16:45:09 +02:00
Ivan Lanin ce21e8d9e8 PR 0.11.0 #225 2014-06-01 21:00:02 +07:00
Ivan Lanin e0d2c6584c Refactor IOFactory and AbstractContainer to allow more dynamic inclusion. 2014-06-01 01:08:06 +07:00
Ivan Lanin 9839222492 QA: Additional unit tests 2014-05-31 22:28:13 +07:00
Ivan Lanin 269def4b9d Merge remote-tracking branch 'upstream/develop' into develop 2014-05-31 13:37:00 +07:00
Ivan Lanin 2205377259 #245: Basic table support in RTF writer 2014-05-31 13:33:38 +07:00
Ivan Lanin e7540c079e Add $nestedLevel to elements 2014-05-31 09:29:09 +07:00
Ivan Lanin 4fdc7b8e6e Merge pull request #254 from ivanlanin/develop 
Basic HTML Reader
 2014-05-31 06:20:01 +07:00
Ivan Lanin 022cdeb570 Documentation updates and test fix for #254 2014-05-31 03:28:58 +07:00
Ivan Lanin ec85d7d641 #80: Basic HTML reader 2014-05-31 03:06:11 +07:00
Ivan Lanin 0164e37873 Decompose Shared\Html 2014-05-31 02:01:09 +07:00
Ivan Lanin 4f9399899a QA: Docblock improvements and -q parameter for phpdoc 2014-05-30 20:44:06 +07:00
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