Commit Graph

1262 Commits

Author SHA1 Message Date
Maxim Barulin d5dbfb98b0 add support for contextualSpacing attribute issue #1037 2017-07-01 21:08:05 +02:00
troosan fd418e0746 Make sample php 5.3 compliant 2017-07-01 17:15:50 +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
troosan f59b7228bb Merge pull request #977 from troosan/paper_size_computation
fix paper size and add tests for Paper class
2017-07-01 17:03:01 +02:00
troosan 8c3efa4a51 remove unused variable 2017-07-01 16:56:33 +02:00
Andrey Tyshev 2074d35ab0 Fix PreserveText in Section #452 2017-06-19 13:51:41 +03:00
Andrey Tyshev aae9ad4249 Fix names of styles 2017-06-19 13:47:47 +03:00
Andrey Tyshev 28e3242a1d Merge remote-tracking branch 'upstream/develop' into develop 2017-06-19 13:25:56 +03:00
Hubert Miazek e22ece8c00 #431 2017-06-19 11:05:59 +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 2b4b200e42 fix namespace 2017-06-17 00:34:02 +02:00
antoine 11d816f94d php 5.3 compatibility 2017-06-16 22:39:20 +02:00
antoine 373039cbdc Merge branch 'support_for_xe_and_index_field' into develop 2017-06-16 18:01:23 +02:00
antoine 64f06e1114 use fully qualified name 2017-06-16 17:55:24 +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 f21f79761a fix sample 2017-05-25 22:04:23 +02:00
antoine 68dd3fd576 rename attribute to match generated XML node name 2017-05-24 00:18:17 +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 0e0817c972 ignore the build directory 2017-05-12 00:45:31 +02:00
antoine 759794d746 fix twig dependency so build can succeed 2017-05-12 00:45:21 +02:00
Progi1984 4decaffd53 PHPWord is looking for a new maintainer 2017-03-13 14:45:57 +01:00
Andrey Tyshev f9cab8d02c Fix name of style definitions 2017-02-21 21:42:56 +03: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 7c08dd595b Merge remote-tracking branch 'github_troosan/fix_image_loading_over_https' into develop 2017-01-29 13:47:59 +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
antoine 38a4e79c3c Merge branch 'image_from_string' into develop 2016-12-14 22:41:28 +01:00
Progi1984 6da9d8a0bf Merge pull request #928 from likeuntomurphy/develop
Fixes PHPOffice/PHPWord#927
2016-12-13 16:56:57 +01:00
Progi1984 c4c35ddb63 Merge pull request #937 from troosan/image_from_string
add support for Image creation from string image data
2016-12-13 09:32:25 +01:00
antoine 204f0c32ec update documentation 2016-12-12 20:39:10 +01:00
antoine 51c6b5fc38 add support for Image creation from string image data 2016-11-08 23:40:10 +01:00
antoine a070628225 Merge remote-tracking branch 'origin/develop' into develop 2016-11-08 23:33:50 +01:00
antoine 46eebe2136 add support for Image creation from string image data 2016-11-08 23:22:22 +01:00