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

1597 Commits

Author SHA1 Message Date
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
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
troosan 682b88bd28 Merge commit '4e37afa15da62cdd695a18db2a40d86615086e9d' into 
column_width_for_odt

# Conflicts:
#	CHANGELOG.md
 2018-06-03 21:24:12 +02:00
troosan da43a880e3 Address scrutinizer issues 2018-06-03 00:32:21 +02:00
troosan d9ddc162a3 write column width in ODT writer 2018-06-03 00:32:20 +02:00
troosan 844a7c95ba
Merge pull request #1391 from omarpiani/develop 
Added Italian to supported languages
 2018-06-01 09:13:40 +02:00
troosan 4e37afa15d
Update CHANGELOG.md 2018-05-31 20:10:49 +02:00
troosan 0bd7c0b301
Add constants for Italian 2018-05-31 19:50:43 +02:00
Omar Piani aa27109101
Update Language.php 2018-05-31 11:43:20 +02:00
javier 1a06173e1b Add parsing of html image in base64 format (#1382) 
* increased test coverage of new lines
* added exception control to file_get_contents error
* update changelog
 2018-05-31 01:28:14 +02:00
Edvin Hultberg 82f3a2ab44 Update documentation for Style::add*Style methods (#1383) 
* Update documentation for Style::add*Style methods
* remove phpDocumentor, simplify dependencies
 2018-05-31 00:21:08 +02:00
troosan e02c5f74e6 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into develop_upstream 2018-05-27 20:39:36 +02:00
troosan 0c9626cedd add .gitattributes 2018-05-27 20:38:25 +02:00
troosan c5d0f71963
Merge pull request #1380 from WouterSioen/fix-get-ending-notes-calls 
Fix calls to the getEndingNotes method in the samples
 2018-05-23 22:52:17 +02:00
woutersioen 90d4d30dd3 Fix calls to the getEndingNotes method in the samples 
This call requires both an array of writes and the filename, which was
missing in both method calls.
 2018-05-23 09:18:24 +02:00
troosan e6501eb9ff
Update coverage badge 
[skip ci]
[skip Scrutinizer]
 2018-05-20 23:45:03 +02:00
troosan cdb3633e37
Merge pull request #1360 from adfinis-forks/drop-gh-pages 
Drop GitHub pages, switch to coveralls
 2018-05-20 22:11:19 +02:00
troosan 0b27bb927d update changelog 
[ci skip]
 2018-05-20 22:08:53 +02:00
troosan 254064150d disable external code coverage 2018-05-20 20:59:34 +02:00
troosan 2480103b49 run coveralls when running build with code coverage 2018-05-20 17:13:04 +02:00
troosan 7f46d951eb Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into develop_upstream 2018-05-20 14:40:15 +02:00
troosan 453ddf078b Do not try to read document protection if not present 2018-05-20 14:37:59 +02:00
Christian Zosel e47ce1b4fc Coveralls integration 2018-05-19 12:56:44 +02:00
JAEK-S 65b0f062ad New features when creating charts (#1332) 
* add stacked bar and column charts
* add chart colors feature
* adding preliminary chart axis title functionality to XMLwriter
* added percent_stacked to available types array
* Make tick mark and tick label positions configurable
* scrutinizer fixes
* update changelog
 2018-05-11 22:50:19 +02:00
Christian Zosel 96a47ec0ae Drop GitHub pages 
First step to fix #1355
 2018-04-26 08:42:55 +02:00
troosan 94be56b0ec fix parsing of link style 2018-04-25 23:57:07 +02:00
troosan 4d9e9bc81b
Merge branch 'develop' into column_width_for_odt 2018-04-25 22:39:38 +02:00
troosan 84fa44090f
Merge pull request #1343 from meteocontrol/feature-add-table-indent-option 
Add support for table indent
 2018-04-25 22:37:16 +02:00
troosan 5ec2c8560e
do not push code coverage after build of develop branch 
[ci skip]
 2018-04-25 22:33:48 +02:00
troosan b147919a64 write column width in ODT writer 2018-04-18 22:34:53 +02:00
troosan c52c96d657 add support for STYLEREF field 2018-04-17 07:34:57 +02:00
troosan 85e1e5c280
fix warning 2018-04-14 23:21:02 +02:00
troosan b394247740
Merge branch 'develop' into feature-add-table-indent-option 2018-04-14 22:46:09 +02:00
troosan dd27f668e0 add line height test 
[ci skip]
 2018-04-14 22:42:58 +02:00
troosan 9bc85347ef fix code formatting 2018-04-14 21:15:36 +02:00
troosan 6ba2df474f
Merge pull request #1336 from lalop/addhtpl-bookmark 
support internal link in addHtml method
 2018-04-13 22:40:09 +02:00
troosan 3380aa8b19
Merge pull request #1339 from meteocontrol/feature-wrong-unit-in-image-doc 
Wrong unit in image style documentation
 2018-04-13 22:37:19 +02:00
troosan 57ededeabf
Merge pull request #1338 from pcworld/image-security-doc 
Improve security-related documentation of addImage and addHtml
 2018-04-13 22:36:18 +02:00
troosan 9989e4e387
Merge pull request #1341 from Trainmaster/fix-add-missing-param-annotation 
Add missing param annotation
 2018-04-13 22:35:25 +02:00