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

2101 Commits

Author SHA1 Message Date
troosan c22f7eab5e add check on opened file 2018-05-27 21:27:45 +02:00
troosan da604a80c4 use annotation instead 2018-05-27 20:53:42 +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
Javier Garcia 65a594d271 cs-fixer fixes 2018-05-25 09:29:58 +02:00
Javier Garcia a89e4c93a7 added exception control to file_get_contents error 2018-05-25 08:01:17 +02:00
Maxim Bulygin e40449e7c8 fix variable names 2018-05-24 17:40:21 +03:00
Maxim Bulygin 13fc647d01 html writes / setup table cell color 2018-05-24 17:03:35 +03:00
Maxim Bulygin d1ce0c366a Merge remote-tracking branch 'PHPOffice/develop' into develop 2018-05-24 16:19:00 +03:00
Javier Garcia 46b7bea097 increased test coverage of new lines 2018-05-24 07:19:45 +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
Javier Garcia a228811a61 fixes 2018-05-23 18:48:28 +02:00
Javier Garcia d54cc6efee fix lint 2018-05-23 18:35:12 +02:00
Javier Garcia 58c6c52ee9 merged with local version 2018-05-23 18:22:54 +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
Frank Liepert 833cf07c1a Consistently format "pt" unit 2018-04-12 16:58:48 +02:00
Frank Liepert 853fcec1b6 Fix documented unit for image height/width 2018-04-12 16:58:48 +02:00
Frank Liepert 081c6722f6 Add support for table indent 2018-04-11 10:06:58 +02:00
Frank Liepert e885b371bc Add missing param annotation 2018-04-10 20:30:04 +02:00
pcworld 6253adaba1 Warn about parsing user-generated HTML 2018-04-09 02:48:49 +02:00
pcworld a7981717b3 addImage docs: Warn about user-generated strings 2018-04-09 02:45:50 +02:00
Sam ca82e19bba support internal link in addHtml method 2018-04-07 11:24:52 +02:00
troosan 67b18c32e7
fix 
[ci skip]
 2018-04-02 14:50:31 +02:00
troosan ed24140e2f
update samples instructions 
[ci skip]
 2018-04-02 14:47:18 +02:00
eweso 91ada213c5
Update ListItem.php 2018-03-31 00:38:43 +02:00
eweso 5741e47129
Update ListItem.php 2018-03-31 00:37:50 +02:00