187 Commits

Author SHA1 Message Date
Ivan Lanin
c243a11e57 Additional type checks in style writers 2014-05-11 19:06:36 +07:00
Ivan Lanin
7d5c62ab34 Merge branch 'nestedtable' into develop 2014-05-11 18:22:09 +07:00
Ivan Lanin
ded651d947 #149: Ability to add table inside a cell (nested table) 2014-05-11 17:30:23 +07:00
Bas-Jan 't Jong
467f15a480 Added ListItemRun Element 2014-05-11 11:08:39 +02:00
Ivan Lanin
feff87e769 Fix Travis test errors 2014-05-10 21:56:06 +07:00
Ivan Lanin
62ed725032 Some modifications for the new Html::addHtml feature 2014-05-10 21:38:44 +07:00
Ivan Lanin
a595e6d78c Merge branch 'AddHtml' of github.com:basjan/PHPWord 2014-05-10 20:13:33 +07:00
Bas-Jan 't Jong
07b4ae2c0f Added possiblity to add tables inside textbox 2014-05-10 14:04:15 +02:00
Ivan Lanin
246557e3be Reactivate PHPMD and fix some rules for textbox 2014-05-09 03:15:26 +07:00
Ivan Lanin
6f0579c78f Fix Travis build error 2014-05-09 00:34:08 +07:00
Ivan Lanin
8a1d07f71a Fix Travis test errors 2014-05-08 23:13:45 +07:00
Ivan Lanin
f7dd9dd07c Refactor writers and styles 2014-05-08 20:46:13 +07:00
Ivan Lanin
ea41b08a9a Refactor the new textbox element 2014-05-08 13:05:27 +07:00
Ivan Lanin
e12daacc0b Merge branch 'refactor' into develop 2014-05-08 12:17:14 +07:00
Ivan Lanin
6a0bfe3314 Move addTextBox to AbstractContainer and add sample for textbox 2014-05-08 10:58:19 +07:00
Ivan Lanin
c7a940cc4c Merge branch 'textbox' of github.com:basjan/PHPWord 2014-05-08 08:56:34 +07:00
Bas-Jan 't Jong
364131aa5d Added TextBox functionality 2014-05-07 21:27:51 +02:00
Ivan Lanin
88560de601 Refactor writers 2014-05-08 02:19:57 +07:00
Ivan Lanin
c4e8fdac84 Refactoring for code quality improvement (based on Scrutinizer) 2014-05-06 22:08:39 +07:00
Ivan Lanin
c28f28ea25 Refactoring for code quality improvement (based on Scrutinizer) 2014-05-06 21:22:24 +07:00
Roman Syroeshko
2add5541ce [CHANGED] https://github.com/PHPOffice/PHPWord/pull/179 - copyright notice has been added. 2014-05-05 13:06:53 +04:00
Roman Syroeshko
89f94b793d [CHANGED] https://github.com/PHPOffice/PHPWord/pull/179 - copyright info has been changed. 2014-05-05 12:38:32 +04:00
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