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

13 Commits

Author SHA1 Message Date
Ivan Lanin 9fd138494e Constants explanation 2014-03-09 15:21:53 +07:00
Ivan Lanin b39f9daee2 Refactor and unit test PHPWord_Style_Font 2014-03-08 23:43:27 +07:00
Ivan Lanin 0d1c368c41 setNormalStyle > setDefaultParagraphStyle 2014-03-07 19:31:13 +07:00
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 7533d30125 Changes: 
- Use constants instead of hardcoded name and size for font (Arial, 20)
- Section: Multicolumn
- Section: Different section break
- Paragraph: Hanging paragraph
- Font: Superscript and subscript
- Table: Table width in percentage
- Table: Repeat as header row
- Table: Allow row to break across pages
 2014-03-06 20:57:00 +07:00
Ivan Lanin d3f62567e9 Merge remote-tracking branch 'remotes/upstream/develop' into develop 
Conflicts:
	Classes/PHPWord/Section/Settings.php
	Classes/PHPWord/Section/TextRun.php
	Classes/PHPWord/Writer/Word2007/Base.php
	README.md
 2014-03-06 12:32:23 +07:00
Ivan Lanin ab2b2deac3 Change default font to Times New Roman 12pt 2014-02-23 11:40:32 +07:00
Ivan Lanin eb6b44ef85 Use constant instead of hardcoded 'Arial' name. 2014-02-22 22:52:19 +07:00
Gabriel Bull 3cf069fc46 Happy new year! 2014-02-12 11:21:04 -05: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 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 0d19d57cba IMPROVED : Moved examples out of Classes directory 2013-12-15 13:35:17 +01:00