Commit Graph

1775 Commits

Author SHA1 Message Date
Maxim 8931ab12b2
Merge branch 'develop' into html_writer_auto_invert_text_color 2019-03-01 16:33:50 +02:00
Maxim Bulygin 57ae7008b2 add test to auto invert text color 2019-03-01 16:31:47 +02:00
troosan 81af913a66
Update CONTRIBUTING.md 2019-02-24 21:23:59 +01:00
Nick Winfield 81a1b2acff TrackChange doesn't handle all return types of \DateTime::createFromFormat(...) (#1584)
* Added boolean check before setting the date
2019-02-24 00:24:49 +01:00
troosan 9958a4825f allow other streams 2019-02-22 22:06:54 +01:00
troosan b3982ebb70 fix documentation 2019-02-22 22:06:30 +01:00
troosan 0a73bfd115
Merge pull request #1570 from troosan/fix_parsing_html_border_color
fix parsing of border-color and add test
2019-02-06 22:43:41 +01:00
troosan 3219950d59 trim color codes and add tests 2019-02-06 22:07:42 +01:00
troosan 5206c7f690 fix parsing of border-color and add test 2019-02-06 18:19:01 +01:00
troosan 6e172747ec
Merge pull request #1569 from troosan/page_vertical_align
implement support for section vAlign
2019-02-06 07:44:10 +01:00
troosan e3020c0db3 fix warnings 2019-02-05 23:05:18 +01:00
troosan 235cc1205c implement support for section vAlign 2019-02-05 21:42:14 +01:00
troosan 5b0c8a3e28 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into rebase_pull_request 2019-02-05 00:09:27 +01:00
troosan 58a2849e38 Add reading of the settings part 2019-02-04 23:59:37 +01:00
troosan 98026aefaf
Merge pull request #1565 from troosan/set_complex_type_in_template
Set complex type in template
2019-02-04 23:27:13 +01:00
troosan d2b0b317e0 fix scrutinizer warnings 2019-02-04 22:57:33 +01:00
troosan bc448aed6c improve code coverage 2019-02-04 21:53:19 +01:00
troosan d862b1f267 update documentation 2019-01-31 01:32:00 +01:00
troosan 67f3bd369c Add methods to replace macro with ComplexType 2019-01-31 01:26:19 +01:00
troosan af31fc5340
Merge pull request #1558 from ramsalt/develop
Language::validateLocale should pass with locale 'zxx'.
2019-01-30 20:18:20 +01:00
Stathis Papadopoulos 3c9fa2df13 Language::validateLocale should pass with locale 'zxx'. 2019-01-28 10:50:28 +01:00
troosan 1956908aa7 Merge remote-tracking branch
'geraldb-nicat/PHPWord/templateProcessingViaArray' into develop

Conflicts:
	docs/templates-processing.rst
2019-01-03 18:57:00 +01:00
troosan 3a7b8aba44
Merge pull request #1550 from troosan/add_support_for_table_rtl
Add RightToLeft table presentation
2019-01-03 12:44:49 +01:00
troosan 6aae8bdccb update doc and release note 2019-01-03 11:36:28 +01:00
troosan f91863ed64 Add RTL aligning of tables 2019-01-03 11:33:56 +01:00
troosan 4d76baea42
Merge pull request #1544 from troosan/avoid_remote_image_loading_during_tests
Use embedded http server to test loading of remote images
2019-01-02 14:36:54 +01:00
troosan c408ac5d50 Use embedded http server to test loading of remote images 2018-12-30 14:14:27 +01:00
troosan 7b7d4e4936 release version 0.16.0 2018-12-30 01:35:03 +01:00
troosan b375b8580f fix broken samples 2018-12-30 01:13:54 +01:00
troosan 54e7c6dd5a don't default styles to false
this allows us to for instance make part of a Heading not bold, which
would otherwise be the default.
2018-12-30 00:45:45 +01:00
troosan 1c35c4871a update develop badge 2018-12-30 00:41:58 +01:00
troosan 481f2c7310 fix code indenting 2018-12-29 23:30:23 +01:00
troosan 067c4f6809 update badges 2018-12-29 23:17:17 +01:00
troosan 3390c907dc fix scrutiniser warning 2018-12-29 23:16:56 +01:00
troosan 54b94be65a fix doc 2018-12-29 23:14:18 +01:00
troosan 23407c99dd Add unit tests 2018-12-29 22:03:01 +01:00
troosan 5057617de7 change regex instead of checking twice 2018-12-29 14:56:11 +01:00
Antonio Malatesta 7c8cfb7b8a Adding condition for document template saving using libreoffice
When  I save document template with libreoffice (in .docx format) the cloneRow with nested table doesn't work.
The problem is that the regular expression, that used for search if row is no longer part of the spanned row, was wrong: 
<w:vMerge w:val="continue" /> became <w:vMerge w:val="continue"/> without space at the closure tag.
Sorry for my English.
2018-12-29 14:50:30 +01:00
troosan b2c627d57c Merge branch 'parsing_heading2' develop
Conflicts:
	src/PhpWord/Reader/Word2007/Styles.php
	tests/PhpWord/Reader/Word2007/StyleTest.php
2018-12-28 22:33:48 +01:00
troosan 9e5da1e025 update changelog 2018-12-28 22:26:30 +01:00
troosan ccf291234e Avoid warning if variable is null 2018-12-28 20:32:10 +01:00
troosan d8d697c848 added convertors with test 2018-12-28 18:04:36 +01:00
troosan a4b532083b
Merge pull request #1162 from abcdmitry/patch-2
Break the references in foreach within TemplateProcessor
2018-12-27 22:22:20 +01:00
troosan 7790b6a6b0 Pass values to replace macros with in cloneBlock 2018-12-27 22:13:48 +01:00
troosan 01209ddbd1 improve template processor documentation 2018-12-27 21:05:56 +01:00
troosan 75620caf51 add parameter to keep backward compatibility + add test 2018-12-27 01:44:37 +01:00
troosan 1bcef04ddc Merge remote-tracking branch 'JPBetley/PHPWord/clone-block-variables' into rebase_pull_request 2018-12-27 01:29:51 +01:00
troosan 1717bd4978 add test for cloneBlock operation 2018-12-27 00:30:04 +01:00
troosan 0f963e40a7
Merge pull request #1536 from Samuel-BF/fix-RTF-numerals
For RTF writers, sizes should should never have decimals
2018-12-26 23:16:22 +01:00
troosan bbe517aa60
Merge pull request #1541 from morrisdj/develop
Add "Plain Text" type to SDT (Structured Document Tags)
2018-12-26 23:16:06 +01:00