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

1620 Commits

Author SHA1 Message Date
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 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
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
troosan e76487172b update changelog 2018-05-31 00:31:41 +02:00
troosan b2cafffffc Merge remote-tracking branch 'upstream/develop' into develop_upstream 2018-05-31 00:25:31 +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 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
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