Commit Graph

65 Commits

Author SHA1 Message Date
Roman Syroeshko d51cb0ef3e https://github.com/PHPOffice/PHPWord/issues/58 - Part VII (supported PHP version). 2014-03-20 17:17:43 +04:00
Roman Syroeshko 8267a9e12f https://github.com/PHPOffice/PHPWord/issues/58 - Part VI (PhpWord). 2014-03-20 16:54:12 +04:00
Brandon Skrtich 0b65bc397c Update Requirements
Resolves #120
2014-03-14 09:44:12 -06:00
Gabriel Bull 72fca30e8c Fixed bug with footer preserve text 2014-03-11 14:19:33 -04:00
Gabriel Bull d5e55e7c4b Moved back phpunit.xml.dist file to root of directory 2014-03-02 12:46:56 -05:00
Gabriel Bull 3cf069fc46 Happy new year! 2014-02-12 11:21:04 -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 38a15e5da5 Word2007 : Support for tab stops 2013-12-15 14:35:18 +01:00
Progi1984 0d19d57cba IMPROVED : Moved examples out of Classes directory 2013-12-15 13:35:17 +01:00
Gabriel Bull b6a5bf21b8 Merge branch 'refs/heads/develop'
Conflicts:
	.travis.yml
	composer.json
	src/PHPWord/Writer/Word2007/Base.php
2013-12-13 06:45:37 -05:00
Progi1984 3f098ba901 Support de Composer 2013-12-13 11:38:22 +01:00
Progi1984 ea81f578b3 Support de Composer 2013-12-13 11:36:36 +01:00
Gabriel Bull be1e357b83 Changed version number 2013-12-11 19:57:36 -05:00
Gabriel Bull 50a9ab52b0 Added Unit Tests and fixed bugs with Autoloader 2013-12-11 15:08:54 -05:00
Gabriel Bull 8c4efdd607 Added support for composer 2013-12-11 14:39:43 -05:00