200c2f1eb0
Merge pull request #1019 from jun-i-corn/feature/EnablePasswordProtection
...
enable password protection (Word)
2017-12-20 22:00:34 +01:00
8929917677
Merge pull request #592 from ComputerTinker/ComputerTinker-FixEmptyDropdownEntry
...
Pad Empty Dropdown Entry
2017-12-19 21:53:59 +01:00
0f200d99f4
Merge pull request #1222 from carusogabriel/clean-elses
...
Clean elses
2017-12-19 21:41:21 +01:00
87acd3764b
Clean elses
2017-12-14 12:21:16 -02:00
5a57409df0
fix tests
2017-12-13 23:55:48 +01:00
ad38d4c20f
Merge branch 'feature/EnablePasswordProtection' of https://github.com/jun-i-corn/PHPWord into feature/EnablePasswordProtection
2017-12-13 23:25:32 +01:00
f7d2ad7201
formatting
2017-12-13 23:24:37 +01:00
9e029415cc
align with pull request submitted in PHPOffice/Commom
2017-12-13 23:17:01 +01:00
dc7cb1ee75
update changelog & doc
2017-12-13 22:48:58 +01:00
253b060241
correctly parse on/off values (w:val="true|false|1|0|on|off")
2017-12-13 07:47:49 +01:00
88bbe49d01
Merge pull request #1217 from troosan/html_br
...
Added support for linebreaks <br/> in Shared\Html::addHtml()
2017-12-05 21:38:55 +01:00
d4c6427418
Merge pull request #727 from irond/container_for_checkbox
...
Add TextRun as container for CheckBox
2017-12-05 21:28:59 +01:00
0c7593ba10
Merge pull request #582 from SSchwaiger/patch-2
...
A chart object can also be added to a table cell
2017-12-05 21:04:07 +01:00
fd156bf12a
Merge branch 'develop' into html_br
2017-12-05 20:50:13 +01:00
9081ed9868
fix warning
2017-12-05 17:40:23 +01:00
8f512bf618
Merge branch 'develop-html-br' of https://github.com/anrikun/PHPWord
...
into develop
Conflicts:
src/PhpWord/Shared/Html.php
2017-12-05 17:33:51 +01:00
05e2f1bf63
use non deprecated method
2017-12-05 08:02:23 +01:00
cfc89b7853
Merge branch 'develop' into feature/EnablePasswordProtection
2017-12-05 00:34:14 +01:00
274f50ce5a
Add unit tests & add array type checks
2017-12-04 22:30:49 +01:00
ca25eba8aa
Scrutinizer fixes
2017-11-26 22:55:37 +01:00
23bc837666
Scrutinizer fixes
2017-11-26 17:54:47 +01:00
911739a0b2
Merge branch 'develop' into odt_page_break
2017-11-26 00:36:37 +01:00
355027d854
PHP-CS fix, improve code coverage
2017-11-26 00:11:09 +01:00
5d928db916
Implement PageBreak for odt writer
2017-11-25 23:44:45 +01:00
5a5ae48bb6
also add w:bCs
2017-11-25 21:37:11 +01:00
ab5d4468f9
add the updateFields option on document settings
...
When set to true, word will ask you to update the fields in the document
when you open the document.
2017-11-25 01:48:30 +01:00
2e562512f4
Add unit tests for PasswordEncoder
2017-11-24 14:45:05 +01:00
ad83196a05
move password encoding in separate class
...
fix PHPCS errors
add documentation
add sample
2017-11-23 22:49:21 +01:00
7b30145270
Merge branch 'develop' into feature/EnablePasswordProtection
2017-11-22 22:59:46 +01:00
6a5d2a636d
CS fixer warning
2017-11-22 09:02:16 +01:00
8d82340589
Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into release_0.14
2017-11-22 08:42:13 +01:00
38ea5ecb5f
fix wrong variable
2017-11-22 08:41:42 +01:00
e07195c512
add test, fix warnings
2017-11-22 08:14:22 +01:00
0354e4e4a1
Merge pull request #480 from fergusean/patch-1
...
Skip inquiring PHP for temp directory when it's user defined
2017-11-22 00:24:03 +01:00
670d46e543
add getter/setter on paragraph for child spacing rule
2017-11-22 00:14:31 +01:00
ac357d10d5
Various fixes
...
- parse text inside list items
- add tests
- rename Cell widthType attribute to unit
2017-11-18 15:55:05 +01:00
b22208f810
format
2017-11-16 23:09:56 +01:00
bc4750dd7c
Merge pull request #1060 from Mord1n/patch-1
...
ODT Writer automatic-styles should be closed before opening master-styles.
2017-11-16 23:08:13 +01:00
9cd373806c
fix build
2017-11-16 17:47:48 +01:00
5ad68e0ba6
add tests, improve code coverage
2017-11-15 22:58:28 +01:00
8eb72c976a
add HTML table parsing
2017-11-15 22:49:13 +01:00
a01d22ed67
improve HTML parser and add tests
2017-11-11 23:49:23 +01:00
ff8234bce4
add tests
2017-11-10 23:37:02 +01:00
9e7e07d0bc
Add unit tests for Html parser
2017-11-09 00:41:56 +01:00
c8b55b8e59
Merge branch 'bring_back_bold_and_italic' of https://github.com/FBnil/PHPWord into bring_back_bold_and_italic
2017-11-08 21:46:55 +01:00
fcdafeedd4
Bring back b, i, <span style="font-style: italic;"> and <span style="font-weight: bold;">
2017-11-08 21:46:37 +01:00
13dc3bb2e4
Merge pull request #874 from bskrtich/develop
...
Fix incorrect image size between windows and mac.
2017-11-08 00:45:00 +01:00
5412df29fa
update doc
2017-11-08 00:34:22 +01:00
64a6505f70
Merge pull request #578 from ComputerTinker/develop
...
#574 Incorrect Constant Names in \Style\Font.php
2017-11-08 00:31:45 +01:00
610d91e041
call parent constructor in SDT and FormField
2017-11-08 00:27:58 +01:00
1b9c1d921b
format
2017-11-07 23:13:41 +01:00
75bf84fa48
Merge pull request #887 from taophp/patch-1
...
Fix division by zero
2017-11-07 22:34:49 +01:00
5ddb3f0b77
Merge remote-tracking branch 'origin/develop' into tmp
...
Conflicts:
src/PhpWord/Writer/Word2007/Element/SDT.php
2017-11-07 17:43:22 +01:00
1e9203adc9
add unit tests
2017-11-06 21:47:02 +01:00
9c1c544954
stylization code
2017-11-06 20:53:08 +01:00
9ac9016f50
added functionality specified alias and tag
2017-11-06 20:53:08 +01:00
a7a35c688d
Allow reading of TargetMode for external images
2017-11-05 22:48:04 +01:00
200d846f61
implement paragraph textAlignment
2017-11-05 21:39:10 +01:00
92fc54992a
fix end of line space
2017-11-05 08:54:52 +01:00
ce377b9b58
fix php-cs error
2017-11-05 02:16:04 +01:00
8c7ed19d62
Support for Mirrored page setup for docx ( #1183 )
2017-11-05 02:07:53 +01:00
de9268ae12
Merge pull request #1150 from kaigoh/patch-2
...
pad the $args array instead of ignoring errors
2017-11-05 00:54:20 +01:00
835aa9c5a4
Merge branch 'develop' into fix_php7_issues
2017-11-05 00:22:04 +01:00
03d4a36b9b
fixed HTML superscript, and added allcaps, smallcaps, and letter-spacing
2017-11-05 00:03:06 +01:00
601a2b6ec6
make Comment constructor attributes optional
2017-11-04 23:26:04 +01:00
f4697ab6e1
Merge pull request #1178 from lightbringer1991/489-fix-wrappingStyle-z-index-in-64bit-OS
...
489: Fix z-index size too big in 64bit OS
2017-11-04 22:44:44 +01:00
0459670a9c
Enable php-cs-fixer in build & fix resulting warnings ( #1099 )
...
* enable php 7.1 build
* upgrade to dompdf/dompdf 0.8.*
* update phpunit & hide output during tests
* run code coverage analysis on 1 build only
* Add php-cs
* Update Copyright
2017-11-04 22:44:12 +01:00
3cbc65bae4
489: Fix z-index size too big in 64bit OS
2017-10-28 18:56:16 +11:00
87a355bb82
Bring back b, i, <span style="font-style: italic;"> and <span style="font-weight: bold;">
2017-10-21 00:07:52 +02:00
ba9e8958d7
Replace self:: with static:: calls
2017-10-19 18:51:57 +03:00
f7cb73e8a6
Get rid of duplicated code in TemplateProcessor.php
2017-10-19 17:33:46 +03:00
4084d4f191
Update AbstractContainer.php
...
Suppressing the PHP warning doesn't seem to work. Padding the $args array does.
2017-10-09 13:19:23 +01:00
e6f4d0276a
Merge branch 'development' into fix_php7_issues
2017-09-27 01:09:23 +02:00
0beeb275fe
Add support for changing the document language ( #1108 )
2017-09-27 00:40:08 +02:00
6657f0eec3
fix doc
2017-09-26 22:46:46 +02:00
7e3d9fb89a
replace @link with @see
2017-09-26 22:00:02 +02:00
cb469b973e
more fixes
2017-09-26 17:34:57 +02:00
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
34a1be0053
Add support for XE and INDEX fields ( #922 )
2017-09-18 21:45:59 +02:00
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
34ac7170a2
Merge remote-tracking branch 'github_troosan/fix-travis-build' into fix_php7_issues
2017-09-13 22:25:16 +02:00
d5291629f7
Merge remote-tracking branch 'github_troosan/develop' into fix_php7_issues
2017-09-13 22:19:16 +02:00
41a048604e
upgrade to dompdf/dompdf 0.8.*
2017-09-13 22:10:04 +02:00
c448046b52
Fix: different footer for first page
2017-08-02 10:52:42 +02:00
cf76b1f217
Simplify SimpleType validation
2017-07-22 00:06:04 +02:00
18cb0b26f7
Add support for comments ( #1067 )
...
Just a writer for now, reader to be done
2017-07-11 01:58:54 +02:00
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
4c7c84b17e
fix pclzip compatibility issues
2017-07-09 22:21:34 +02:00
88cc13dd85
fix
2017-07-07 08:02:31 +02:00
722c81d89d
fix md remarks
2017-07-06 23:03:07 +02:00
b919d58bac
add reader for settings
2017-07-06 22:41:04 +02:00
e9cc289243
refactor Settings to not mix PHPWord settings and document settings
2017-07-05 21:42:38 +02:00
17849b3514
Merge pull request #1075 from slowprog/develop
...
Fix names of styles
2017-07-04 15:54:41 +02:00
a6c6f9faa1
Merge branch 'development' into develop
...
Conflicts:
tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
2017-07-04 15:38:01 +02:00
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
8a5433e5df
add new NumberFormat values and refactor other uses
2017-07-04 15:04:30 +02:00
663a552d29
Merge pull request #1008 from slowprog/develop
...
Fix name of style definitions
2017-07-03 14:14:43 +02:00
ef95611203
Fix multiple paragraphs being created
2017-07-03 12:54:18 +02:00
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
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
29f7cfb581
Merge pull request #1068 from troosan/footnote_properties
...
Add possibility to control the footnote number
2017-07-01 23:27:10 +02:00
0f649f3f37
Add test & update documentation
2017-07-01 22:51:53 +02:00
d5dbfb98b0
add support for contextualSpacing attribute issue #1037
2017-07-01 21:08:05 +02:00
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
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
8c3efa4a51
remove unused variable
2017-07-01 16:56:33 +02:00
2074d35ab0
Fix PreserveText in Section #452
2017-06-19 13:51:41 +03:00
aae9ad4249
Fix names of styles
2017-06-19 13:47:47 +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
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
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
71574d1fe2
Code Review; minor changes to salt handling, corrected some comments
2017-03-13 16:22:04 +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
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
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
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
51c6b5fc38
add support for Image creation from string image data
2016-11-08 23:40:10 +01:00
a070628225
Merge remote-tracking branch 'origin/develop' into develop
2016-11-08 23:33:50 +01:00
46eebe2136
add support for Image creation from string image data
2016-11-08 23:22:22 +01:00
3f9ab94812
Update MsDoc.php
...
fix style\font not found bug
2016-11-08 18:32:22 +08:00
000e36acfe
Fixes PHPOffice/PHPWord#927
2016-10-28 20:06:03 -04:00
c50e3c581a
replace tab with spaces
2016-10-28 23:28:05 +02:00
18474c56c4
replace tab with spaces
2016-10-28 23:27:24 +02:00
77ed1565c3
make FontStyle based on paragraph if it set
2016-10-28 22:40:44 +02:00
e7229fc15c
make FontStyle based on paragraph if it set
2016-10-28 22:27:05 +02:00
d52d9b8985
Add support for XE and INDEX fields
2016-10-27 23:12:26 +02:00
23e19a2d47
Fix division by zero
...
See #886
2016-09-12 16:43:21 +02:00
49492b2516
Fix incorrect image size between windows and mac.
...
See Issue #224
2016-08-26 11:06:19 -06:00
c71069022e
Merge pull request #821 from brutto/patch-1
...
Add info about Invalid image
2016-08-23 10:24:27 +02:00
2bcfacfbf9
Updated copyright.
2016-07-31 12:35:08 +04:00
1827eab20c
Removed deprecated code.
2016-07-30 22:41:31 +04:00
54013a6164
https://github.com/PHPOffice/PHPWord/issues/399 .
2016-07-30 22:32:32 +04:00
fb863cdf21
https://github.com/PHPOffice/PHPWord/issues/335 .
2016-07-30 16:02:23 +04:00
133b727f59
table->setStretch() optionally avoids the table to stretch to the page width (only for word output)
2016-07-25 10:11:52 +02:00
7deb010318
Fixed formatting.
2016-07-08 23:43:12 +04:00
e2ea1eec7c
Fixed tests.
2016-07-08 23:21:38 +04:00
3f1e0ac4a7
#483 . Output escaping for RTF.
2016-07-08 22:56:59 +04:00
649da97a42
Fixed build.
2016-06-28 21:50:02 +04:00
4c7e1399fe
#483 . Output escaping for HTML.
2016-06-28 21:37:36 +04:00
0652302423
add info about Invalid image
...
if there are many images in document are used and one of them throws `InvalidImageException` it is very difficult to detect which one without any message here...
2016-06-19 15:27:01 +03:00
508d6194fc
Fixed build.
2016-06-13 20:31:33 +04:00
ebbb3a525e
#483 . Output escaping for ODF.
2016-06-13 20:14:54 +04:00
a07dc6cdf0
#483 . Output escaping for OOXML.
2016-06-04 20:21:54 +04:00
ec3c62b051
#483 . Output escaping for OOXML.
2016-06-04 20:06:37 +04:00
d57973693d
#618 .
2016-04-23 19:49:10 +04:00
f4ec74a4c5
imagesavealpha() in Element\Image
2016-04-11 12:49:18 -05:00
adfcc62e64
imagesavealpha() in Writer\AbstractWriter
2016-04-11 12:48:43 -05:00
1c5bb3a911
#548 .
2016-04-09 22:03:21 +04:00
28f801b5d0
#704 .
2016-02-23 19:02:35 +04:00
0857f36572
Add TextRun as container for CheckBox
2016-02-12 17:37:44 +02:00
53a53695ff
Reviewed and merged #612 .
2016-02-06 22:14:29 +04:00
995dc68706
Improved coverage for `\PhpOffice\PhpWord\Element\Section` ( #665 ).
2016-01-23 22:19:06 +04:00
8bc236460a
Improved coverage for `\PhpOffice\PhpWord\Element\Section` ( #665 ).
2016-01-23 22:10:13 +04:00
a621447993
Improved coverage for `\PhpOffice\PhpWord\Element\Section` ( #665 ).
2016-01-23 21:35:04 +04:00
ea4388def5
Improved coverage for `\PhpOffice\PhpWord\Element\Section` ( #665 ).
2016-01-23 21:06:09 +04:00
f359825cb7
Reviewed and merged #658 .
2016-01-23 19:16:34 +04:00
529edcb68e
Merge pull request #617 from kazitanvirahsan/develop
...
Template processor setValue() improvements #614
2015-12-12 21:01:31 +04:00
7bd6cbdb64
Copyright update.
2015-12-05 21:28:46 +04:00
43fb23d896
Copyright update.
2015-12-05 21:26:01 +04:00
e6d73d8ff8
Removed custom autoloader.
2015-11-21 20:24:49 +04:00
95c097106f
Reorganized unit tests.
2015-11-15 21:34:36 +04:00
3965f110ff
Added backward compatibility for deprecated alignment options.
2015-11-14 15:57:15 +04:00
d74c0bd878
Added backward compatibility for deprecated alignment options.
2015-11-14 15:31:50 +04:00
f7afdebb03
Added support for linebreaks <br /> in Shared\Html::addHtml()
2015-11-12 18:51:04 +01:00
09e5e352a9
Changed init value of the NumberingLevel.alignment property.
2015-10-21 21:44:10 +04:00
12823a5fbf
Fixed build.
2015-10-10 19:32:53 +04:00
505cc76406
Fixed build.
2015-10-10 19:22:19 +04:00
94c0d02330
Next round of refactoring of alignment-related functionality.
2015-10-10 19:06:23 +04:00
b446a23b61
Update 2 Template processor setValue() improvements #614
2015-09-10 23:50:23 +10:00
troosan
Gabriel Caruso
Michael Spahn
Nilton
sergeizelenyi
lightbringer
Dmitry Lukashin
Kai Gohegan
Fabio Bas
Maxim Barulin
Andrey Tyshev
Hubert Miazek
Mord1n
Lenz Weber
Maria Haubner
Stéphane Mourey
Progi1984
liangtaohy
Jonathan Cox
Brandon Skrtich
Roman Syroeshko
ale rimoldi
Anton Karakulov
Sam Sullivan
Denis Solovyov
Roman Syroeshko
Henri MEDOT
kazi Tanvir Ahsan