Commit Graph

1444 Commits

Author SHA1 Message Date
troosan 194e5c47e4 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into develop 2017-12-05 21:39:35 +01:00
troosan f6dd78daa6 update doc and changelog 2017-12-05 21:39:28 +01:00
troosan 88bbe49d01
Merge pull request #1217 from troosan/html_br
Added support for linebreaks <br/> in Shared\Html::addHtml()
2017-12-05 21:38:55 +01:00
troosan d4c6427418
Merge pull request #727 from irond/container_for_checkbox
Add TextRun as container for CheckBox
2017-12-05 21:28:59 +01:00
troosan 0c7593ba10
Merge pull request #582 from SSchwaiger/patch-2
A chart object can also be added to a table cell
2017-12-05 21:04:07 +01:00
troosan 905029a59e
Merge branch 'develop' into html_br 2017-12-05 20:50:33 +01:00
troosan fd156bf12a
Merge branch 'develop' into html_br 2017-12-05 20:50:13 +01:00
troosan c079bf7f10 update changelog 2017-12-05 20:47:34 +01:00
troosan 9081ed9868 fix warning 2017-12-05 17:40:23 +01:00
troosan 8f512bf618 Merge branch 'develop-html-br' of https://github.com/anrikun/PHPWord
into develop

Conflicts:
	src/PhpWord/Shared/Html.php
2017-12-05 17:33:51 +01:00
troosan 05e2f1bf63 use non deprecated method 2017-12-05 08:02:23 +01:00
troosan 3b7b894290
Merge branch 'develop' into feature/EnablePasswordProtection 2017-12-05 00:35:29 +01:00
troosan cfc89b7853
Merge branch 'develop' into feature/EnablePasswordProtection 2017-12-05 00:34:14 +01:00
troosan 86115b9e2d update installation instructions 2017-12-05 00:14:57 +01:00
troosan 3b6f9cea21 Allow use of stdlib 3.x 2017-12-04 22:31:10 +01:00
troosan 274f50ce5a Add unit tests & add array type checks 2017-12-04 22:30:49 +01:00
troosan ca25eba8aa Scrutinizer fixes 2017-11-26 22:55:37 +01:00
troosan 23bc837666 Scrutinizer fixes 2017-11-26 17:54:47 +01:00
troosan 6a460c292d
Merge pull request #1206 from troosan/odt_page_break
Implement PageBreak for the ODText writer
2017-11-26 00:39:25 +01:00
troosan def9123575
Merge branch 'develop' into odt_page_break 2017-11-26 00:37:16 +01:00
troosan 911739a0b2
Merge branch 'develop' into odt_page_break 2017-11-26 00:36:37 +01:00
troosan 01008a591b update changelog 2017-11-26 00:35:21 +01:00
troosan 355027d854 PHP-CS fix, improve code coverage 2017-11-26 00:11:09 +01:00
troosan 2ea9ffbdd4 Merge branch 'develop' of https://github.com/cookiekiller/PHPWord into odt_page_break 2017-11-25 23:45:04 +01:00
troosan 72a6b1b19f Add unit test 2017-11-25 23:44:46 +01:00
Michael Spahn 5d928db916 Implement PageBreak for odt writer 2017-11-25 23:44:45 +01:00
troosan 6faddc684a
Merge pull request #1205 from troosan/update_fields
Allow to force an update of all fields on opening a document
2017-11-25 21:56:17 +01:00
troosan 5a5ae48bb6 also add w:bCs 2017-11-25 21:37:11 +01:00
troosan ab5d4468f9 add the updateFields option on document settings
When set to true, word will ask you to update the fields in the document
when you open the document.
2017-11-25 01:48:30 +01:00
troosan 3429c443ad
Create PULL_REQUEST_TEMPLATE.md 2017-11-25 01:46:20 +01:00
troosan 446d3478e4
Create ISSUE_TEMPLATE.md 2017-11-25 01:45:27 +01:00
troosan 2e562512f4 Add unit tests for PasswordEncoder 2017-11-24 14:45:05 +01:00
troosan ad83196a05 move password encoding in separate class
fix PHPCS errors
add documentation
add sample
2017-11-23 22:49:21 +01:00
troosan 7b30145270
Merge branch 'develop' into feature/EnablePasswordProtection 2017-11-22 22:59:46 +01:00
troosan ffa9c156d7 fix formatting 2017-11-22 22:31:59 +01:00
troosan b4b87cd1dc CS fixer stronger checks 2017-11-22 09:43:35 +01:00
troosan 6a5d2a636d CS fixer warning 2017-11-22 09:02:16 +01:00
troosan 8d82340589 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into release_0.14 2017-11-22 08:42:13 +01:00
troosan 38ea5ecb5f fix wrong variable 2017-11-22 08:41:42 +01:00
troosan e07195c512 add test, fix warnings 2017-11-22 08:14:22 +01:00
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