Skip to content
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

PR 0.11.0 #256

Merged
merged 214 commits into from
Jun 1, 2014
Merged

PR 0.11.0 #256

merged 214 commits into from
Jun 1, 2014

Conversation

ivanlanin
Copy link
Contributor

Bas-Jan 't Jong and others added 30 commits May 3, 2014 10:08
Added Image relative and absolute positioning
9c11067
@ivanlanin
Deprecate static classes Footnotes, Endnotes, and TOC (#206); Reactiv…
725162b 
…ate `phpcpd` and `phpmd` on Travis
@ivanlanin
Fix Travis build error
f6f52af
Fixed bug in header, wherein all images were assigned to the first
2187954 
header in a section. This resulted in a corrupt DOCX
Messed up something. Resetting
15dcb38
Fixed bug in header / footer, in which media elements were all assigned
1a544cb 
to the first header element. This resulted in a corrupted DOCX, when a
media element was assigned to a second header in the same section.
@ivanlanin
More refactoring for PHPMD compliance
c21e28f
@Progi1984
#154 : PHPDocumentor on GH-Pages
a62a58a
@Progi1984
#154 : PHPDocumentor on GH-Pages
a5287ac
@Progi1984
#154 : PHPDocumentor on GH-Pages
de2b7d8
@ivanlanin
Change PHPWord license to LGPL 3 as per #211
35d06cc
@ivanlanin
Merge branch 'develop' of github.com:PHPOffice/PHPWord into develop
2ae47e7
@ivanlanin
Merge branch 'develop' of github.com:basjan/PHPWord into #217-basjan
6898ada
@Progi1984
#154 : PHPDocumentor on GH-Pages
cbf0c07
@Progi1984
#154 : PHPDocumentor on GH-Pages
9aec521
@Progi1984
#154 : PHPDocumentor on GH-Pages
06462fb
@ivanlanin
Refactor new image styles and create Word2007/Style/Image class
42c712e
@ivanlanin
Merge remote-tracking branch 'upstream/develop' into develop
f7b4542
@ivanlanin
Merge branch '#217-basjan' into develop
4824985
@ivanlanin
Merge branch 'develop' into nonstatic
3d19256
Added firstPage function and evenPage function to bring Footer Element
250562d 
in conformity with Header Element
@ivanlanin
QA: PHPMD fixes for tests; Some adjustment for Travis build
d1022a9
@ivanlanin
Fix .travis.yml
dd01ed1
License version has been added.
6c3d1e7
@ivanlanin
Merge remote-tracking branch 'upstream/develop' into nonstatic
fd4fa11
@ivanlanin
Merge pull request #220 from ivanlanin/nonstatic
acd25a4 
Remove static classes #206; Reactivate PHPCPD and PHPMD
@ivanlanin
Merge branch 'footer' of github.com:basjan/PHPWord into develop
ce85cc5
Corrected typo to 'const POSITION_HORIZONTAL_CENTER = 'center';' and
aba1548 
added examples to Sample_13
Fixed a bug, that when a second header was added to a section, all
11b3941 
images added to the second header were assigned to the first header,
resulting in at least a corrupted DOCX.
@ivanlanin
Merge branch 'second-header-bug' of github.com:basjan/PHPWord into de…
d11376e 
…velop
ivanlanin and others added 25 commits May 29, 2014 15:09
@ivanlanin
RTF Reader: Split control parsers into functions
2d88ea2
@ivanlanin
Update changelog, docs, and unit tests for new Field element #251
e81d92e
@ivanlanin
Merge branch 'develop' into rtf
7c2ad59
@ivanlanin
RTF reader: Unit tests and some improvements
7a42802
@ivanlanin
Apply #250 fix a minor typo in the text styles example
4bb3ffe
@ivanlanin
Merge pull request #252 from ivanlanin/rtf
0fcea82 
Passed Travis. Merged.
Added Line element
1580113
Fixed some Travis build errors
54af93a
Second attempt to resolve Travis build errors
0103787
Final try to resolve Travis build errors
748e164
@ivanlanin
Some adjustments for the new Line element #253
a57b28d
@ivanlanin
#193: Heading numbering
5c2c687
@ivanlanin
Merge branch '#193' into develop
d3ac5b1
@ivanlanin
Bugfix for #236 (OpenOffice crash when opening DOCX) and paragraph st…
900a96a 
…yle refactoring
@ivanlanin
QA: Docblock improvements and -q parameter for phpdoc
4f93998
@ivanlanin
Decompose Shared\Html
0164e37
@ivanlanin
#80: Basic HTML reader
ec85d7d
@ivanlanin
Documentation updates and test fix for #254
022cdeb
@ivanlanin
Merge pull request #254 from ivanlanin/develop
4fdc7b8 
Basic HTML Reader
@ivanlanin
Add $nestedLevel to elements
e7540c0
@ivanlanin
#245: Basic table support in RTF writer
2205377
@ivanlanin
Merge remote-tracking branch 'upstream/develop' into develop
269def4
@ivanlanin
QA: Additional unit tests
9839222
@ivanlanin
Refactor IOFactory and AbstractContainer to allow more dynamic inclus…
e0d2c65 
…ion.
@ivanlanin
PR 0.11.0 #225
ce21e8d
@ivanlanin ivanlanin added the Pull label Jun 1, 2014
@ivanlanin ivanlanin added this to the 0.11.0 milestone Jun 1, 2014
Progi1984 added a commit that referenced this pull request Jun 1, 2014
@Progi1984
Merge pull request #256 from PHPOffice/develop
39cf5d0 
PR 0.11.0
@Progi1984 Progi1984 merged commit 39cf5d0 into master Jun 1, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Progi1984 Progi1984

Labels
None yet
Milestone
0.11.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@ivanlanin @basjan @AdnanInayat @Progi1984 @hskrtich