Commit Graph

279 Commits

Author SHA1 Message Date
troosan e6f4d0276a Merge branch 'development' into fix_php7_issues 2017-09-27 01:09:23 +02:00
troosan 0beeb275fe Add support for changing the document language (#1108) 2017-09-27 00:40:08 +02:00
troosan 75a3fb8e40 Improve code coverage 2017-09-27 00:27:33 +02:00
troosan 7e3d9fb89a replace @link with @see 2017-09-26 22:00:02 +02:00
troosan cb469b973e more fixes 2017-09-26 17:34:57 +02:00
troosan e0a2c40fb4 fix failing test 2017-09-26 08:01:28 +02:00
troosan a8ade6d22d general updates
Change "some" code to comply to php-cs rules
Update copyright year to 2010-2017
2017-09-24 22:15:42 +02:00
troosan 34a1be0053 Add support for XE and INDEX fields (#922) 2017-09-18 21:45:59 +02:00
troosan 8ce1a19ec4 make FontStyle basedOn paragraph if the paragraph is set on the font (#926)
* make FontStyle based on paragraph if it set
* replace tab with spaces
* basedOn not correctly set if FontStyle is based on other FontStyle
* Fix warnings
2017-09-17 21:38:00 +02:00
troosan 8b0ce2e936 commit doc based on php 5.6 build 2017-09-14 00:12:29 +02:00
troosan 0115fc3d91 fix formating 2017-09-14 00:00:48 +02:00
troosan 9d57693acd update phpunit & hide output during tests 2017-09-13 23:15:46 +02:00
troosan 34ac7170a2 Merge remote-tracking branch 'github_troosan/fix-travis-build' into fix_php7_issues 2017-09-13 22:25:16 +02:00
troosan d5291629f7 Merge remote-tracking branch 'github_troosan/develop' into fix_php7_issues 2017-09-13 22:19:16 +02:00
troosan 18cb0b26f7 Add support for comments (#1067)
Just a writer for now, reader to be done
2017-07-11 01:58:54 +02:00
troosan be6b6008e8 add reader/writer for additional values in settings.xml (#1098)
* add reader/writer for settings.xml
The following values can currently be set/read
- w:trackRevisions
- w:doNotTrackMoves
- w:doNotTrackFormatting
- w:proofState
- w:zoom
- w:decimalSymbol
- w:revisionView
2017-07-11 01:56:20 +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