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

1653 Commits

Author SHA1 Message Date
troosan 1c20a4ed22 update changelog 2018-11-20 21:22:50 +01:00
troosan 79a7d5fe0e Merge remote-tracking branch 'upstream/develop' into rebase_pull_request 2018-11-20 21:17:51 +01:00
troosan 55da063ed9 Merge remote-tracking branch 'upstream/develop' into rebase_pull_request 2018-11-20 21:15:26 +01:00
troosan 586f45efea
Merge pull request #1493 from Patrick64/develop 
RTF writer: Round getPageSizeW and getPageSizeH to avoid decimals
 2018-11-20 21:06:29 +01:00
troosan 718f84c8f6 Merge remote-tracking branch 'Patrick64/PHPWord/develop' into round_page_size_for_rtf 2018-11-20 20:00:26 +01:00
troosan b5865b2fc2 update changelog 2018-11-20 19:59:30 +01:00
Ralph02 d9d79c0666 RTF writer: Round getPageSizeW and getPageSizeH to avoid decimals 2018-11-20 19:57:35 +01:00
troosan 1a03a6cf58
Merge pull request #1512 from carusogabriel/patch-1 
Fix typo in the PR template
 2018-11-19 09:08:54 +01:00
troosan 25348c6e49
Merge pull request #1504 from gimler/patch-1 
[Doc] add/align possible values from class constant
 2018-11-19 09:08:28 +01:00
Gabriel Caruso 9b174e52c1
Fix typo in the PR template 2018-11-19 01:35:03 -02:00
troosan 49eb9d1f17
Fix non auto line spacing (#1508) 
* Only add 240 twips when in auto lineRule
 2018-11-17 15:03:29 +01:00
Christopher ARZUR ea6edf95cc Added PHP 7.3 support for travis (#1495) 
* Added PHP 7.3 support for travis
* mark php 7.3 as failable
 2018-11-17 00:35:57 +01:00
troosan 925e9e0919
remove trailing spaces 2018-11-16 23:33:38 +01:00
troosan c51b6febc0
rename variable to comply with rules 2018-11-16 23:00:23 +01:00
troosan 9f28ece4e9
Fix path to test document 2018-11-16 22:40:37 +01:00
Gordon Franke 768a070715
add/align possible values from class constant 2018-11-12 08:02:15 +01:00
Ralph02 28505b0b77 RTF writer: Round getPageSizeW and getPageSizeH to avoid decimals 2018-10-25 11:23:53 +01:00
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
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
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
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
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