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

1480 Commits

Author SHA1 Message Date
troosan ba035185c7
point next dev version to develop branch 
[ci skip]
 2018-02-18 00:09:14 +01:00
troosan cc57eb987e
Merge pull request #1286 from meteocontrol/feature-consistent-twip-naming 
Use consistent name for twip unit
 2018-02-17 08:40:48 +01:00
troosan 7324070c30
Merge pull request #1284 from Trainmaster/feature-remove-zend-stdlib-dependency 
Remove zend-stdlib dependency
 2018-02-17 08:39:55 +01:00
Frank Liepert d061c6dc7c Remove zend-stdlib dependency 2018-02-17 00:03:41 +01:00
Frank Liepert fede4f736e Add missing unit of measurement descriptions 2018-02-16 15:45:20 +01:00
Frank Liepert ab978356c3 Use same markup for describing unit of measurement 2018-02-16 14:40:31 +01:00
Frank Liepert e7232a715b Use singular form of twip 2018-02-16 14:34:37 +01:00
troosan 99d8b5256f
Merge pull request #1281 from troosan/add_table_layout 
Add support for table layout
 2018-02-14 01:21:33 +01:00
troosan 6a926e26f1 refactor attribute name to layout, add doc and tests 2018-02-14 00:39:37 +01:00
troosan 615c1d5576 Merge branch 'stretch-table' of https://github.com/aoloe/php-PHPWord 
into tableLayout

Conflicts:
	src/PhpWord/Writer/Word2007/Style/Table.php
 2018-02-13 23:29:53 +01:00
ale rimoldi 7ddaed240f table->setStretch() optionally avoids the table to stretch to the page width (only for word output) 2018-02-13 23:24:15 +01:00
troosan e846602d1e fix null check 
[ci skip]
 2018-02-11 13:58:26 +01:00
troosan ee95cf3df0
Merge pull request #1278 from troosan/fix_internal_links_in_html_output 
Add HTML writer for Bookmarks + tests
 2018-02-11 00:21:12 +01:00
troosan 5ff15e06a2
update testing instructions 
[ci skip]
 2018-02-11 00:17:19 +01:00
troosan 377fb99fbc Add HTML writer for Bookmarks + tests 2018-02-10 23:43:15 +01:00
troosan b868c3370c
Merge pull request #1277 from troosan/fix_parsing_of_textbreaks 
Fix parsing of textbreaks
 2018-02-10 23:05:53 +01:00
troosan 874c6d6fb6 update changelog 2018-02-10 22:19:04 +01:00
troosan 91a8dd3b22 add parsing of p:br and add unit test 2018-02-10 22:16:55 +01:00
troosan 3f40c5e408
Merge pull request #1273 from troosan/various_html_parsing_fixes 
Various html parsing fixes, fixes for #1252 and #1254
 2018-02-09 22:50:18 +01:00
troosan 5b381bc0c0
Merge branch 'develop' into various_html_parsing_fixes 2018-02-09 21:53:48 +01:00
troosan 604e60cae9
Add support for Track changes (#1262) 
* add changed information to HTML writer
* add missing writeFontStyle
* refactor track changes
* set the style
* update documentation and release note
* Update the changelog and doc
* fix scrutinizer issues
 2018-02-09 21:49:11 +01:00
troosan 9cd5ab7433 update changelog 2018-02-09 17:17:13 +01:00
troosan fd127ef9bb
Merge pull request #779 from samsullivan/imagesavealpha 
Save PNG alpha information when using remote images.
 2018-02-09 17:16:03 +01:00
troosan 24f3463f9a remove output 2018-02-08 07:18:02 +01:00
troosan c0ed4ab03d Merge remote-tracking branch 'samimussbach/PHPWord/fixNestedLists' into various_html_parsing_fixes 2018-02-08 07:02:38 +01:00
troosan 304173c4d7 fix nested list 2018-02-08 07:02:28 +01:00
troosan 33739ea21c cannot add list on textrun 2018-02-07 21:39:01 +01:00
troosan 46476d7101 update phpdoc 2018-02-07 07:09:27 +01:00
troosan 47c837abef add unit tests 2018-02-06 23:31:56 +01:00
troosan 46a5f96d3b fix parsing of table and p inside table cells 2018-02-06 23:16:32 +01:00
troosan cf6319d7d4
Merge pull request #1264 from lalop/patch-1 
Delete VERSION
 2018-02-04 20:29:54 +01:00
troosan 4308ce9eab
Merge pull request #1271 from nicoder/patch-2 
fix typo in CONTRIBUTING.md
 2018-02-04 20:29:32 +01:00
Nicolas Dermine edd9617c03
fix typo 2018-02-04 08:42:38 +01:00
troosan 1813e2db38
Merge pull request #1266 from samimussbach/fixTypoInTest 
fix typo in test method name
 2018-02-02 21:59:37 +01:00
Sami Mussbach e0096dba08 fix typo in test method name 2018-02-01 14:12:56 +01:00
Sami Mussbach 8a9a4784d9 add (failing) test and correct documentation sample to valid HTML 2018-02-01 13:58:08 +01:00
Samuel Laulhau caba7e238f
Delete VERSION 
Delete VERSION file since it's outdated so not usefull anymore
 2018-01-31 10:17:40 +01:00
troosan 9a91d54e10
Merge pull request #1259 from nicoder/patch-1 
fix typo in comment
 2018-01-30 20:55:49 +01:00
Nicolas Dermine 30183e2881
fix typo in comment 2018-01-26 18:31:35 +01:00
troosan 4f6fa5079f
Merge pull request #1258 from troosan/parse_html_links 
Add parsing of HTML links
 2018-01-26 07:59:28 +01:00
troosan 0425a25cdb Add parsing of HTML links 2018-01-25 23:24:21 +01:00
samimussbach 4c68ebbe9d Parse formatting inside HTML lists (#1239) 2018-01-13 10:03:53 +01:00
troosan 99b04f0353
fix reading of docx default style (#1238) 2018-01-12 23:42:22 +01:00
troosan 4a530d1d97
Do not show script source when running from CLI 2018-01-03 17:16:19 +01:00
troosan 35aa6d6291 Merge branch 'master' of https://github.com/PHPOffice/PHPWord into upstream_develop 2018-01-03 14:27:34 +01:00
troosan bdca366d91 remove link to obsolete URL [skip ci] 2018-01-03 14:15:59 +01:00
troosan 7d929fee8c add branch alias for 0.15.0 [skip ci] 2017-12-29 21:48:15 +01:00
troosan d480aab1b0 add branch alias for 0.15.0 [skip ci] 2017-12-29 21:48:08 +01:00
troosan 23693b403c change impl to avoid compilation issue 2017-12-29 21:47:55 +01:00
troosan ca29ceb1fa
add branch alias for 0.15.0 [skip ci] 2017-12-29 21:33:29 +01:00