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

258 Commits

Author SHA1 Message Date
troosan d5291629f7 Merge remote-tracking branch 'github_troosan/develop' into fix_php7_issues 2017-09-13 22:19:16 +02:00
troosan e9cc289243 refactor Settings to not mix PHPWord settings and document settings 2017-07-05 21:42:38 +02:00
troosan a6c6f9faa1 Merge branch 'development' into develop 
Conflicts:
	tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
 2017-07-04 15:38:01 +02:00
troosan 8a5433e5df add new NumberFormat values and refactor other uses 2017-07-04 15:04:30 +02:00
troosan e7c551a0bf Add possibility to show/hide spelling and grammatical errors (#985) 
* Add possibility to show/hide spelling and grammatical errors
 2017-07-02 00:37:29 +02:00
troosan 6a3135bff2 Merge pull request #989 from troosan/fix_for_different_even_odd_headers 
add possibility to write w:evenAndOddHeaders in settings.xml
 2017-07-01 23:36:46 +02:00
troosan 29f7cfb581 Merge pull request #1068 from troosan/footnote_properties 
Add possibility to control the footnote number
 2017-07-01 23:27:10 +02:00
troosan 0f649f3f37 Add test & update documentation 2017-07-01 22:51:53 +02:00
troosan ccccb3d679 Merge pull request #988 from troosan/fix_image_loading_over_https 
fix image loading over https
 2017-07-01 17:07:07 +02:00
antoine cbea5aed87 Merge branch 'footer_properties' into develop 2017-06-17 01:02:40 +02:00
antoine eff532e64f make code php 5.3 -> 5.5 compatible 2017-06-17 01:01:54 +02:00
antoine 2d1b52bc90 Merge branch 'support_for_xe_and_index_field' into develop 2017-06-17 00:35:39 +02:00
antoine 11d816f94d php 5.3 compatibility 2017-06-16 22:39:20 +02:00
antoine f0fa91f63c Merge branch 'support_for_xe_and_index_field' into develop 2017-06-11 12:58:06 +02:00
antoine 8aabf812f8 update XE field to support formatted text + add documentation 2017-06-11 12:56:59 +02:00
antoine ee2dcddc6e Merge branch 'support_for_xe_and_index_field' into develop 2017-06-07 02:27:55 +02:00
antoine 6a84b8ed26 Add possiblity to add not defined options 2017-06-07 02:26:59 +02:00
antoine 7ce54abac3 Merge remote-tracking branch 'github_troosan/footnote_properties' into develop 2017-05-30 00:37:37 +02:00
antoine ac89cc39ea Add possibility to control the footnote number 2017-05-30 00:31:32 +02:00
antoine 11c711b275 Merge branch 'fix_font_style_based_on' into develop 2017-05-16 02:41:52 +02:00
antoine 09e669f9e9 basedOn not correctly set if FontStyle is based on other FontStyle 2017-05-16 02:38:15 +02:00
antoine 6e49e89547 Merge branch 'support_comments' into develop 2017-05-15 23:00:10 +02:00
antoine 1cfb62de0d Add support for comments 2017-05-15 22:49:02 +02:00
antoine d8c5703e06 Merge remote-tracking branch 
'github_troosan/fix_for_different_even_odd_headers' into develop

Conflicts:
	tests/PhpWord/SettingsTest.php
	tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
 2017-01-29 14:54:08 +01:00
antoine aef7a0ba76 add possibility to write w:evenAndOddHeaders in settings.xml 2017-01-29 14:34:19 +01:00
antoine 217fd6ecf1 fix image loading over https 2017-01-29 13:37:43 +01:00
antoine 517c432ee6 fix image loading over https 2017-01-29 13:16:54 +01:00
antoine 91f79d85cf Merge branch 'show_hide_spelling_grammatical_errors' into develop 2017-01-28 12:04:51 +01:00
antoine d23409f687 Add possibility to show/hide spelling and grammatical errors 2017-01-28 11:39:43 +01:00
antoine 8d7775552c Merge remote-tracking branch 'github_troosan/paper_size_computation' into develop 2017-01-22 15:16:16 +01:00
antoine fc3bc29a02 fix default page size 2017-01-22 11:09:44 +01:00
antoine da60645be3 Merge remote-tracking branch 'github_troosan/paper_size_computation' into develop 2017-01-21 19:29:14 +01:00
antoine b6a9f7c9b3 fix paper size and add tests for Paper class 2017-01-21 19:06:49 +01:00
Progi1984 6da9d8a0bf Merge pull request #928 from likeuntomurphy/develop 
Fixes PHPOffice/PHPWord#927
 2016-12-13 16:56:57 +01:00
antoine 51c6b5fc38 add support for Image creation from string image data 2016-11-08 23:40:10 +01:00
antoine 46eebe2136 add support for Image creation from string image data 2016-11-08 23:22:22 +01:00
Jonathan Cox 000e36acfe Fixes PHPOffice/PHPWord#927 2016-10-28 20:06:03 -04:00
antoine 8318b412e9 Merge remote-tracking branch 'github_troosan/support_for_xe_and_index_field' into develop 2016-10-28 23:14:34 +02:00
antoine 77ed1565c3 make FontStyle based on paragraph if it set 2016-10-28 22:40:44 +02:00
antoine e7229fc15c make FontStyle based on paragraph if it set 2016-10-28 22:27:05 +02:00
antoine 0953065b8c improve code coverage 2016-10-28 00:20:47 +02:00
antoine d52d9b8985 Add support for XE and INDEX fields 2016-10-27 23:12:26 +02:00
Roman Syroeshko 2bcfacfbf9 Updated copyright. 2016-07-31 12:35:08 +04:00
Roman Syroeshko fb863cdf21 https://github.com/PHPOffice/PHPWord/issues/335. 2016-07-30 16:02:23 +04:00
Roman Syroeshko ebbb3a525e #483. Output escaping for ODF. 2016-06-13 20:14:54 +04:00
Roman Syroeshko ec3c62b051 #483. Output escaping for OOXML. 2016-06-04 20:06:37 +04:00
Roman Syroeshko d57973693d #618. 2016-04-23 19:49:10 +04:00
Roman Syroeshko 995dc68706 Improved coverage for `\PhpOffice\PhpWord\Element\Section` (#665). 2016-01-23 22:19:06 +04:00
Roman Syroeshko a621447993 Improved coverage for `\PhpOffice\PhpWord\Element\Section` (#665). 2016-01-23 21:35:04 +04:00
Roman Syroeshko ea4388def5 Improved coverage for `\PhpOffice\PhpWord\Element\Section` (#665). 2016-01-23 21:06:09 +04:00