Skip to content

Merge 0.15 to master #1429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 197 commits into from
Jul 14, 2018
Merged

Merge 0.15 to master #1429

merged 197 commits into from
Jul 14, 2018

Conversation

troosan
Copy link
Contributor

@troosan troosan commented Jul 14, 2018

Merge 0.15 to master

FrankMeyer and others added 30 commits July 21, 2015 14:07
@FrankMeyer
dded the ability to enable gridlines and axislabels on charts
62d3f97 
added options 'showAxisLabels', 'showGridX', 'showGridY' to charts style element
@FrankMeyer
Removed complains of php-codesniffer
3a25177 
removed whitespace
changed inline if statement
@FrankMeyer
changed if statement due to error in codesniffer
a652847
Add Date Formats to Field Element
cb03487 
Fix a typo (d-M-yyy H:mm), and expand the list of valid date formats.
Fix Hour Casing for Intended Formats to Work Correctly
a9398e3 
Time formats should either be "h" or "HH".  There were some formats
which were incorrectly specified as "H".
@samsullivan
imagesavealpha() in Writer\AbstractWriter
adfcc62
@samsullivan
imagesavealpha() in Element\Image
f4ec74a
@aoloe
table->setStretch() optionally avoids the table to stretch to the pag…
133b727 
…e width (only for word output)
@troosan
create alias for develop branch
fd7ee76
@troosan
add parsing of "align" HTML attribute
d2b9e88
@troosan
split composer scripts, add description (only works with composer 1.6)
1d8e7b8
@troosan
output the source code of the sample that was run
b20cd4f
@troosan
add instructions on how to run the samples in a browser
46e179d
@troosan
update changelog [skip ci]
709ea1e
@SailorMax @troosan
rename 'Object' classes to 'ObjectElement' (php 7.2 compatibility) (#…
400a8e6 
…1185)

merge develop branch
@troosan
fix merge
2d87fd3
@troosan
change impl to avoid compilation issue
23693b4
@troosan
add branch alias for 0.15.0 [skip ci]
d480aab
@troosan
add branch alias for 0.15.0 [skip ci]
7d929fe
@troosan
Merge branch 'master' of https://github.com/PHPOffice/PHPWord into up…
35aa6d6 
…stream_develop
@troosan
Do not show script source when running from CLI
4a530d1
@troosan
fix reading of docx default style (#1238)
99b04f0
@mussbach @troosan
Parse formatting inside HTML lists (#1239)
4c68ebb
@carusogabriel
Refactoring
8ed3cac
@troosan
Add parsing of HTML links
0425a25
@troosan
Merge pull request #1258 from troosan/parse_html_links
4f6fa50 
Add parsing of HTML links
@nicoder
fix typo in comment
30183e2
@troosan
Merge pull request #1259 from nicoder/patch-1
9a91d54 
fix typo in comment
@lalop
Delete VERSION
caba7e2 
Delete VERSION file since it's outdated so not usefull anymore
@mussbach
add (failing) test and correct documentation sample to valid HTML
8a9a478
troosan and others added 26 commits June 3, 2018 00:32
@troosan
Address scrutinizer issues
da43a88
@troosan
Merge commit '4e37afa15da62cdd695a18db2a40d86615086e9d' into
682b88b 
column_width_for_odt

# Conflicts:
#	CHANGELOG.md
@troosan
remove unused imports
5b97190
@troosan
Merge pull request #1352 from troosan/column_width_for_odt
4fa9455 
write column width in ODT writer
fix when style line-height size comes in decimal number
fe647f6
Merge branch 'develop' of github.com:jgpATs2w/PHPWord into develop
2593e9e
clean sample resource
c93880b
@jjok @troosan
Require ext-zip for development (#1419)
94cf1ae 
* Require `ext-zip` for development
* Require `ext-gd` for development
@troosan
disable entity loader
536a1b8
@troosan
update changelog
96b21ba
@troosan
remove options not compatible with latest phpunit version
4c4c6f4
@troosan
Merge pull request #1427 from troosan/libxml_disable_entity_loader
cdc1852 
disable entity loader before parsing XML to avoid XXE injection
@smaug1985 @troosan
Added Support for Indentation & Tabs on RTF Writer. (#1405)
3906be1 
* Added Support for Indentation  & Tabs on RTF Writer.
* add decimal tab writer + tests
* Update CHANGELOG.md
@troosan
update to final phpoffice/common version
e028aef
@troosan
use PasswordEncoder from phpoffice/common instead
adc1428
@troosan
fix phpstan issues
3290721
@troosan
fix documentation
6475812
@troosan
Merge branch 'develop' into parse_drawings
de83da2
@troosan
Merge pull request #1324 from troosan/parse_drawings
9ee99d2 
Support reading of w:drawing for documents produced by word 2011+
@troosan
Merge branch 'develop' into develop
af4f834
@troosan
Update Sample_30_ReadHTML.html
54155bf
@troosan
Allow passing short lang code
87498e4
@troosan
run checks with php 7.0
8fa1d4f
@troosan
Merge pull request #1413 from jgpATs2w/develop
27946ca 
allows decimal numbers in line-height style
@troosan
Merge pull request #1428 from troosan/parse_short_lang_code
fe454db 
Allow passing short lang code
@troosan
alias for develop branch
4c9e750 
[ci skip]
@troosan troosan added this to the v0.15.0 milestone Jul 14, 2018
@troosan troosan self-assigned this Jul 14, 2018
@troosan troosan merged commit dfa2f36 into master Jul 14, 2018
troosan added a commit that referenced this pull request Jul 21, 2018
@troosan
Merge pull request #1439 from PHPOffice/master
2bfd82e 
Merge pull request #1429 from PHPOffice/develop [ci skip]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@troosan troosan

Labels
None yet
Milestone
0.15.0
Development

Successfully merging this pull request may close these issues.