Commit Graph

1725 Commits

Author SHA1 Message Date
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 2014-01-28 08:03:36 +01:00
Progi1984 8ded92840b CI via Travis : HHVM 2014-01-23 13:00:30 +01:00
Bruno Casado ad58e726e5 Add some tests to new wrapping image 2014-01-20 10:55:54 -02: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
Roman Syroeshko abbd288509 https://github.com/PHPOffice/PHPWord/issues/46
Ability to apply XSLT to Template
2014-01-01 06:28:10 -08: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
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 fa7de9c977 Word2007 : Support Multiple headers 2013-12-15 15:54:09 +01:00
Progi1984 72977545bd Merge pull request #42 from RLovelett/multiple-headers
Support Multiple headers
2013-12-15 06:55:03 -08:00
Ryan Lovelett 4fb18005ce Sections can support multiple headers
Each section can now have a single header (previous behavior). It can
now also support multiple headers. The spec defines three types of
headers: default, first, and even. These code changes provide support
for all three.

The HeaderFooter.php example has also been updated to illustrate how to
use the new multiple headers for a section.

Used these pages as spec reference:

http://www.schemacentral.com/sc/ooxml/e-w_headerReference-1.html
http://www.schemacentral.com/sc/ooxml/a-w_type-4.html
2013-12-15 09:49:02 -05: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
Progi1984 3c78edd9f4 IMPROVED : Test if text is UTF-8 before converting 2013-12-15 12:56:40 +01:00
Progi1984 6b2511e34e Merge develop 2013-12-15 12:36:34 +01:00
Progi1984 e345d862b7 Merge pull request #37 from RomanSyroeshko/PHPWord#34
PHPWord_Shared_String.IsUTF8 returns FALSE for Cyrillic UTF-8 input
2013-12-15 03:17:48 -08:00
Gabriel Bull 5c6319f15b Now only define PHPWORD_BASE_PATH once 2013-12-13 09:07:50 -05:00
Gabriel Bull b6a5bf21b8 Merge branch 'refs/heads/develop'
Conflicts:
	.travis.yml
	composer.json
	src/PHPWord/Writer/Word2007/Base.php
2013-12-13 06:45:37 -05:00
Progi1984 1e50dc0c4b CI via Travis 2013-12-13 11:39:03 +01:00
Progi1984 3f098ba901 Support de Composer 2013-12-13 11:38:22 +01:00
Progi1984 ea81f578b3 Support de Composer 2013-12-13 11:36:36 +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 d8ea62c50e Added test for image wrapping behind 2013-12-11 16:09:58 -05:00
Gabriel Bull 822ffc19af Fixed bug with autoloader 2013-12-11 15:34:07 -05:00
Gabriel Bull 50a9ab52b0 Added Unit Tests and fixed bugs with Autoloader 2013-12-11 15:08:54 -05:00