Aix/PHPWord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
101 Commits 6 Branches 21 Tags
Commit Graph

101 Commits

This Branch
This Branch
All Branches
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
1f4a18dac3 Changelog (GH-52 GH-53 GH-85) 2014-03-05 13:10:37 +01:00
Progi1984
2d3725cc88 Merge pull request #85 from RomanSyroeshko/PHPWord#52 
Ability to limit number of replacements performed by setValue() method of Template class
 2014-03-05 13:07:31 +01:00
Progi1984
c173a71df0 Changelog (GH-6 GH-66 GH-84) 2014-03-05 09:42:16 +01:00
Progi1984
4ad5cf004a Merge pull request #84 from bskrtich/textrunimage 
Ability to use images in a text run
 2014-03-05 09:38:22 +01:00
Brandon Skrtich
d0b4ed6d41 Ability to use images in a text run 2014-03-04 10:54:14 -07:00
Progi1984
d1e16a66d6 GH-5 : Word2007 : Added support for page header & page footer height 2014-03-03 20:15:29 +01:00
Progi1984
5a6cb0891f IMPROVED : Changelog 2014-03-03 19:29:17 +01:00
Progi1984
cc61801ca0 Merge pull request #57 from RomanSyroeshko/PHPWord#56 
Postprocessing of documents returned by Template class before moving to final destination
 2014-03-03 19:14:15 +01:00
Progi1984
156775655b FIXED : Unit Tests on Travis CI after have moved phpunit.xml.dist 2014-03-02 20:07:05 +01:00
Progi1984
45cab00eff FIXED : Unit Tests on Travis CI after have moved phpunit.xml.dist 2014-03-02 20:03:39 +01:00
Progi1984
7080ebe1af Merge pull request #75 from gabrielbull/master 
Added PSR-4 Autoloader and move phpunit.xml.dist back to root of project
 2014-03-02 19:59:32 +01:00
Gabriel Bull
6f2297ea9a Added PSR-4 Autoloader 2014-03-02 13:44:00 -05:00
Gabriel Bull
d5e55e7c4b Moved back phpunit.xml.dist file to root of directory 2014-03-02 12:46:56 -05:00
Progi1984
c5acf36b27 ADDED : Icons for packagist 2014-02-25 13:33:18 +01:00
Progi1984
21739b11b9 IMPROVED : Order in changes 2014-02-25 13:07:30 +01:00
Progi1984
49e01cc601 FIXED : Error on Travis-CI with Pyrus on PHP 5.3.3 2014-02-24 22:11:45 +01:00
Progi1984
ff342cff6f FIXED : Error on Travis-CI with Pyrus on PHP 5.3.3 2014-02-24 20:11:02 +01:00
Progi1984
2018262f86 FIXED : Error on Travis-CI with Composer on PHP 5.3.3 2014-02-24 19:43:20 +01:00
Progi1984
79a87a1f8d ADDED : Basic unit tests 2014-02-24 19:38:44 +01:00
Progi1984
4ffa261a6c Merge branch 'master' of https://github.com/PHPOffice/PHPWord 2014-02-24 19:38:09 +01:00
Progi1984
62f8ad8d0b Merge pull request #62 from gabrielbull/master 
Added section page numbering, fixed bug with cell styling, added unit tests and added documentation
 2014-02-24 19:17:48 +01:00
Progi1984
075ca157d7 ADDED : Basic unit tests 2014-02-24 19:17:06 +01:00
Ivan Lanin
ab2b2deac3 Change default font to Times New Roman 12pt 2014-02-23 11:40:32 +07:00
Ivan Lanin
a915e05a15 Merge remote-tracking branch 'upstream/master' 2014-02-22 23:19:29 +07:00
Ivan Lanin
eb6b44ef85 Use constant instead of hardcoded 'Arial' name. 2014-02-22 22:52:19 +07:00
Ivan Lanin
b0a24703f3 Table Row allows tblHeader and cantSplit 2014-02-22 11:01:15 +07:00
Gabriel Bull
6697b72185 Fixed bug list items inside of cells 2014-02-13 12:24:11 -05: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
f76a9cdbed Added text align test 2014-02-12 13:28:35 -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
Gabriel Bull
3cf069fc46 Happy new year! 2014-02-12 11:21:04 -05:00
Progi1984
49d7897176 Travis CI : Allowed failure on HHVM 0.7.0 2014-01-28 08:03:36 +01:00
Progi1984
8ded92840b CI via Travis : HHVM 2014-01-23 13:00:30 +01:00
Roman Syroeshko
3cd60f76de https://github.com/PHPOffice/PHPWord/issues/56 
Postprocessing of documents returned by Template class before moving to final destination
 2014-01-17 00:02:09 -08:00
Roman Syroeshko
2c5fed61bd https://github.com/PHPOffice/PHPWord/issues/52 
Ability to limit number of replacements performed by setValue() method of Template class
 2014-01-16 04:19:41 -08:00
Ivan Lanin
194940d478 Width: dxa > pct 2014-01-16 14:33:38 +07:00
Ivan Lanin
4d94d5763c (1) new width property for table; (2) allow table cell width to be null 2014-01-13 23:14:05 +07:00
Ivan Lanin
d55db9da83 Patch branch 2014-01-09 07:45:41 +07:00
Ivan Lanin
d3e8b69cc4 Remove (int) since there's a possibility for fraction 2014-01-02 01:30:57 +07:00
Ivan Lanin
72e8f3fccf Fix comment error 2014-01-02 01:02:01 +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
Progi1984
029de3183a CI via Travis 2013-12-17 11:45:51 +01:00
Progi1984
db4537dc28 Add support of HHVM for Travis 2013-12-16 18:54:12 +01:00
Progi1984
0885e71e95 Update of changelog after the pull request of @gavroche 2013-12-16 18:47:18 +01:00
Progi1984
a4b6b843ad Merge pull request #40 from gavroche/master 
PR40 - Added support for Composer, Images Wrapping, Unit Testing and started re-writing code to be PSR-2 compliant
 2013-12-16 04:14:06 -08:00