682 Commits

Author SHA1 Message Date
troosan
ad38d4c20f Merge branch 'feature/EnablePasswordProtection' of https://github.com/jun-i-corn/PHPWord into feature/EnablePasswordProtection 2017-12-13 23:25:32 +01:00
troosan
f7d2ad7201 formatting 2017-12-13 23:24:37 +01:00
troosan
9e029415cc align with pull request submitted in PHPOffice/Commom 2017-12-13 23:17:01 +01:00
troosan
dc7cb1ee75 update changelog & doc 2017-12-13 22:48:58 +01:00
troosan
253b060241 correctly parse on/off values (w:val="true|false|1|0|on|off") 2017-12-13 07:47:49 +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
fd156bf12a
Merge branch 'develop' into html_br 2017-12-05 20:50:13 +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
cfc89b7853
Merge branch 'develop' into feature/EnablePasswordProtection 2017-12-05 00:34:14 +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
911739a0b2
Merge branch 'develop' into odt_page_break 2017-11-26 00:36:37 +01:00
troosan
355027d854 PHP-CS fix, improve code coverage 2017-11-26 00:11:09 +01:00
Michael Spahn
5d928db916 Implement PageBreak for odt writer 2017-11-25 23:44:45 +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
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
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
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
a01d22ed67 improve HTML parser and add tests 2017-11-11 23:49:23 +01:00
troosan
ff8234bce4 add tests 2017-11-10 23:37:02 +01: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
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
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
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
1e9203adc9 add unit tests 2017-11-06 21:47:02 +01:00
sergeizelenyi
9c1c544954 stylization code 2017-11-06 20:53:08 +01:00