615c1d5576
Merge branch 'stretch-table' of https://github.com/aoloe/php-PHPWord
...
into tableLayout
Conflicts:
src/PhpWord/Writer/Word2007/Style/Table.php
2018-02-13 23:29:53 +01:00
7ddaed240f
table->setStretch() optionally avoids the table to stretch to the page width (only for word output)
2018-02-13 23:24:15 +01:00
e846602d1e
fix null check
...
[ci skip]
2018-02-11 13:58:26 +01:00
ee95cf3df0
Merge pull request #1278 from troosan/fix_internal_links_in_html_output
...
Add HTML writer for Bookmarks + tests
2018-02-11 00:21:12 +01:00
377fb99fbc
Add HTML writer for Bookmarks + tests
2018-02-10 23:43:15 +01:00
b868c3370c
Merge pull request #1277 from troosan/fix_parsing_of_textbreaks
...
Fix parsing of textbreaks
2018-02-10 23:05:53 +01:00
91a8dd3b22
add parsing of p:br and add unit test
2018-02-10 22:16:55 +01:00
5b381bc0c0
Merge branch 'develop' into various_html_parsing_fixes
2018-02-09 21:53:48 +01:00
604e60cae9
Add support for Track changes ( #1262 )
...
* add changed information to HTML writer
* add missing writeFontStyle
* refactor track changes
* set the style
* update documentation and release note
* Update the changelog and doc
* fix scrutinizer issues
2018-02-09 21:49:11 +01:00
fd127ef9bb
Merge pull request #779 from samsullivan/imagesavealpha
...
Save PNG alpha information when using remote images.
2018-02-09 17:16:03 +01:00
304173c4d7
fix nested list
2018-02-08 07:02:28 +01:00
33739ea21c
cannot add list on textrun
2018-02-07 21:39:01 +01:00
46476d7101
update phpdoc
2018-02-07 07:09:27 +01:00
47c837abef
add unit tests
2018-02-06 23:31:56 +01:00
46a5f96d3b
fix parsing of table and p inside table cells
2018-02-06 23:16:32 +01:00
30183e2881
fix typo in comment
2018-01-26 18:31:35 +01:00
0425a25cdb
Add parsing of HTML links
2018-01-25 23:24:21 +01:00
8ed3cacfe8
Refactoring
2018-01-16 20:19:54 -02:00
4c68ebbe9d
Parse formatting inside HTML lists ( #1239 )
2018-01-13 10:03:53 +01:00
99b04f0353
fix reading of docx default style ( #1238 )
2018-01-12 23:42:22 +01:00
23693b403c
change impl to avoid compilation issue
2017-12-29 21:47:55 +01:00
400a8e65d3
rename 'Object' classes to 'ObjectElement' (php 7.2 compatibility) ( #1185 )
...
merge develop branch
2017-12-29 20:19:35 +01:00
d2b9e88047
add parsing of "align" HTML attribute
2017-12-29 15:16:03 +01:00
b614497ae6
fix dependencies to have 7.1 compatible build ( #1228 )
...
* add assertions in test methods without assertions
* loosen dependencies so 7.0 & 7.1 builds can succeed
* fix some scrutinizer errors
* update release date
2017-12-29 02:30:53 +01:00
fce1bf28c8
format code
2017-12-25 22:05:46 +01:00
512cf952ae
randomise temp directory name to avoid collisions
2017-12-25 20:42:37 +01:00
7250b15e74
Title can be added in Cell
2017-12-25 08:33:02 +01:00
3e6745f146
HTML image support & TextRun paragraph style ( #934 )
...
* Adding setParagraphStyle to Textrun for indentation
* Html Image support added
* fix formatting, add tests & update changelog
2017-12-21 00:03:52 +01:00
200c2f1eb0
Merge pull request #1019 from jun-i-corn/feature/EnablePasswordProtection
...
enable password protection (Word)
2017-12-20 22:00:34 +01:00
8929917677
Merge pull request #592 from ComputerTinker/ComputerTinker-FixEmptyDropdownEntry
...
Pad Empty Dropdown Entry
2017-12-19 21:53:59 +01:00
0f200d99f4
Merge pull request #1222 from carusogabriel/clean-elses
...
Clean elses
2017-12-19 21:41:21 +01:00
87acd3764b
Clean elses
2017-12-14 12:21:16 -02:00
5a57409df0
fix tests
2017-12-13 23:55:48 +01:00
ad38d4c20f
Merge branch 'feature/EnablePasswordProtection' of https://github.com/jun-i-corn/PHPWord into feature/EnablePasswordProtection
2017-12-13 23:25:32 +01:00
f7d2ad7201
formatting
2017-12-13 23:24:37 +01:00
9e029415cc
align with pull request submitted in PHPOffice/Commom
2017-12-13 23:17:01 +01:00
dc7cb1ee75
update changelog & doc
2017-12-13 22:48:58 +01:00
253b060241
correctly parse on/off values (w:val="true|false|1|0|on|off")
2017-12-13 07:47:49 +01:00
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
d4c6427418
Merge pull request #727 from irond/container_for_checkbox
...
Add TextRun as container for CheckBox
2017-12-05 21:28:59 +01:00
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
fd156bf12a
Merge branch 'develop' into html_br
2017-12-05 20:50:13 +01:00
9081ed9868
fix warning
2017-12-05 17:40:23 +01:00
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
05e2f1bf63
use non deprecated method
2017-12-05 08:02:23 +01:00
cfc89b7853
Merge branch 'develop' into feature/EnablePasswordProtection
2017-12-05 00:34:14 +01:00
274f50ce5a
Add unit tests & add array type checks
2017-12-04 22:30:49 +01:00
ca25eba8aa
Scrutinizer fixes
2017-11-26 22:55:37 +01:00
23bc837666
Scrutinizer fixes
2017-11-26 17:54:47 +01:00
911739a0b2
Merge branch 'develop' into odt_page_break
2017-11-26 00:36:37 +01:00
355027d854
PHP-CS fix, improve code coverage
2017-11-26 00:11:09 +01:00
5d928db916
Implement PageBreak for odt writer
2017-11-25 23:44:45 +01:00
5a5ae48bb6
also add w:bCs
2017-11-25 21:37:11 +01:00
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
2e562512f4
Add unit tests for PasswordEncoder
2017-11-24 14:45:05 +01:00
ad83196a05
move password encoding in separate class
...
fix PHPCS errors
add documentation
add sample
2017-11-23 22:49:21 +01:00
7b30145270
Merge branch 'develop' into feature/EnablePasswordProtection
2017-11-22 22:59:46 +01:00
6a5d2a636d
CS fixer warning
2017-11-22 09:02:16 +01:00
8d82340589
Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into release_0.14
2017-11-22 08:42:13 +01:00
38ea5ecb5f
fix wrong variable
2017-11-22 08:41:42 +01:00
e07195c512
add test, fix warnings
2017-11-22 08:14:22 +01:00
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
670d46e543
add getter/setter on paragraph for child spacing rule
2017-11-22 00:14:31 +01:00
ac357d10d5
Various fixes
...
- parse text inside list items
- add tests
- rename Cell widthType attribute to unit
2017-11-18 15:55:05 +01:00
b22208f810
format
2017-11-16 23:09:56 +01:00
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
9cd373806c
fix build
2017-11-16 17:47:48 +01:00
5ad68e0ba6
add tests, improve code coverage
2017-11-15 22:58:28 +01:00
8eb72c976a
add HTML table parsing
2017-11-15 22:49:13 +01:00
a01d22ed67
improve HTML parser and add tests
2017-11-11 23:49:23 +01:00
ff8234bce4
add tests
2017-11-10 23:37:02 +01:00
9e7e07d0bc
Add unit tests for Html parser
2017-11-09 00:41:56 +01:00
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
fcdafeedd4
Bring back b, i, <span style="font-style: italic;"> and <span style="font-weight: bold;">
2017-11-08 21:46:37 +01:00
13dc3bb2e4
Merge pull request #874 from bskrtich/develop
...
Fix incorrect image size between windows and mac.
2017-11-08 00:45:00 +01:00
5412df29fa
update doc
2017-11-08 00:34:22 +01:00
64a6505f70
Merge pull request #578 from ComputerTinker/develop
...
#574 Incorrect Constant Names in \Style\Font.php
2017-11-08 00:31:45 +01:00
610d91e041
call parent constructor in SDT and FormField
2017-11-08 00:27:58 +01:00
1b9c1d921b
format
2017-11-07 23:13:41 +01:00
75bf84fa48
Merge pull request #887 from taophp/patch-1
...
Fix division by zero
2017-11-07 22:34:49 +01:00
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
1e9203adc9
add unit tests
2017-11-06 21:47:02 +01:00
9c1c544954
stylization code
2017-11-06 20:53:08 +01:00
9ac9016f50
added functionality specified alias and tag
2017-11-06 20:53:08 +01:00
a7a35c688d
Allow reading of TargetMode for external images
2017-11-05 22:48:04 +01:00
200d846f61
implement paragraph textAlignment
2017-11-05 21:39:10 +01:00
92fc54992a
fix end of line space
2017-11-05 08:54:52 +01:00
ce377b9b58
fix php-cs error
2017-11-05 02:16:04 +01:00
8c7ed19d62
Support for Mirrored page setup for docx ( #1183 )
2017-11-05 02:07:53 +01:00
de9268ae12
Merge pull request #1150 from kaigoh/patch-2
...
pad the $args array instead of ignoring errors
2017-11-05 00:54:20 +01:00
835aa9c5a4
Merge branch 'develop' into fix_php7_issues
2017-11-05 00:22:04 +01:00
03d4a36b9b
fixed HTML superscript, and added allcaps, smallcaps, and letter-spacing
2017-11-05 00:03:06 +01:00
601a2b6ec6
make Comment constructor attributes optional
2017-11-04 23:26:04 +01:00
f4697ab6e1
Merge pull request #1178 from lightbringer1991/489-fix-wrappingStyle-z-index-in-64bit-OS
...
489: Fix z-index size too big in 64bit OS
2017-11-04 22:44:44 +01:00
0459670a9c
Enable php-cs-fixer in build & fix resulting warnings ( #1099 )
...
* enable php 7.1 build
* upgrade to dompdf/dompdf 0.8.*
* update phpunit & hide output during tests
* run code coverage analysis on 1 build only
* Add php-cs
* Update Copyright
2017-11-04 22:44:12 +01:00
3cbc65bae4
489: Fix z-index size too big in 64bit OS
2017-10-28 18:56:16 +11:00
87a355bb82
Bring back b, i, <span style="font-style: italic;"> and <span style="font-weight: bold;">
2017-10-21 00:07:52 +02:00
4084d4f191
Update AbstractContainer.php
...
Suppressing the PHP warning doesn't seem to work. Padding the $args array does.
2017-10-09 13:19:23 +01:00
e6f4d0276a
Merge branch 'development' into fix_php7_issues
2017-09-27 01:09:23 +02:00
0beeb275fe
Add support for changing the document language ( #1108 )
2017-09-27 00:40:08 +02:00
troosan
ale rimoldi
Nicolas Dermine
Gabriel Caruso
samimussbach
Maxim
SRG Group
Michael Spahn
Nilton
sergeizelenyi
lightbringer
Kai Gohegan