a95c3f83bc
Fix colspan and rowspan for tables in HTML Writer. Syntax improved.
2018-02-19 18:02:55 +08:00
557af99a6d
Fix colspan and rowspan for tables in HTML Writer
2018-02-19 13:08:17 +08:00
def023752d
Merge pull request #1248 from carusogabriel/patch-1
...
Refactoring
2018-02-18 01:40:24 +01:00
04d0c02e23
Add support for cellSpacing for tables ( #1040 )
...
* Add cellSpacing into table
* add word 2007 reader
* add tests
* add documentation
2018-02-18 00:10:10 +01:00
6a926e26f1
refactor attribute name to layout, add doc and tests
2018-02-14 00:39:37 +01:00
615c1d5576
Merge branch 'stretch-table' of https://github.com/aoloe/php-PHPWord
...
into tableLayout
Conflicts:
src/PhpWord/Writer/Word2007/Style/Table.php
2018-02-13 23:29:53 +01:00
7ddaed240f
table->setStretch() optionally avoids the table to stretch to the page width (only for word output)
2018-02-13 23:24:15 +01:00
ee95cf3df0
Merge pull request #1278 from troosan/fix_internal_links_in_html_output
...
Add HTML writer for Bookmarks + tests
2018-02-11 00:21:12 +01:00
377fb99fbc
Add HTML writer for Bookmarks + tests
2018-02-10 23:43:15 +01:00
5b381bc0c0
Merge branch 'develop' into various_html_parsing_fixes
2018-02-09 21:53:48 +01:00
604e60cae9
Add support for Track changes ( #1262 )
...
* add changed information to HTML writer
* add missing writeFontStyle
* refactor track changes
* set the style
* update documentation and release note
* Update the changelog and doc
* fix scrutinizer issues
2018-02-09 21:49:11 +01:00
fd127ef9bb
Merge pull request #779 from samsullivan/imagesavealpha
...
Save PNG alpha information when using remote images.
2018-02-09 17:16:03 +01:00
46a5f96d3b
fix parsing of table and p inside table cells
2018-02-06 23:16:32 +01:00
8ed3cacfe8
Refactoring
2018-01-16 20:19:54 -02:00
99b04f0353
fix reading of docx default style ( #1238 )
2018-01-12 23:42:22 +01:00
23693b403c
change impl to avoid compilation issue
2017-12-29 21:47:55 +01:00
400a8e65d3
rename 'Object' classes to 'ObjectElement' (php 7.2 compatibility) ( #1185 )
...
merge develop branch
2017-12-29 20:19:35 +01:00
b614497ae6
fix dependencies to have 7.1 compatible build ( #1228 )
...
* add assertions in test methods without assertions
* loosen dependencies so 7.0 & 7.1 builds can succeed
* fix some scrutinizer errors
* update release date
2017-12-29 02:30:53 +01:00
fce1bf28c8
format code
2017-12-25 22:05:46 +01:00
512cf952ae
randomise temp directory name to avoid collisions
2017-12-25 20:42:37 +01:00
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
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
9e029415cc
align with pull request submitted in PHPOffice/Commom
2017-12-13 23:17:01 +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
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
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
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
9ac9016f50
added functionality specified alias and tag
2017-11-06 20:53:08 +01:00
200d846f61
implement paragraph textAlignment
2017-11-05 21:39:10 +01:00
8c7ed19d62
Support for Mirrored page setup for docx ( #1183 )
2017-11-05 02:07:53 +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
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
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
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
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
e9cc289243
refactor Settings to not mix PHPWord settings and document settings
2017-07-05 21:42:38 +02:00
a6c6f9faa1
Merge branch 'development' into develop
...
Conflicts:
tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
2017-07-04 15:38:01 +02:00
8a5433e5df
add new NumberFormat values and refactor other uses
2017-07-04 15:04:30 +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
d5dbfb98b0
add support for contextualSpacing attribute issue #1037
2017-07-01 21:08:05 +02:00
8c3efa4a51
remove unused variable
2017-07-01 16:56:33 +02:00
e22ece8c00
#431
2017-06-19 11:05:59 +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
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
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
Matt Bolt
troosan
dox07
ale rimoldi
Gabriel Caruso
Maxim
Michael Spahn
sergeizelenyi
lightbringer
Maxim Barulin
Hubert Miazek
Mord1n
Lenz Weber
Maria Haubner