65 Commits

Author SHA1 Message Date
Bas-Jan 't Jong
11b3941103 Fixed a bug, that when a second header was added to a section, all
images added to the second header were assigned to the first header,
resulting in at least a corrupted DOCX.
2014-05-04 22:48:17 +02:00
Ivan Lanin
fd4fa11390 Merge remote-tracking branch 'upstream/develop' into nonstatic 2014-05-05 00:26:02 +07:00
Roman Syroeshko
6c3d1e721d License version has been added. 2014-05-04 21:03:29 +04:00
Ivan Lanin
3d19256c9c Merge branch 'develop' into nonstatic 2014-05-04 22:30:06 +07:00
Ivan Lanin
6898ada0e0 Merge branch 'develop' of github.com:basjan/PHPWord into #217-basjan 2014-05-04 18:16:33 +07:00
Ivan Lanin
35d06cc2ce Change PHPWord license to LGPL 3 as per #211 2014-05-04 17:55:54 +07:00
Ivan Lanin
c21e28f974 More refactoring for PHPMD compliance 2014-05-04 16:57:39 +07:00
Bas-Jan 't Jong
1a544cb2fa Fixed bug in header / footer, in which media elements were all assigned
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.
2014-05-04 10:36:13 +02:00
Bas-Jan 't Jong
15dcb384c6 Messed up something. Resetting 2014-05-04 10:34:40 +02:00
Bas-Jan 't Jong
2187954b56 Fixed bug in header, wherein all images were assigned to the first
header in a section. This resulted in a corrupt DOCX
2014-05-04 10:16:28 +02:00
Ivan Lanin
f6f52afa68 Fix Travis build error 2014-05-04 14:15:44 +07:00
Ivan Lanin
725162bc6b Deprecate static classes Footnotes, Endnotes, and TOC (#206); Reactivate phpcpd and phpmd on Travis 2014-05-04 03:40:54 +07:00
Shawn Iwinski
6606d5c5c4 Remove spurious executable bits 2014-05-02 14:43:43 -04:00
Ivan Lanin
9b1f2f210c Add style class checker and rename $fStyle/$pStyle variables 2014-05-01 14:37:58 +07:00
Ivan Lanin
4a3400c5b2 Refactor: Create writers' Part folders and remove all static parts 2014-04-30 13:49:48 +07:00
Ivan Lanin
1ed8f0dfc2 Refactor: Remove some duplication found by phpcpd. One more to go. 2014-04-28 23:33:26 +07:00
Ivan Lanin
a4fa3dfb55 Refactor: Apply composite pattern for Word2007 reader 2014-04-27 12:09:43 +07:00
Ivan Lanin
d25dc965c9 ODT Writer: Link writing 2014-04-26 16:06:56 +07:00
Ivan Lanin
0f79eb5186 Refactor: Split AbstractContainer from AbstractElement 2014-04-26 13:29:43 +07:00
Ivan Lanin
2567a2223c Update changelog and fine tune changes 2014-04-25 18:56:19 +07:00
Ivan Lanin
b7480d81c0 Refactor: Apply composite design pattern to Word2007/OOXML writer 2014-04-25 14:48:44 +07:00
Ivan Lanin
0060e4316c PHPMD fixes and remove Style\Tabs (not needed) 2014-04-22 17:54:08 +07:00
Ivan Lanin
f829559f65 ODT Writer: Basic image writing support 2014-04-18 23:12:51 +07:00
Ivan Lanin
f5f03a5b2b Emulate \ZipArchive::extractTo for PCLZip 2014-04-18 02:58:38 +07:00
Ivan Lanin
4db75c37a9 QA: Additional tests for Word2007 writer 2014-04-17 16:19:23 +07:00
Roman Syroeshko
db1d89ab23 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	src/PhpWord/Element/Section.php
	src/PhpWord/Endnotes.php
	src/PhpWord/Footnotes.php
	src/PhpWord/Media.php
	src/PhpWord/PhpWord.php
	src/PhpWord/Reader/Word2007.php
	src/PhpWord/Writer/AbstractWriter.php
	src/PhpWord/Writer/ODText/Content.php
	src/PhpWord/Writer/Word2007.php
	src/PhpWord/Writer/Word2007/Notes.php
2014-04-16 17:39:26 +04:00
Roman Syroeshko
2c1c1ea60f [IMPROVED] Dockblocks as per https://github.com/PHPOffice/PHPWord/pull/187. 2014-04-16 17:22:30 +04:00
Ivan Lanin
2829fd8216 Enable image in HTML writer 2014-04-16 12:12:32 +07:00
Ivan Lanin
9c738f7eae Refactor Element\Image and some samples 2014-04-16 09:50:56 +07:00
Ivan Lanin
3cb6d86e22 Unit tests for PDF writer; Enable zip://zipFilename#archiveFilename construct for image source 2014-04-16 07:50:39 +07:00
Ivan Lanin
15ca8f294c Merge branch 'develop' into html 2014-04-13 22:11:31 +07:00
Ivan Lanin
19a69e2c39 Basic HTML writer 2014-04-13 22:04:07 +07:00
Ivan Lanin
e78489b36e Update unit test and changelog 2014-04-13 18:03:59 +07:00
Ivan Lanin
abc67edb50 Merge branch 'develop' of https://github.com/japonicus/PHPWord into develop 2014-04-13 17:45:50 +07:00
Ivan Lanin
a5c815d50c ODT: Basic table writing support 2014-04-11 23:46:12 +07:00
Ivan Lanin
a3a9af51e5 Additional unit tests and some code deduplication 2014-04-11 21:28:43 +07:00
Ivan Lanin
ae652a6379 Update upcoming version number to 0.10.0 as per #178 2014-04-11 19:04:53 +07:00
Ivan Lanin
39a5e8c51e Merge branch 'numbering' into develop 2014-04-11 17:11:21 +07:00
Ivan Lanin
47669f501a Ability to create custom list #10 and to read list definition from DOCX 2014-04-11 17:08:47 +07:00
Roman Syroeshko
5b4ed10999 [FIXED] Dockblock for https://github.com/PHPOffice/PHPWord/pull/187 2014-04-10 11:06:39 +04:00
Ivan Lanin
f837381238 Ability to add Endnotes 2014-04-10 01:36:41 +07:00
Ivan Lanin
0ccea9620c Merge remote-tracking branch 'upstream/develop' into xml-reader 2014-04-09 18:48:04 +07:00
Ivan Lanin
2cdad4b247 Reader: Ability to read header, footer, footnotes, link, preservetext, textbreak, pagebreak, table 2014-04-09 18:13:43 +07:00
Roman Syroeshko
191d37b280 Leading backslashes in global function/constant calls were removed. 2014-04-08 21:56:18 +04:00
japonicus
833dfea1e0 Keep image aspect ratio if only 1 dimension styled
If only one of image width or height is specified, then scale missing
dimension to maintain the aspect ratio.
2014-04-08 17:42:01 +01:00
Ivan Lanin
6456255300 Merge branch '#160-element-container' into xml-reader 2014-04-08 08:21:52 +07:00
Ivan Lanin
cd2dba0848 Element inheritance refinements 2014-04-08 03:27:19 +07:00
Ivan Lanin
dadfc2903c Merge branch '#160-element-container' into xml-reader 2014-04-08 01:15:14 +07:00
Ivan Lanin
f1108c48e6 Add Abstract- prefix and -Interface suffix for corresponding classes 2014-04-08 01:09:06 +07:00
Ivan Lanin
b594e32f04 Move container files 2014-04-08 00:03:53 +07:00