1339 Commits

Author SHA1 Message Date
troosan
e9cc289243 refactor Settings to not mix PHPWord settings and document settings 2017-07-05 21:42:38 +02:00
troosan
21303ed4fb prepare release notes 2017-07-05 21:39:22 +02:00
troosan
17849b3514 Merge pull request #1075 from slowprog/develop
Fix names of styles
2017-07-04 15:54:41 +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
f3f11cb64b Merge pull request #1092 from troosan/implement_request_#1041
add new NumberFormat values and refactor FootnoteProperties to use same values
2017-07-04 15:30:21 +02:00
troosan
8a5433e5df add new NumberFormat values and refactor other uses 2017-07-04 15:04:30 +02:00
troosan
663a552d29 Merge pull request #1008 from slowprog/develop
Fix name of style definitions
2017-07-03 14:14:43 +02:00
troosan
ef95611203 Fix multiple paragraphs being created 2017-07-03 12:54:18 +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
ce492133a6 Merge pull request #1088 from troosan/add_support_for_contextual_spacing
Add support for contextual spacing
2017-07-01 23:09:40 +02:00
troosan
0f649f3f37 Add test & update documentation 2017-07-01 22:51:53 +02:00
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
Mord1n
a55405e655 Update Styles.php
automatic-styles should be closed before opening master-styles.

This will prevent issue that styles wont work in future if you implement styling for ODT writer....
2017-05-18 16:25:05 +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
Maria Haubner
488b10b73b allow setValue() for SDTs 2017-03-08 13:08:33 +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