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 |
troosan
|
64957d9ec8
|
Support for Mirrored page setup for docx
|
2017-11-05 01:58:17 +01:00 |
troosan
|
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 |
troosan
|
056f81078f
|
Merge branch 'develop' of https://github.com/troosan/PHPWord into
develop
Conflicts:
composer.json
|
2017-11-05 00:39:14 +01:00 |
troosan
|
aa4c3f8486
|
HTML writer fixes
* fixed HTML superscript, and added allcaps, smallcaps, and letter-spacing
* make Comment constructor attributes optional
|
2017-11-05 00:27:14 +01:00 |
troosan
|
15eeaa2574
|
Merge branch 'develop' into fix_php7_issues
|
2017-11-05 00:23:09 +01:00 |
troosan
|
835aa9c5a4
|
Merge branch 'develop' into fix_php7_issues
|
2017-11-05 00:22:04 +01:00 |
troosan
|
b926eec3bc
|
update changelog
|
2017-11-05 00:08:15 +01:00 |
troosan
|
03d4a36b9b
|
fixed HTML superscript, and added allcaps, smallcaps, and letter-spacing
|
2017-11-05 00:03:06 +01:00 |
troosan
|
601a2b6ec6
|
make Comment constructor attributes optional
|
2017-11-04 23:26:04 +01:00 |
troosan
|
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 |
troosan
|
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 |
lightbringer
|
3cbc65bae4
|
489: Fix z-index size too big in 64bit OS
|
2017-10-28 18:56:16 +11:00 |
troosan
|
0f50b6dc61
|
update documentation
|
2017-10-23 23:05:29 +02:00 |
troosan
|
a4df134a4c
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
samples/Sample_27_Field.php
src/PhpWord/Element/AbstractElement.php
src/PhpWord/Element/Comment.php
src/PhpWord/Element/TrackChange.php
src/PhpWord/Writer/Word2007/Element/AbstractElement.php
tests/PhpWord/Writer/Word2007/Part/StylesTest.php
|
2017-10-17 20:35:43 +02:00 |
Kai Gohegan
|
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 |
troosan
|
e6f4d0276a
|
Merge branch 'development' into fix_php7_issues
|
2017-09-27 01:09:23 +02:00 |
troosan
|
0beeb275fe
|
Add support for changing the document language (#1108)
|
2017-09-27 00:40:08 +02:00 |
troosan
|
75a3fb8e40
|
Improve code coverage
|
2017-09-27 00:27:33 +02:00 |
troosan
|
6657f0eec3
|
fix doc
|
2017-09-26 22:46:46 +02:00 |
troosan
|
7e3d9fb89a
|
replace @link with @see
|
2017-09-26 22:00:02 +02:00 |
troosan
|
cb469b973e
|
more fixes
|
2017-09-26 17:34:57 +02:00 |
troosan
|
e0a2c40fb4
|
fix failing test
|
2017-09-26 08:01:28 +02:00 |
troosan
|
5364feb6c8
|
remove cache-file option
|
2017-09-25 22:48:53 +02:00 |
troosan
|
3f3f398524
|
php-cs fix
|
2017-09-25 21:30:59 +02:00 |
troosan
|
0be9ae3353
|
Fix php-cs option
|
2017-09-25 07:00:58 +02:00 |
troosan
|
a8ade6d22d
|
general updates
Change "some" code to comply to php-cs rules
Update copyright year to 2010-2017
|
2017-09-24 22:15:42 +02:00 |