Aix/PHPWord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
87 Commits 6 Branches 21 Tags
Commit Graph

87 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Progi1984
1f4a18dac3 Changelog (GH-52 GH-53 GH-85) 2014-03-05 13:10:37 +01:00
Progi1984
2d3725cc88 Merge pull request #85 from RomanSyroeshko/PHPWord#52 
Ability to limit number of replacements performed by setValue() method of Template class
 2014-03-05 13:07:31 +01:00
Progi1984
c173a71df0 Changelog (GH-6 GH-66 GH-84) 2014-03-05 09:42:16 +01:00
Progi1984
4ad5cf004a Merge pull request #84 from bskrtich/textrunimage 
Ability to use images in a text run
 2014-03-05 09:38:22 +01:00
Brandon Skrtich
d0b4ed6d41 Ability to use images in a text run 2014-03-04 10:54:14 -07:00
Progi1984
d1e16a66d6 GH-5 : Word2007 : Added support for page header & page footer height 2014-03-03 20:15:29 +01:00
Progi1984
5a6cb0891f IMPROVED : Changelog 2014-03-03 19:29:17 +01:00
Progi1984
cc61801ca0 Merge pull request #57 from RomanSyroeshko/PHPWord#56 
Postprocessing of documents returned by Template class before moving to final destination
 2014-03-03 19:14:15 +01:00
Progi1984
156775655b FIXED : Unit Tests on Travis CI after have moved phpunit.xml.dist 2014-03-02 20:07:05 +01:00
Progi1984
45cab00eff FIXED : Unit Tests on Travis CI after have moved phpunit.xml.dist 2014-03-02 20:03:39 +01:00
Progi1984
7080ebe1af Merge pull request #75 from gabrielbull/master 
Added PSR-4 Autoloader and move phpunit.xml.dist back to root of project
 2014-03-02 19:59:32 +01:00
Gabriel Bull
6f2297ea9a Added PSR-4 Autoloader 2014-03-02 13:44:00 -05:00
Gabriel Bull
d5e55e7c4b Moved back phpunit.xml.dist file to root of directory 2014-03-02 12:46:56 -05:00
Progi1984
c5acf36b27 ADDED : Icons for packagist 2014-02-25 13:33:18 +01:00
Progi1984
21739b11b9 IMPROVED : Order in changes 2014-02-25 13:07:30 +01:00
Progi1984
49e01cc601 FIXED : Error on Travis-CI with Pyrus on PHP 5.3.3 2014-02-24 22:11:45 +01:00
Progi1984
ff342cff6f FIXED : Error on Travis-CI with Pyrus on PHP 5.3.3 2014-02-24 20:11:02 +01:00
Progi1984
2018262f86 FIXED : Error on Travis-CI with Composer on PHP 5.3.3 2014-02-24 19:43:20 +01:00
Progi1984
79a87a1f8d ADDED : Basic unit tests 2014-02-24 19:38:44 +01:00
Progi1984
4ffa261a6c Merge branch 'master' of https://github.com/PHPOffice/PHPWord 2014-02-24 19:38:09 +01:00
Progi1984
62f8ad8d0b Merge pull request #62 from gabrielbull/master 
Added section page numbering, fixed bug with cell styling, added unit tests and added documentation
 2014-02-24 19:17:48 +01:00
Progi1984
075ca157d7 ADDED : Basic unit tests 2014-02-24 19:17:06 +01:00
Gabriel Bull
6697b72185 Fixed bug list items inside of cells 2014-02-13 12:24:11 -05:00
Gabriel Bull
7ea686f698 Fixed bug with table cell styles and added grid span unit tests 2014-02-13 11:06:17 -05:00
Gabriel Bull
f76a9cdbed Added text align test 2014-02-12 13:28:35 -05:00
Gabriel Bull
334422d04e Update README.md 2014-02-12 12:47:16 -05:00
Gabriel Bull
617feb3240 Added section page numbering 2014-02-12 12:07:50 -05:00
Gabriel Bull
3cf069fc46 Happy new year! 2014-02-12 11:21:04 -05:00
Progi1984
49d7897176 Travis CI : Allowed failure on HHVM 0.7.0 2014-01-28 08:03:36 +01:00
Progi1984
8ded92840b CI via Travis : HHVM 2014-01-23 13:00:30 +01:00
Roman Syroeshko
3cd60f76de https://github.com/PHPOffice/PHPWord/issues/56 
Postprocessing of documents returned by Template class before moving to final destination
 2014-01-17 00:02:09 -08:00
Roman Syroeshko
2c5fed61bd https://github.com/PHPOffice/PHPWord/issues/52 
Ability to limit number of replacements performed by setValue() method of Template class
 2014-01-16 04:19:41 -08:00
Progi1984
029de3183a CI via Travis 2013-12-17 11:45:51 +01:00
Progi1984
db4537dc28 Add support of HHVM for Travis 2013-12-16 18:54:12 +01:00
Progi1984
0885e71e95 Update of changelog after the pull request of @gavroche 2013-12-16 18:47:18 +01:00
Progi1984
a4b6b843ad Merge pull request #40 from gavroche/master 
PR40 - Added support for Composer, Images Wrapping, Unit Testing and started re-writing code to be PSR-2 compliant
 2013-12-16 04:14:06 -08:00
Gabriel Bull
d09f0958c6 Fixed some merge issues 2013-12-16 06:40:30 -05:00
Gabriel Bull
39e4dd2259 Merge branch 'master' of https://github.com/PHPOffice/PHPWord 
Conflicts:
	.gitignore
	Classes/PHPWord.php
	Classes/PHPWord/Section.php
	Classes/PHPWord/Section/Footer.php
	Classes/PHPWord/Section/Header.php
	Classes/PHPWord/Section/Table/Cell.php
	Classes/PHPWord/Section/TextRun.php
	Classes/PHPWord/Shared/String.php
	Classes/PHPWord/Style/Cell.php
	Classes/PHPWord/Style/Paragraph.php
	Classes/PHPWord/Template.php
	Classes/PHPWord/Writer/Word2007.php
	Classes/PHPWord/Writer/Word2007/Base.php
	Classes/PHPWord/Writer/Word2007/Document.php
	Examples/AdvancedTable.php
	Examples/BasicTable.php
	Examples/HeaderFooter.php
	Examples/Link.php
	Examples/ListItem.php
	Examples/Object.php
	Examples/Section.php
	Examples/Template.php
	Examples/Textrun.php
	Examples/TitleTOC.php
	Examples/Watermark.php
	Examples/_earth.JPG
	Examples/_mars.jpg
	Examples/_sheet.xls
	changelog.txt
	samples/old/AdvancedTable.php
	samples/old/BasicTable.php
	samples/old/Image.php
	samples/old/Link.php
	samples/old/ListItem.php
	samples/old/Object.php
	samples/old/Section.php
	samples/old/Template.php
	samples/old/Textrun.php
	samples/old/TitleTOC.php
	samples/old/Watermark.php
	samples/old/_earth.jpg
	samples/old/_mars.jpg
	samples/old/_sheet.xls
	src/Examples/AdvancedTable.php
	src/Examples/BasicTable.php
	src/Examples/Link.php
	src/Examples/ListItem.php
	src/Examples/Object.php
	src/Examples/Section.php
	src/Examples/Template.php
	src/Examples/Textrun.php
	src/Examples/TitleTOC.php
	src/Examples/Watermark.php
	src/Examples/_earth.JPG
	src/Examples/_mars.jpg
	src/Examples/_sheet.xls
 2013-12-15 14:15:28 -05:00
Progi1984
fa7de9c977 Word2007 : Support Multiple headers 2013-12-15 15:54:09 +01:00
Progi1984
72977545bd Merge pull request #42 from RLovelett/multiple-headers 
Support Multiple headers
 2013-12-15 06:55:03 -08:00
Ryan Lovelett
4fb18005ce Sections can support multiple headers 
Each section can now have a single header (previous behavior). It can
now also support multiple headers. The spec defines three types of
headers: default, first, and even. These code changes provide support
for all three.

The HeaderFooter.php example has also been updated to illustrate how to
use the new multiple headers for a section.

Used these pages as spec reference:

http://www.schemacentral.com/sc/ooxml/e-w_headerReference-1.html
http://www.schemacentral.com/sc/ooxml/a-w_type-4.html
 2013-12-15 09:49:02 -05:00
Progi1984
95f16cc3a5 Temporary files naming logic in PHPWord_Template can lead to a collision (GH-38) 2013-12-15 14:58:44 +01:00
Progi1984
9557dd9da8 FIXED : "Warning: Invalid error type specified in ...\PHPWord.php on line 226" is thrown when the specified template file is not found GH-32 2013-12-15 14:50:08 +01:00
Progi1984
049c89d079 IMPROVED : Advanced string replace in setValue for Template 2013-12-15 14:46:05 +01:00
Progi1984
38a15e5da5 Word2007 : Support for tab stops 2013-12-15 14:35:18 +01:00
Progi1984
a610c34a18 Word2007 : Add rowspan and colspan to cells 2013-12-15 13:42:36 +01:00
Progi1984
0d19d57cba IMPROVED : Moved examples out of Classes directory 2013-12-15 13:35:17 +01:00
Progi1984
1b849ec1bb Added PHPWord_Exception and exception when could not copy the template 2013-12-15 13:18:07 +01:00
Progi1984
5d6bb15825 ADDED : Changelog 2013-12-15 13:11:28 +01:00
Progi1984
3c78edd9f4 IMPROVED : Test if text is UTF-8 before converting 2013-12-15 12:56:40 +01:00