aae9ad4249
Fix names of styles
2017-06-19 13:47:47 +03:00
28e3242a1d
Merge remote-tracking branch 'upstream/develop' into develop
2017-06-19 13:25:56 +03:00
e22ece8c00
#431
2017-06-19 11:05:59 +02:00
cbea5aed87
Merge branch 'footer_properties' into develop
2017-06-17 01:02:40 +02:00
eff532e64f
make code php 5.3 -> 5.5 compatible
2017-06-17 01:01:54 +02:00
2d1b52bc90
Merge branch 'support_for_xe_and_index_field' into develop
2017-06-17 00:35:39 +02:00
2b4b200e42
fix namespace
2017-06-17 00:34:02 +02:00
11d816f94d
php 5.3 compatibility
2017-06-16 22:39:20 +02:00
373039cbdc
Merge branch 'support_for_xe_and_index_field' into develop
2017-06-16 18:01:23 +02:00
64f06e1114
use fully qualified name
2017-06-16 17:55:24 +02:00
f0fa91f63c
Merge branch 'support_for_xe_and_index_field' into develop
2017-06-11 12:58:06 +02:00
8aabf812f8
update XE field to support formatted text + add documentation
2017-06-11 12:56:59 +02:00
ee2dcddc6e
Merge branch 'support_for_xe_and_index_field' into develop
2017-06-07 02:27:55 +02:00
6a84b8ed26
Add possiblity to add not defined options
2017-06-07 02:26:59 +02:00
7ce54abac3
Merge remote-tracking branch 'github_troosan/footnote_properties' into develop
2017-05-30 00:37:37 +02:00
ac89cc39ea
Add possibility to control the footnote number
2017-05-30 00:31:32 +02:00
f21f79761a
fix sample
2017-05-25 22:04:23 +02:00
68dd3fd576
rename attribute to match generated XML node name
2017-05-24 00:18:17 +02:00
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
11c711b275
Merge branch 'fix_font_style_based_on' into develop
2017-05-16 02:41:52 +02:00
09e669f9e9
basedOn not correctly set if FontStyle is based on other FontStyle
2017-05-16 02:38:15 +02:00
6e49e89547
Merge branch 'support_comments' into develop
2017-05-15 23:00:10 +02:00
1cfb62de0d
Add support for comments
2017-05-15 22:49:02 +02:00
0e0817c972
ignore the build directory
2017-05-12 00:45:31 +02:00
759794d746
fix twig dependency so build can succeed
2017-05-12 00:45:21 +02:00
71574d1fe2
Code Review; minor changes to salt handling, corrected some comments
2017-03-13 16:22:04 +01:00
4decaffd53
PHPWord is looking for a new maintainer
2017-03-13 14:45:57 +01:00
76246630ce
add test
2017-03-10 17:30:51 +01:00
0221414ee0
randomly genereate salt for word password protection
2017-03-10 16:57:42 +01:00
703e34137b
refactored hash function to word settings
2017-03-10 16:24:52 +01:00
483a167500
refactoring of hash function
2017-03-10 15:44:13 +01:00
05387fac09
enable password setting in word
2017-03-10 13:28:32 +01:00
488b10b73b
allow setValue() for SDTs
2017-03-08 13:08:33 +01:00
f9cab8d02c
Fix name of style definitions
2017-02-21 21:42:56 +03:00
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
aef7a0ba76
add possibility to write w:evenAndOddHeaders in settings.xml
2017-01-29 14:34:19 +01:00
7c08dd595b
Merge remote-tracking branch 'github_troosan/fix_image_loading_over_https' into develop
2017-01-29 13:47:59 +01:00
217fd6ecf1
fix image loading over https
2017-01-29 13:37:43 +01:00
517c432ee6
fix image loading over https
2017-01-29 13:16:54 +01:00
91f79d85cf
Merge branch 'show_hide_spelling_grammatical_errors' into develop
2017-01-28 12:04:51 +01:00
d23409f687
Add possibility to show/hide spelling and grammatical errors
2017-01-28 11:39:43 +01:00
8b960c79d5
stylization code
2017-01-23 16:43:56 +03:00
1ab93e7e8a
added functionality specified alias and tag
2017-01-23 16:15:33 +03:00
8d7775552c
Merge remote-tracking branch 'github_troosan/paper_size_computation' into develop
2017-01-22 15:16:16 +01:00
fc3bc29a02
fix default page size
2017-01-22 11:09:44 +01:00
da60645be3
Merge remote-tracking branch 'github_troosan/paper_size_computation' into develop
2017-01-21 19:29:14 +01:00
b6a9f7c9b3
fix paper size and add tests for Paper class
2017-01-21 19:06:49 +01:00
38a4e79c3c
Merge branch 'image_from_string' into develop
2016-12-14 22:41:28 +01:00
1a1b362f40
Update Paragraph.php
2016-12-13 21:51:44 +01:00
6da9d8a0bf
Merge pull request #928 from likeuntomurphy/develop
...
Fixes PHPOffice/PHPWord#927
2016-12-13 16:56:57 +01:00
Andrey Tyshev
Hubert Miazek
antoine
Mord1n
Lenz Weber
Progi1984
Maria Haubner
sergeizelenyi
Stéphane Mourey