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

1864 Commits

Author SHA1 Message Date
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
eweso a09e7151ac
Update ListItem.php 2018-03-30 22:58:03 +02:00
eweso 71618f704d
Adding setNumId method for ListItem style 
By allowing to set the numId in the ListItem style manually, you can separate lists. Every ListItem with the same numId belongs to one list. This allows you to restart list counting.
 2018-03-30 19:24:45 +02:00
troosan 566e625b85 merge/add test/cleanup 2018-03-25 22:46:50 +02:00
gthomas2 9b722a5b0c Added missing namespaces 2018-03-23 21:29:41 +01:00
gthomas2 34bda10536 Fix images added in word 2011 2018-03-23 21:28:53 +01:00
troosan 400ee57bee fix 2018-03-22 22:47:27 +01:00
troosan ade497d9d7 update changelog and doc 2018-03-21 22:19:56 +01:00
troosan c08f2718af check style fixes 2018-03-21 21:58:41 +01:00
troosan 45e2e92af7 fix graph data 2018-03-21 21:50:41 +01:00
troosan a8d1775eb1 Merge remote-tracking branch 'FrankMeyer/develop' into develop 2018-03-21 06:51:22 +01:00
troosan 2c5970a388 php 5.3 compatibility 2018-03-20 23:42:01 +01:00
Tim Jarrett d8387c1aba Escape incoming invalid XML characters using htmlspecialchars(). 2018-03-20 22:47:15 +01:00
troosan d8caa0b572
Merge pull request #1292 from mattbolt/develop 
Fix colspan and rowspan for tables in HTML Writer
 2018-03-20 22:22:19 +01:00
troosan d7fc1a5f7b
Merge branch 'develop' into develop 2018-03-20 21:49:36 +01:00
troosan 296706aa03 add unit tests 2018-03-20 21:35:06 +01:00
troosan 992d842552 fix 2018-03-19 23:07:35 +01:00
troosan f73beaa26a reset static collections at instantiation 2018-03-19 23:06:00 +01:00
troosan 16a9ded2c9 add exact line spacing test 2018-03-19 22:50:55 +01:00
troosan de01e86d41 parse fixed line space 2018-03-19 22:50:54 +01:00
troosan 97d60dd985 tranlate percentage to rate 2018-03-19 22:50:54 +01:00
troosan fe3f383621
Merge pull request #1316 from troosan/html_css_parse 
add parsing of line-height and text-indent
 2018-03-19 07:58:52 +01:00
troosan de2e05bc11 update changelog 
[ci skip]
 2018-03-19 06:41:46 +01:00
troosan 997e21433c add parsing of line-height and text-indent 2018-03-18 22:32:55 +01:00
troosan 4c846426ce format & changelog 2018-03-18 20:53:05 +01:00
troosan fb1e2e41cc Merge branch 'ComputerTinker-AddFieldDateFormats' of 
https://github.com/ComputerTinker/PHPWord into
ComputerTinker-ComputerTinker-AddFieldDateFormats

# Conflicts:
#	src/PhpWord/Element/Field.php
 2018-03-18 20:44:05 +01:00
troosan 9ffce350f5
Merge pull request #1299 from zobo/word2007_read_tabs 
Add support for reading <w:tab/> element in runs.
 2018-03-18 17:54:47 +01:00
troosan bb70eb0b4c fix docx parsing 2018-03-18 12:37:39 +01:00
troosan 17680f7aec
Merge branch 'develop' into word2007_read_tabs 2018-03-11 22:37:05 +01:00
troosan 6b48451ebc
Merge pull request #1310 from troosan/add_image_wrap_distance 
add text wrapping distance
 2018-03-11 20:42:40 +01:00
troosan a0111be6ae update changelog and doc 2018-03-11 15:02:24 +01:00
troosan e29a3e7c10 add text wrapping distance 2018-03-11 13:27:35 +01:00
troosan 8bafe0000f
Merge pull request #1307 from franciscosens/add-suport-pt-br 2018-03-10 08:48:30 +01:00
troosan 77f2b16bc1 update copyright to 2018 2018-03-08 23:52:25 +01:00
Henri MEDOT f9a05547f7 Added support for Floating Table Positioning (tblpPr) (#639) 
Added support for Floating Table Positioning (tblpPr)
 2018-03-08 23:46:22 +01:00
Francisco Lucas Sens eb6900969f Added new constant to Brazilian portuguese language 2018-03-08 16:15:31 -03:00
troosan 9affbf4ecf
Merge pull request #1306 from Trainmaster/feature-make-composer-scripts-compatible-with-windows 
Make Composer scripts compatible with Windows
 2018-03-07 21:19:56 +01:00
Frank Liepert d8f4a28b94 Make Composer scripts compatible with Windows 
Windows does not like the "./" syntax
 2018-03-07 20:05:40 +01:00