Commit Graph

1562 Commits

Author SHA1 Message Date
troosan 0354e4e4a1
Merge pull request #480 from fergusean/patch-1
Skip inquiring PHP for temp directory when it's user defined
2017-11-22 00:24:03 +01:00
troosan 670d46e543 add getter/setter on paragraph for child spacing rule 2017-11-22 00:14:31 +01:00
troosan ac357d10d5 Various fixes
- parse text inside list items
- add tests
- rename Cell widthType attribute to unit
2017-11-18 15:55:05 +01:00
troosan b22208f810 format 2017-11-16 23:09:56 +01:00
troosan bc4750dd7c
Merge pull request #1060 from Mord1n/patch-1
ODT Writer automatic-styles should be closed before opening master-styles.
2017-11-16 23:08:13 +01:00
troosan ab9a3dbc63 fix warning 2017-11-16 18:03:37 +01:00
troosan 9cd373806c fix build 2017-11-16 17:47:48 +01:00
troosan 5ad68e0ba6 add tests, improve code coverage 2017-11-15 22:58:28 +01:00
troosan 8eb72c976a add HTML table parsing 2017-11-15 22:49:13 +01:00
troosan c9350d3e80 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into bring_back_bold_and_italic 2017-11-11 23:52:40 +01:00
troosan a01d22ed67 improve HTML parser and add tests 2017-11-11 23:49:23 +01:00
troosan 3f8892ed91
Merge pull request #1168 from FBnil/bring_back_bold_and_italic
Html::addHTML should parse <b> <i> <u>
2017-11-11 00:31:52 +01:00
troosan e72446442b fix format 2017-11-10 23:47:10 +01:00
troosan ff8234bce4 add tests 2017-11-10 23:37:02 +01:00
troosan d8dcc770a9 Merge branch 'bring_back_bold_and_italic' of https://github.com/FBnil/PHPWord into bring_back_bold_and_italic 2017-11-10 21:47:57 +01:00
troosan 8bb9a99975 fix warning 2017-11-10 21:47:45 +01:00
troosan 07c9d9fd00 Add unit tests for Html parser 2017-11-10 21:47:44 +01:00
Nilton 379df3cebd Bring back b, i, <span style="font-style: italic;"> and <span style="font-weight: bold;"> 2017-11-10 21:47:43 +01:00
ejuhjav e4fe0c6673 Update elements.rst
Fixed a typo in the $lineStyle example (defined previously as $linestyle but used as $lineStyle)
2017-11-10 21:47:43 +01:00
troosan 266817ecac
Merge pull request #1188 from gabriel-caruso/phpunit
Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase
2017-11-10 11:21:42 +01:00
troosan 6328b83388 fix warning 2017-11-09 23:07:17 +01:00
Gabriel Caruso ba6c03e06d Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase 2017-11-09 06:36:47 -02:00
troosan 9e7e07d0bc Add unit tests for Html parser 2017-11-09 00:41:56 +01:00
troosan c8b55b8e59 Merge branch 'bring_back_bold_and_italic' of https://github.com/FBnil/PHPWord into bring_back_bold_and_italic 2017-11-08 21:46:55 +01:00
Nilton fcdafeedd4 Bring back b, i, <span style="font-style: italic;"> and <span style="font-weight: bold;"> 2017-11-08 21:46:37 +01:00
ejuhjav 778a77ecff Update elements.rst
Fixed a typo in the $lineStyle example (defined previously as $linestyle but used as $lineStyle)
2017-11-08 21:46:37 +01:00
troosan 7b9e262e44 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into release_0.14 2017-11-08 00:45:36 +01:00
troosan ebd4741774 update changelog 2017-11-08 00:45:14 +01:00
troosan 13dc3bb2e4
Merge pull request #874 from bskrtich/develop
Fix incorrect image size between windows and mac.
2017-11-08 00:45:00 +01:00
troosan 5412df29fa update doc 2017-11-08 00:34:22 +01:00
troosan 64a6505f70
Merge pull request #578 from ComputerTinker/develop
#574 Incorrect Constant Names in \Style\Font.php
2017-11-08 00:31:45 +01:00
troosan 610d91e041 call parent constructor in SDT and FormField 2017-11-08 00:27:58 +01:00
troosan 0bd396b5cb
Merge pull request #724 from garethellis36/fix-html-tables
Resolves certain HTML tags rendering no output
2017-11-07 23:14:46 +01:00
troosan 9634352b0f update changelog 2017-11-07 23:13:41 +01:00
troosan 1b9c1d921b format 2017-11-07 23:13:41 +01:00
troosan 75bf84fa48
Merge pull request #887 from taophp/patch-1
Fix division by zero
2017-11-07 22:34:49 +01:00
troosan ac4180ef7d
Merge pull request #1016 from jun-i-corn/feature/DefaultValueForDropDownSDT
allow setValue() for SDTs
2017-11-07 22:23:53 +01:00
troosan 56a3a53e7b add unit test 2017-11-07 22:11:31 +01:00
troosan 5ddb3f0b77 Merge remote-tracking branch 'origin/develop' into tmp
Conflicts:
	src/PhpWord/Writer/Word2007/Element/SDT.php
2017-11-07 17:43:22 +01:00
troosan 9653619c48
Merge pull request #980 from sergeizelenyi/dev-sdt
Add support for alias and tag on SDT elements
2017-11-06 22:09:55 +01:00
troosan 1e9203adc9 add unit tests 2017-11-06 21:47:02 +01:00
troosan 603bb9b02b Merge branch 'dev-sdt' of https://github.com/sergeizelenyi/PHPWord into dev-sdt 2017-11-06 20:53:29 +01:00
sergeizelenyi 9c1c544954 stylization code 2017-11-06 20:53:08 +01:00
sergeizelenyi 9ac9016f50 added functionality specified alias and tag 2017-11-06 20:53:08 +01:00
troosan a7a35c688d Allow reading of TargetMode for external images 2017-11-05 22:48:04 +01:00
troosan 200d846f61 implement paragraph textAlignment 2017-11-05 21:39:10 +01:00
troosan 92fc54992a fix end of line space 2017-11-05 08:54:52 +01:00
troosan ce377b9b58 fix php-cs error 2017-11-05 02:16:04 +01:00
troosan 67ca6ec1fd Merge branch 'develop' of https://github.com/troosan/PHPWord into develop 2017-11-05 02:10:27 +01:00
troosan 8c7ed19d62
Support for Mirrored page setup for docx (#1183) 2017-11-05 02:07:53 +01:00