Ivan Lanin
|
fd95a1c1ec
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2014-03-13 20:23:55 +07:00 |
|
Gabriel Bull
|
f711e8a0e9
|
Formatted code in PHPWord_Style_Font class
|
2014-03-13 09:22:12 -04:00 |
|
Ivan Lanin
|
d180ac7fdf
|
Merge branch 'develop' of https://github.com/jhfangying/PHPWord into develop
|
2014-03-13 19:28:52 +07:00 |
|
Ivan Lanin
|
acfe64bb53
|
More unit tests for Writer\Word2007\Base
|
2014-03-13 19:09:35 +07:00 |
|
jhfangying
|
a7663476f6
|
add Font Content Type
w:hint attribute added
|
2014-03-13 13:09:44 +08:00 |
|
Gabriel Bull
|
f2122c152a
|
Changed PHPWord namespace to PhpOffice\PhpWord
|
2014-03-09 16:07:20 -04:00 |
|
Gabriel Bull
|
70588f2f8f
|
Fixed bugs with Text class
|
2014-03-09 15:25:37 -04:00 |
|
Gabriel Bull
|
9966508a62
|
Added line height to font style
|
2014-03-09 15:03:53 -04:00 |
|
Gabriel Bull
|
7abd5be62b
|
Reformatted Tests to PSR-2 coding standards
|
2014-03-09 14:14:38 -04:00 |
|
Ivan Lanin
|
fa1663a2b1
|
PHP method IS NOT case sensitive :)
|
2014-03-09 21:59:23 +07:00 |
|
Ivan Lanin
|
b39f9daee2
|
Refactor and unit test PHPWord_Style_Font
|
2014-03-08 23:43:27 +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
|
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
|
0d19d57cba
|
IMPROVED : Moved examples out of Classes directory
|
2013-12-15 13:35:17 +01:00 |
|