Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,755 Commits 1 Branch 0 Tags 12 MiB
Commit Graph

1755 Commits

Author SHA1 Message Date
Martin Hanzl e19de8e8a4 #1253 - add explanatory comment 2018-10-11 11:28:44 +02:00
Martin Hanzl 7eb19c8f76 add test case for issue #1253 2018-10-11 09:40:12 +02:00
Martin Hanzl 7f55816eba detect actual filename of document xml (prevent mismatching document22.xml as in #1253) 2018-10-11 08:55:38 +02:00
troosan 18760620b3
Merge pull request #1445 from FCG-Group/writer_fixes_valign_watermark 
writer / word2007 / support valign and watermark without paragraph
 2018-10-03 23:28:05 +02:00
troosan 8a20678a7a
Merge pull request #1455 from vblinden/feature-dutch-language 
Added Dutch (nl-NL)
 2018-10-03 23:17:32 +02:00
troosan 9d65414684
Merge pull request #1476 from kisabelle/patch-1 
Add documentation for enabling evenAndOddHeaders
 2018-10-03 23:15:31 +02:00
kisabelle 45ee8b7faf
Add documentation for enabling evenAndOddHeaders 2018-09-21 11:53:16 -07:00
vblinden d8c0441975 Fix indenting 2018-09-03 13:32:00 +02:00
vblinden 683d91990f
Added Dutch (nl-NL) 2018-09-03 12:30:05 +02:00
Maxim Bulygin 677e3f6a19 writer / word2007 / support valign and watermark withouth paragraph 2018-07-31 18:25:29 +03:00
Abubakkar Rangara 4b9ae18d5a Adding table layout to the generated HTML - fixed php-cs-fixer error 2018-07-24 14:23:23 +01:00
Abubakkar Rangara e61c40e71d Adding table layout to the generated HTML if element has layout style. This is useful when using creating PDF from PHPWord (e.g. using dompdf), otherwise the PDF does not contain any layout for table. 2018-07-24 13:59:16 +01:00
troosan aa49536e3e
Merge branch 'develop' into add-getVariableCount-method 2018-07-21 14:48:24 +02:00
troosan 2bfd82e229
Merge pull request #1439 from PHPOffice/master 
Merge pull request #1429 from PHPOffice/develop [ci skip]
 2018-07-21 14:31:53 +02:00
troosan d09da0b6f2
Update CHANGELOG.md 2018-07-19 02:01:40 +02:00
troosan 18c26f9218
Merge pull request #1436 from begnini/fixing_title 
HTML Title Writer loses text when Title contains a TextRun instead a string.
 2018-07-19 02:00:36 +02:00
troosan f376f207b8
Merge pull request #1269 from nicoder/improve-cloneBlock-regex 
Fix regex in `cloneBlock` function
 2018-07-19 01:43:37 +02:00
troosan 1951db58c1 update changelog 2018-07-19 01:16:25 +02:00
troosan e07c6559a9 adapt test 2018-07-19 00:52:22 +02:00
Humberto Pereira 8c62cea580 Fix Writer losing text when Title contains a TextRun instead a string. 2018-07-17 21:10:53 -04:00
Humberto Pereira f5e3807654 Improving Style Parsing - handling Heading style 2018-07-17 19:35:31 -04:00
Tom-Magill 139242612d
Update Chart.php 2018-07-17 14:11:55 +01:00
Tom-Magill 0c3eb4bafc
Update Chart.php 2018-07-17 14:10:02 +01:00
troosan affccc7937 Merge branch 'improve-cloneBlock-regex' of https://github.com/nicoder/PHPWord into fix_clone_block 2018-07-17 08:03:35 +02:00
Nicolas Dermine 198165ce59
allow to override TemplateProcessor#ensureUtf8Encoded 
the method is `protected`,
but since it is called with `self` instead of `static`
it does not allow for subclasses to override it
 2018-07-16 19:49:30 +02:00
troosan dfa2f36cad
Merge pull request #1429 from PHPOffice/develop 
Merge 0.15 to master
 2018-07-14 18:59:43 +02:00
troosan 4c9e75088a alias for develop branch 
[ci skip]
 2018-07-14 18:36:29 +02:00
troosan fe454dbaf3
Merge pull request #1428 from troosan/parse_short_lang_code 
Allow passing short lang code
 2018-07-14 18:11:50 +02:00
troosan 27946cad30
Merge pull request #1413 from jgpATs2w/develop 
allows decimal numbers in line-height style
 2018-07-14 17:53:14 +02:00
troosan 8fa1d4f224 run checks with php 7.0 2018-07-14 17:47:34 +02:00
troosan 87498e43e1 Allow passing short lang code 2018-07-14 17:21:30 +02:00
troosan 54155bf5a9
Update Sample_30_ReadHTML.html 2018-07-14 17:16:24 +02:00
troosan af4f834149
Merge branch 'develop' into develop 2018-07-14 17:12:45 +02:00
troosan 9ee99d2c45
Merge pull request #1324 from troosan/parse_drawings 
Support reading of w:drawing for documents produced by word 2011+
 2018-07-14 10:23:44 +02:00
troosan de83da2bbf
Merge branch 'develop' into parse_drawings 2018-07-14 03:30:11 +02:00
troosan 6475812e82 fix documentation 2018-07-14 03:28:09 +02:00
troosan 32907215ed fix phpstan issues 2018-07-14 02:54:17 +02:00
troosan adc1428607 use PasswordEncoder from phpoffice/common instead 2018-07-14 02:51:08 +02:00
troosan e028aef6d2 update to final phpoffice/common version 2018-07-14 02:26:47 +02:00
smaug1985 3906be19ee Added Support for Indentation & Tabs on RTF Writer. (#1405) 
* Added Support for Indentation  & Tabs on RTF Writer.
* add decimal tab writer + tests
* Update CHANGELOG.md
 2018-07-14 02:13:45 +02:00
troosan cdc18522a2
Merge pull request #1427 from troosan/libxml_disable_entity_loader 
disable entity loader before parsing XML to avoid XXE injection
 2018-07-14 01:01:49 +02:00
troosan 4c4c6f43ca remove options not compatible with latest phpunit version 2018-07-14 00:59:54 +02:00
troosan 96b21badaf update changelog 2018-07-14 00:54:41 +02:00
troosan 536a1b89d7 disable entity loader 2018-07-14 00:50:01 +02:00
Jonathan Jefferies 94cf1aecb6 Require `ext-zip` for development (#1419) 
* Require `ext-zip` for development
* Require `ext-gd` for development
 2018-07-14 00:12:34 +02:00
Javier Garcia c93880b125 clean sample resource 2018-06-13 18:14:13 +02:00
Javier Garcia 2593e9e200 Merge branch 'develop' of github.com:jgpATs2w/PHPWord into develop 2018-06-13 17:57:55 +02:00
Javier Garcia fe647f6e55 fix when style line-height size comes in decimal number 2018-06-13 17:41:17 +02:00
troosan 4fa945561f
Merge pull request #1352 from troosan/column_width_for_odt 
write column width in ODT writer
 2018-06-03 23:09:33 +02:00
troosan 5b9719071e remove unused imports 2018-06-03 22:36:30 +02:00