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

31 Commits

Author SHA1 Message Date
Ivan Lanin 09ba95bd88 Paragraph: Ability to define (1) normal paragraph style with PHPWord::setNormalStyle() and (2) parent style (basedOn) and style for following paragraph (next) 2014-03-07 18:02:47 +07:00
Ivan Lanin be4b01b652 PHPWord_Shared_Font::pointSizeToTwips 2014-03-07 11:14:45 +07:00
Progi1984 545cbc6e23 GH-51 : Adding a value that contains "&" in a template breaks it 2014-03-06 23:29:51 +01:00
Progi1984 55a5b7e089 Changelog : Feature for columns in section, continuous section break, softbreak, hanging paragraph, and normal style 2014-03-06 21:20:40 +01:00
Ivan Lanin 22afd14281 Update change log 2014-03-07 00:42:33 +07:00
Progi1984 1f4a18dac3 Changelog (GH-52 GH-53 GH-85) 2014-03-05 13:10:37 +01:00
Progi1984 c173a71df0 Changelog (GH-6 GH-66 GH-84) 2014-03-05 09:42:16 +01: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
Gabriel Bull d5e55e7c4b Moved back phpunit.xml.dist file to root of directory 2014-03-02 12:46:56 -05:00
Progi1984 21739b11b9 IMPROVED : Order in changes 2014-02-25 13:07:30 +01:00
Progi1984 79a87a1f8d ADDED : Basic unit tests 2014-02-24 19:38:44 +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 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 0885e71e95 Update of changelog after the pull request of @gavroche 2013-12-16 18:47:18 +01: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 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
Gabriel Bull be1e357b83 Changed version number 2013-12-11 19:57:36 -05:00
Gabriel Bull dd5e20e7e5 Moved image example to README.md 2013-12-11 16:17:53 -05:00
Gabriel Bull 8c4efdd607 Added support for composer 2013-12-11 14:39:43 -05:00