Commit Graph

2094 Commits

Author SHA1 Message Date
Jeroen Moors 43a00b16ff Renamed sample files. 2014-03-07 17:22:30 +01:00
Jeroen Moors 57f330c099 Handle the cases were there's no whitespace after <w:tr. 2014-03-07 17:20:40 +01:00
Jeroen Moors 590f08c42b Update cloneRow function to support vertical spanned cells. 2014-03-07 17:20:14 +01:00
Jeroen Moors 21589ffa61 Renamed the output file to 'Sample_03_TemplateCloneRow_result.docx'. 2014-03-07 17:19:59 +01:00
Jeroen Moors b5f71317b7 Create table rows on the fly with cloneRow() when using templates. 2014-03-07 17:18:51 +01:00
Roman Syroeshko 4c414c8524 https://github.com/PHPOffice/PHPWord/issues/46
Positive test fix #3.
2014-03-07 18:09:44 +04:00
Roman Syroeshko 379e5ce2e8 https://github.com/PHPOffice/PHPWord/issues/46
Positive test fix.
2014-03-07 18:04:44 +04:00
Roman Syroeshko 19636a0594 https://github.com/PHPOffice/PHPWord/issues/46
Fix for positive test.
2014-03-07 17:59:37 +04:00
Roman Syroeshko 657e8345b3 https://github.com/PHPOffice/PHPWord/issues/46 2014-03-07 05:54:09 -08:00
Roman Syroeshko 60c21a2fee https://github.com/PHPOffice/PHPWord/issues/46
Positive test.
2014-03-07 17:47:23 +04:00
Ivan Lanin 0d1c368c41 setNormalStyle > setDefaultParagraphStyle 2014-03-07 19:31:13 +07:00
Ivan Lanin 5889313743 php syntax higlighting on README.md 2014-03-07 18:09:25 +07:00
Ivan Lanin 09ba95bd88 Paragraph: Ability to define (1) normal paragraph style with PHPWord::setNormalStyle() and (2) parent style (basedOn) and style for following paragraph (next) 2014-03-07 18:02:47 +07:00
Ivan Lanin be4b01b652 PHPWord_Shared_Font::pointSizeToTwips 2014-03-07 11:14:45 +07:00
Progi1984 545cbc6e23 GH-51 : Adding a value that contains "&" in a template breaks it 2014-03-06 23:29:51 +01:00
Progi1984 55a5b7e089 Changelog : Feature for columns in section, continuous section break, softbreak, hanging paragraph, and normal style 2014-03-06 21:20:40 +01:00
Progi1984 626ea089b0 Merge pull request #86 from ivanlanin/develop
New features: (1) multicolumn section; (2) table width; (3) table row repeat as header & break across pages; (4) superscript & subscript font
2014-03-06 21:18:28 +01:00
Ivan Lanin 350e7a61b6 Revert Tests/bootstrap.php and samples/Sample_03_Sections.php 2014-03-07 02:07:24 +07:00
Ivan Lanin 22afd14281 Update change log 2014-03-07 00:42:33 +07:00
Ivan Lanin 136127894a Revert 2014-03-07 00:32:00 +07:00
Ivan Lanin 938d78f40b Samples: (1) Superscript and subscript; (2) Multicolumn 2014-03-06 22:07:09 +07:00
Ivan Lanin f1c2c2fe5e Copyright year 2014-03-06 22:06:01 +07:00
Ivan Lanin 7533d30125 Changes:
- Use constants instead of hardcoded name and size for font (Arial, 20)
- Section: Multicolumn
- Section: Different section break
- Paragraph: Hanging paragraph
- Font: Superscript and subscript
- Table: Table width in percentage
- Table: Repeat as header row
- Table: Allow row to break across pages
2014-03-06 20:57:00 +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
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
Roman Syroeshko 670765f80f https://github.com/PHPOffice/PHPWord/issues/46
Notes on error control usage were added.
2014-03-04 14:36:39 +04: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
Roman Syroeshko b765312469 https://github.com/PHPOffice/PHPWord/issues/46
FIXED: indentation.
2014-03-03 21:12:05 +04:00
Roman Syroeshko a8b73b9061 https://github.com/PHPOffice/PHPWord/issues/46
FIXED: tests (last test was removed, because there is no chance to make
it work).
2014-03-03 20:36:02 +04:00
Roman Syroeshko bfe7da63fc https://github.com/PHPOffice/PHPWord/issues/46
FIXED: last negative test.
2014-03-03 20:17:49 +04:00
Roman Syroeshko ec5322d9ab https://github.com/PHPOffice/PHPWord/issues/46 2014-03-03 08:15:51 -08:00
Roman Syroeshko bdcbd149e7 https://github.com/PHPOffice/PHPWord/issues/46
FIXED (again): compatibility with PHP 5.3.
FIXED (again): misprint in method name.
2014-03-03 17:03:09 +04:00
Roman Syroeshko 1c3ebe1f91 https://github.com/PHPOffice/PHPWord/issues/46
An attempt to fix tests.
2014-03-03 16:53:00 +04: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
Roman Syroeshko e0e48938fa https://github.com/PHPOffice/PHPWord/issues/46
Boolean values now meet PHP-FIG.
2014-03-02 10:06:27 -08:00
Gabriel Bull d5e55e7c4b Moved back phpunit.xml.dist file to root of directory 2014-03-02 12:46:56 -05:00
Roman Syroeshko 9f434c7fa8 https://github.com/PHPOffice/PHPWord/issues/46
Final keyword was removed in test class.
2014-03-02 09:33:26 -08:00
Roman Syroeshko a765d61b15 https://github.com/PHPOffice/PHPWord/issues/46 2014-03-02 08:44:40 -08:00
Roman Syroeshko d324a64808 https://github.com/PHPOffice/PHPWord/issues/46
FIXED: misprint in test's name.
2014-03-02 20:14:19 +04:00
Roman Syroeshko fb5ef658df https://github.com/PHPOffice/PHPWord/issues/46
Compatibility with PHP 5.3 was fixed.
2014-03-02 20:08:02 +04:00
Roman Syroeshko 27b7d67cc9 https://github.com/PHPOffice/PHPWord/issues/46
Tests.
2014-03-02 19:52:21 +04:00