Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,800 Commits 1 Branch 0 Tags 12 MiB
Commit Graph

1800 Commits

Author SHA1 Message Date
troosan 487622bb9e
Merge pull request #1637 from bhattnishant/master 
To support PreserveText inside sub container
 2019-08-08 07:08:13 +02:00
troosan fa6a80fb4d
Merge pull request #1658 from 0b10011/readmelinks 
Use relative links in README to ensure they go to the correct branch
 2019-07-28 21:21:44 +02:00
Brandon Frohs 5f8fad3985 Use relative links in README to ensure they go to the correct branch 2019-07-11 17:14:35 -04:00
troosan 06c2f5683b
Merge pull request #1653 from auipga/patch-1 
Fix link anchor
 2019-07-10 23:59:34 +02:00
troosan 58adc1eb1f
Merge pull request #1644 from 0b10011/contributing 
Update CONTRIBUTING to match reality and add issue templates for bug reports, feature requests, and usage questions
 2019-07-10 23:55:57 +02:00
Manuel Transfeld 4f7790baab
Fix link anchor 
Fix a typo in a link
 2019-07-09 17:22:30 +02:00
troosan 7768c56a56
Merge pull request #1645 from JBlond/develop 
Update Wrong definition
 2019-07-09 07:43:10 +02:00
Mario 9abf4473b0
Update Wrong definition 2019-07-02 16:02:52 +02:00
Brandon Frohs b13aa70ae9 Move pull request template to avoid confusion 2019-07-01 13:36:41 -04:00
Brandon Frohs 71ac081cfa Add note about using `composer check` before submitting pull requests 2019-07-01 13:34:05 -04:00
Brandon Frohs 74e52ce71b Remove the existing issue template 2019-07-01 13:33:48 -04:00
Brandon Frohs e401adeb7e Update CONTRIBUTING to match reality and account for new issue templates 2019-07-01 13:10:55 -04:00
Brandon Frohs d6b0977afe Add issue templates for bug reports, feature requests, and usage questions 2019-07-01 13:09:36 -04:00
troosan d7ed18c39d fix test 2019-06-14 00:19:44 +02:00
Nishant Bhatt b209fec72b To suport preseve text inside sub container 
if we use preseve text inside table, issue fix

https://stackoverflow.com/questions/33070424/phpword-cannot-add-preservetext-in-section
 2019-06-03 15:44:10 +02:00
troosan fe531cae55
Merge pull request #1616 from nicoder/patch-5 
fix typo in changelog
 2019-04-24 22:00:31 +02:00
Nicolas Dermine c00c77c4c1
fix typo in changelog 2019-04-17 18:27:33 +02:00
troosan b1903524b9
Merge pull request #1611 from zearg/develop 
call static instead of self on protected method
 2019-04-16 20:40:48 +02:00
arthur 2045e52db7 call static instead of self on protected method 2019-04-09 10:55:43 +02:00
troosan 1534dc23c3
Merge pull request #1595 from NickCoolii/patch-1 
Added new constant to russian language
 2019-03-31 20:48:10 +02:00
troosan 8cea3221dc
remove trailing spaces 2019-03-31 13:20:51 +02:00
troosan 6e4f18c2b0
Merge pull request #1585 from seamuslee001/libxml_improve 
Ensure that entity_loader disable variable is re-set back to the orig…
 2019-03-31 13:19:25 +02:00
Seamus Lee 607378b8fb Ensure that entity_loader disable variable is re-set back to the original setting 
Simplify the setting of libxml_disable_entity_loader
 2019-03-31 08:31:49 +11:00
Mykola Nicholas 014ff7d261
Added new constant to russian language 2019-03-13 16:39:32 +03:00
troosan 2d2fe52b7a
Merge pull request #1387 from SailorMax/html_writer_auto_invert_text_color 
Html writer auto invert text color
 2019-03-05 23:05:37 +01:00
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