Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
739 Commits 1 Branch 0 Tags 12 MiB
Commit Graph

739 Commits

Author SHA1 Message Date
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 898be23a12 Merge pull request #205 from ivanlanin/develop 
Add DomPDF to composer.json and enable archive image source
 2014-04-16 18:15:41 +07:00
Ivan Lanin 52b3506bbb HTML Writer: Enable footnotes and endnotes 2014-04-16 17:17:42 +07:00
Ivan Lanin 1ed13cc036 Include dompdf version 2014-04-16 15:28:18 +07:00
Ivan Lanin 6612ee88c0 Update composer.json and .travis.yml as per #205 2014-04-16 15:24:38 +07:00
Ivan Lanin 3d8ae044b7 Set image size and additional tests for HTML writer 2014-04-16 14:45:43 +07:00
Ivan Lanin 406534cd42 Fix unit test error 2014-04-16 13:37:48 +07: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 04b14ea42d Fix `Writer\Word2007\BaseTest` error 2014-04-16 08:04:18 +07:00
Ivan Lanin 20b363f00e Remove local path from sample and add DomPDF in `composer.json` `require-dev` 2014-04-16 07:54:55 +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 6eb2c661e3 Merge pull request #204 from ivanlanin/pdf-writer 
Basic PDF Writer. It will be better if we can detect DomPDF installed by composer. Please help. Thanks.
 2014-04-14 12:42:14 +07:00
Ivan Lanin 413f5e88d8 Change PDF Core to AbstractRenderer 2014-04-14 10:07:35 +07:00
Ivan Lanin 580a61a832 Basic PDF Writer #68 2014-04-14 00:28:15 +07:00
Ivan Lanin d54d47d4d7 Merge pull request #203 from ivanlanin/html 
Basic HTML Writer
 2014-04-13 22:27:11 +07:00
Ivan Lanin 5a01927b16 Update changelog 2014-04-13 22:25:42 +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 a5b5e0cff0 Update CHANGELOG 2014-04-13 17:43:03 +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 9bb5655292 Unit test for AbstractStyle 2014-04-12 12:59:44 +07:00
Ivan Lanin 47956b019c Code formatting and some more tests 2014-04-12 12:17:28 +07:00
Progi1984 b40218da45 Add some unit tests for Shared & Element (100%!) - @Progi1984 2014-04-12 00:59:29 +02:00
Progi1984 59e623bb75 Fixes #195 : Update general.rst 2014-04-12 00:56:24 +02:00
Ivan Lanin d387552a25 Merge pull request #201 from ivanlanin/develop 
ODT writer: Basic table support
 2014-04-12 01:06:59 +07:00
Ivan Lanin fb35a5f80c Change object name 2014-04-12 00:40:22 +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 a7567f721b Merge pull request #198 from ivanlanin/develop 
Ability to add custom numbering style. Solved #10.
 2014-04-11 18:31:28 +07:00
Ivan Lanin 42167f8855 Fix documentation format and some type check 2014-04-11 18:16:24 +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
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 38418677f8 Fix unit test error 2014-04-09 20:44:32 +07:00
Ivan Lanin 0ccea9620c Merge remote-tracking branch 'upstream/develop' into xml-reader 2014-04-09 18:48:04 +07:00
Ivan Lanin db129b4805 Update footnote unit tests 2014-04-09 18:47:10 +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 9c9f7eb7c6 NULLs changed to lowercase to meet PSR. 2014-04-08 22:00:36 +04:00
Roman Syroeshko f049c48c59 [FIXED] Namespacing. 2014-04-08 21:58:00 +04:00
Roman Syroeshko 191d37b280 Leading backslashes in global function/constant calls were removed. 2014-04-08 21:56:18 +04:00
Roman Syroeshko cdb3a20cb6 [FIXED] Namespacing in documentation. 2014-04-08 21:16:27 +04:00