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 |