16 Commits

Author SHA1 Message Date
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
Progi1984
c5acf36b27 ADDED : Icons for packagist 2014-02-25 13:33:18 +01: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
334422d04e Update README.md 2014-02-12 12:47:16 -05:00
Gabriel Bull
617feb3240 Added section page numbering 2014-02-12 12:07:50 -05:00
Ivan Lanin
d55db9da83 Patch branch 2014-01-09 07:45:41 +07:00
Ivan Lanin
0edaaaab50 Tidy up for pull request 2014-01-02 00:59:38 +07:00
Ivan Lanin
3fa49ee53b section breakType 2014-01-01 20:12:51 +07:00
Ivan Lanin
3037fbf59e Read README.md 2014-01-01 18:59:19 +07:00
Ivan Lanin
891798bc16 Unix format 2013-12-31 14:34:50 +07:00
Gabriel Bull
d09f0958c6 Fixed some merge issues 2013-12-16 06:40:30 -05: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
Maarten Balliauw
4f457c99e6 Added readme and license file 2012-07-05 07:25:13 +02:00
Progi1984
8b80028c33 initial commit 2012-05-06 09:04:30 -07:00