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

1460 Commits

Author SHA1 Message Date
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
troosan d1a79b79f1
add branch alias for 0.15.0 [skip ci] 2017-12-29 21:29:31 +01:00
troosan 2d87fd320d fix merge 2017-12-29 20:27:05 +01:00
Maxim 400a8e65d3 rename 'Object' classes to 'ObjectElement' (php 7.2 compatibility) (#1185) 
merge develop branch
 2017-12-29 20:19:35 +01:00
troosan 526d0ac8de create alias for develop branch 2017-12-29 15:46:31 +01:00
troosan 709ea1e14c update changelog [skip ci] 2017-12-29 15:16:03 +01:00
troosan 46e179d148 add instructions on how to run the samples in a browser 2017-12-29 15:16:03 +01:00
troosan b20cd4fa9f output the source code of the sample that was run 2017-12-29 15:16:03 +01:00
troosan 1d8e7b8374 split composer scripts, add description (only works with composer 1.6) 2017-12-29 15:16:03 +01:00
troosan d2b9e88047 add parsing of "align" HTML attribute 2017-12-29 15:16:03 +01:00
troosan fd7ee76438 create alias for develop branch 2017-12-29 03:01:36 +01:00
troosan b614497ae6
fix dependencies to have 7.1 compatible build (#1228) 
* add assertions in test methods without assertions
* loosen dependencies so 7.0 & 7.1 builds can succeed
* fix some scrutinizer errors
* update release date
 2017-12-29 02:30:53 +01:00
troosan fce1bf28c8 format code 2017-12-25 22:05:46 +01:00
troosan 512cf952ae randomise temp directory name to avoid collisions 2017-12-25 20:42:37 +01:00
troosan 4767703f86 Merge branch 'master' of https://github.com/PHPOffice/PHPWord into upstream_develop 2017-12-25 17:14:27 +01:00
troosan 7250b15e74 Title can be added in Cell 2017-12-25 08:33:02 +01:00
troosan 6daf31be8f
Merge pull request #1226 from PHPOffice/develop 
Merge develop branch to master branch
 2017-12-25 01:37:54 +01:00
troosan 56720df487 update version 2017-12-25 01:32:34 +01:00
troosan ed704da5b2 set release date 2017-12-25 01:24:20 +01:00
SRG Group 3e6745f146 HTML image support & TextRun paragraph style (#934) 
* Adding setParagraphStyle to Textrun for indentation
* Html Image support added
* fix formatting, add tests & update changelog
 2017-12-21 00:03:52 +01:00