100 Commits

Author SHA1 Message Date
Ivan Lanin
94e1661958 Merge remote-tracking branch 'upstream/develop' into develop 2014-04-16 22:55:42 +07:00
Ivan Lanin
b670a1e70f DOCX Writer: Create word/settings.xml and word/webSettings.xml dynamically 2014-04-16 22:13:00 +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
b419d64277 Change Application DocProps to "PHPWord" 2014-04-16 18:41:29 +07:00
Ivan Lanin
89f42884c6 Merge branch 'master' of https://github.com/brunocasado/PHPWord into 'develop' 2014-04-13 17:37:54 +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
297eeaadf0 Documentation for new ListItem feature 2014-04-11 17:59:48 +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
4849bb271c [FIXED] Dockblocks for https://github.com/PHPOffice/PHPWord/pull/187. 2014-04-10 11:47:26 +04:00
Ivan Lanin
f837381238 Ability to add Endnotes 2014-04-10 01:36:41 +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
Ivan Lanin
f1108c48e6 Add Abstract- prefix and -Interface suffix for corresponding classes 2014-04-08 01:09:06 +07:00
Ivan Lanin
a218202dbd Enhance unit tests 2014-04-06 15:19:09 +07:00
Ivan Lanin
50e9e0f029 Merge branch 'develop' into #160-element-container 2014-04-06 11:44:37 +07:00
Ivan Lanin
a84171de42 Merge branch 'master' of https://github.com/Pyreweb/PHPWord into #189-pyreweb 2014-04-06 00:41:36 +07:00
Ivan Lanin
03934af334 Refactor header/footer and media model 2014-04-05 22:39:04 +07:00
Ivan Lanin
6aa73544a6 Fix failed test 2014-04-05 01:41:48 +07:00
Ivan Lanin
d7c18fe4b8 Move OOXML specific feature from Media to Word2007\Base 2014-04-05 00:19:45 +07:00
Ivan Lanin
b75403f9a1 Refactor Media, addObject to header and footer 2014-04-04 15:28:35 +07:00
Ivan Lanin
0fc1a06267 Merge all Word2007 relationships writer 2014-04-03 22:09:14 +07:00
Ivan Lanin
1751ab09ee Remove unused ZipStreamWrapper.php and cleanup some scripts 2014-04-03 13:05:07 +07:00
Ivan Lanin
7c549f5802 DocBlock and use fixes 2014-04-03 10:13:13 +07:00
Ivan Lanin
1ebd26ddc6 Fix some test error 2014-04-03 09:20:21 +07:00
Ivan Lanin
637c9fce6f Create new Element abstract class 2014-04-03 09:12:11 +07:00
Ivan Lanin
04e6dbc86a Remove some duplication on Word2007 writers 2014-04-03 06:54:45 +07:00
Ivan Lanin
495930be9d Add element availability matrix and enable addObject in footnote and textrun 2014-04-02 10:05:24 +07:00
Ivan Lanin
07be5eaea3 Adding more functionalities to containers:
- Table: Ability to add footnote in table cell
- Footnote: Ability to add image in footnote
- ListItem: Ability to add list item in header/footer
- CheckBox: Ability to add checkbox in header/footer
- Link: Ability to add link in header/footer
2014-04-01 18:36:35 +07:00
Louis
b7fd623121 Re-indent with spaces TOC Depth filter
Travis said spaces, not tab. Meh.
2014-03-31 17:07:58 +02:00
Ivan Lanin
13e5ca0a84 #160 Refactor folders: Element, Container, and Exception
- Rename folder Section to Element
- Rename folder Exceptions to Exception
- Move Section, Header, Footer, Settings to Container folder
- Move Element\Footer\PreserveText to Element\PreserveText
2014-03-31 10:11:52 +07:00
Ivan Lanin
45b0baf7bc Refactor writer classes 2014-03-30 23:14:14 +07:00
Ivan Lanin
4127860f1e Refactor writers and readers
- Create Writer abstract class
- Inherit writers class from Writer
- Inherit ODText\WriterPart from Word2007\WriterPart
- Rename AbstractReader > Reader
2014-03-30 17:55:44 +07:00
Ivan Lanin
0e2f476cc2 Docblock updates 2014-03-30 14:15:23 +07:00
Ivan Lanin
05a4b95255 Unit test enhancements 2014-03-30 11:50:35 +07:00
Ivan Lanin
f0803efabb #156 Merge branch 'master' of https://github.com/ozilion/PHPWord 2014-03-30 03:15:41 +07:00
Ivan Lanin
01f3f4071e #168 Merge branch 'develop' of https://github.com/jcarignan/PHPWord
- Comment header('Content-Length:'): HTTP header should not be in class that can be called via CLI
- Incorporate temporary location to ODT and RTF
- Update documentation
- Add unit tests
2014-03-29 23:56:28 +07:00
Ivan Lanin
255af437f2 Bugfix for footnote reference number and additional feature to insert text break and style the reference number 2014-03-29 01:26:18 +07:00
Louis
88be3c962e TOC Depth filter function added
Add options to TOC to only show selected depth of titles ; ie pass 1,3
arguments to only show titles depth 1 to titles depth 3
Plus now you can have two+ TOC on your document, each different
2014-03-28 10:46:46 +01:00
Ivan Lanin
160c2c7922 Merge branch 'master' of https://github.com/gianis6/PHPWord into gianis6-master 2014-03-28 09:49:16 +07:00
Ivan Lanin
e6a26dd8fc Simplify all classes docblock 2014-03-27 23:55:06 +07:00
gianis6
b3c5a76a64 Update Base.php
added tblGrid element so that LibreOffice and OpenOffice can size the tables columns properly
2014-03-27 16:33:02 +01:00
Ivan Lanin
c72dc688ff Revert project name capitalization #176 2014-03-26 16:33:20 +07:00
Ivan Lanin
dfccd54e66 Update README.md, docs, and version number 2014-03-26 15:53:17 +07:00
Ivan Lanin
3055a0e6fc Merge remote-tracking branch 'upstream/develop' into #160-refactoring 2014-03-26 15:16:16 +07:00
Roman Syroeshko
a0e8b43193 https://github.com/PHPOffice/PHPWord/issues/58 - "\PhpOffice\PhpWord\Shared\File" class was cut out. 2014-03-25 17:00:07 +04:00
Ivan Lanin
eed86f3768 Merge MemoryImage with Image, but left addMemoryImage for backward compatibility 2014-03-24 18:30:45 +07:00
Ivan Lanin
b24550d060 Merge Table and TableFull style 2014-03-24 13:34:45 +07:00
Ivan Lanin
aff112a13b Method name & code format for PSR/phpdoc compliance 2014-03-24 03:20:18 +07:00
Ivan Lanin
c7f03ecdf3 #159 #58 Merge branch 'develop' of https://github.com/RomanSyroeshko/PHPWord into develop 2014-03-23 21:10:48 +07:00