Roman Syroeshko
|
db1d89ab23
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
src/PhpWord/Element/Section.php
src/PhpWord/Endnotes.php
src/PhpWord/Footnotes.php
src/PhpWord/Media.php
src/PhpWord/PhpWord.php
src/PhpWord/Reader/Word2007.php
src/PhpWord/Writer/AbstractWriter.php
src/PhpWord/Writer/ODText/Content.php
src/PhpWord/Writer/Word2007.php
src/PhpWord/Writer/Word2007/Notes.php
|
2014-04-16 17:39:26 +04:00 |
|
Roman Syroeshko
|
2c1c1ea60f
|
[IMPROVED] Dockblocks as per https://github.com/PHPOffice/PHPWord/pull/187.
|
2014-04-16 17:22:30 +04:00 |
|
Ivan Lanin
|
a3a9af51e5
|
Additional unit tests and some code deduplication
|
2014-04-11 21:28:43 +07:00 |
|
Ivan Lanin
|
ae652a6379
|
Update upcoming version number to 0.10.0 as per #178
|
2014-04-11 19:04:53 +07:00 |
|
Roman Syroeshko
|
5b4ed10999
|
[FIXED] Dockblock for https://github.com/PHPOffice/PHPWord/pull/187
|
2014-04-10 11:06:39 +04:00 |
|
Ivan Lanin
|
dadfc2903c
|
Merge branch '#160-element-container' into xml-reader
|
2014-04-08 01:15:14 +07:00 |
|
Ivan Lanin
|
f1108c48e6
|
Add Abstract- prefix and -Interface suffix for corresponding classes
|
2014-04-08 01:09:06 +07:00 |
|
Ivan Lanin
|
b594e32f04
|
Move container files
|
2014-04-08 00:03:53 +07:00 |
|