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

406 Commits

Author SHA1 Message Date
Ivan Lanin e89f24f7a7 Merge pull request #137 from ivanlanin/fancy-samples 
Fancy web interface for samples
 2014-03-17 18:32:39 +07:00
Ivan Lanin ef0443361a Merge remote-tracking branch 'upstream/develop' into fancy-samples 2014-03-17 18:31:08 +07:00
Gabriel Bull 1d1bb2df81 Commented out some lines in the travis-ci config to see if we can pass 2014-03-17 06:22:39 -04:00
Gabriel Bull 78d718a5b1 Fixed typo in variable name 2014-03-17 06:22:17 -04:00
Ivan Lanin cec16ce1f3 Merge branch 'develop' into fancy-samples 2014-03-17 07:43:47 +07:00
Ivan Lanin fca9e532cf DocBlock corrections 2014-03-17 07:26:25 +07:00
Gabriel Bull 12a79779bf Merge branch 'refs/heads/master' into develop 
Conflicts:
	changelog.txt
 2014-03-16 17:01:05 -04:00
Gabriel Bull 74566e3862 Added test case for image type detection 
Conflicts:
	changelog.txt
 2014-03-16 16:57:17 -04:00
Brandon Skrtich 745f3c81b5 Add function to check for image type. 
Some servers do not have exif_imagetype available. So I added a work around.
 2014-03-16 16:52:39 -04:00
Ivan Lanin 5bcd114023 Merge pull request #138 from ivanlanin/develop 
Additional unit tests
 2014-03-16 08:43:45 +07:00
Ivan Lanin 18c1e5f77b Additional template test 2014-03-16 08:42:02 +07:00
Ivan Lanin 077d87d1bc New unit tests for Writer 2014-03-16 07:40:02 +07:00
Ivan Lanin 28fef5f264 Bugfix on PHPWordTest 2014-03-16 00:25:49 +07:00
Ivan Lanin 9922f8e319 Closing bracket. Again. 2014-03-15 23:45:31 +07:00
Ivan Lanin 26483df5b2 Closing bracket bug 2014-03-15 23:22:51 +07:00
Ivan Lanin b35a7995ad Check requirements 2014-03-15 23:12:35 +07:00
Ivan Lanin 59eec587fc Convert samples 2014-03-15 22:39:57 +07:00
Gabriel Bull f4d7fa427d Added PHP 5.6 to travis-ci and removed namespace checking before we make the change to namespaces 2014-03-15 09:46:17 -04:00
Gabriel Bull 3b7dac452b Refactored PHPWord_Exception to namespaces 2014-03-15 09:42:43 -04:00
Gabriel Bull 0c5e405937 Merge branch 'master' of github.com:PHPOffice/PHPWord into develop 2014-03-15 08:54:37 -04:00
Ivan Lanin 89aebc5ee4 Version number: 0.7.0 > 0.8.0 2014-03-15 08:50:03 -04:00
Ivan Lanin 04623f2b03 Merge pull request #135 from ivanlanin/master 
Version number: 0.7.0 > 0.8.0
 2014-03-15 16:18:23 +07:00
Ivan Lanin f2d01b849b Version number: 0.7.0 > 0.8.0 2014-03-15 16:17:05 +07:00
Progi1984 5bc74eb64f ADDED : Docs 2014-03-15 10:00:09 +01:00
Progi1984 6837b1142d Merge pull request #134 from PHPOffice/develop 
Version 0.8.0
 2014-03-15 09:45:26 +01:00
Ivan Lanin 542451df7d Merge pull request #133 from ivanlanin/develop 
New unit test for ODText\Content and some test fixes
 2014-03-15 14:49:42 +07:00
Ivan Lanin d04e600300 New unit test for ODText\Content and some test fixes 2014-03-15 14:48:26 +07:00
Ivan Lanin c2a6c783a2 Merge pull request #132 from RomanSyroeshko/develop 
FIXED: "README.md".
 2014-03-15 14:35:17 +07:00
Roman Syroeshko 895361910b https://github.com/PHPOffice/PHPWord/issues/124 
FIXED: "README.md".
 2014-03-15 11:24:52 +04:00
Ivan Lanin db1ce96233 Merge pull request #131 from ivanlanin/develop 
More unit tests for Template and Writer
 2014-03-15 13:27:41 +07:00
Ivan Lanin 92a7a6b617 More unit tests for Template and Writer 2014-03-15 13:25:42 +07:00
Progi1984 d9c3cfcedf Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into develop 2014-03-14 20:37:16 +01:00
Progi1984 9646fd3f3e ADDED : Unit Tests 2014-03-14 20:36:09 +01:00
Ivan Lanin 8b9d3e53d8 Add features section in README and update changelog 2014-03-15 02:04:20 +07:00
Progi1984 a87953a46c Merge pull request #129 from ivanlanin/develop 
Add TextBreak styling
 2014-03-14 18:38:55 +01:00
Progi1984 3a1a056ec3 Merge pull request #121 from bskrtich/updaterequirements 
Update Requirements
 2014-03-14 17:52:45 +01:00
Brandon Skrtich 0b65bc397c Update Requirements 
Resolves #120
 2014-03-14 09:44:12 -06:00
Ivan Lanin 44d2501293 TextBreak: Allow font/paragraph styling for text break 2014-03-14 22:03:19 +07:00
Ivan Lanin 088caa2d36 @codeCoverageIgnore for some legacy (unused yet) code 2014-03-14 20:56:27 +07:00
Gabriel Bull 0fe30aee9d Changed versino 0.7.1 to 0.8.0 2014-03-14 09:51:40 -04:00
Progi1984 de02e43dc2 Merge pull request #125 from ivanlanin/msword-footnote-fix 
MS Word footnote fix
 2014-03-14 09:38:00 +01:00
Ivan Lanin c8a1e2e0eb Final fix that satisfies both MS Word and OpenOffice 2014-03-14 15:26:17 +07:00
Ivan Lanin d87fa2aa8b MS Word report corrupted DOCX when there's more than 1 section and footnote applied not on the first section. OO is fine. 
Bug source: [Content-Types].xml entry is different with document.xml.rels
 2014-03-14 14:53:45 +07:00
Progi1984 645d237582 Merge pull request #122 from ivanlanin/develop 
Allow adding MemoryImage using URL
 2014-03-13 22:56:32 +01:00
Ivan Lanin d3c739eb23 Remove old samples 2014-03-14 04:41:39 +07:00
Ivan Lanin a87717a51f Fix for footnotes test 2014-03-14 04:39:41 +07:00
Ivan Lanin f2ba9a1d3b Unit test for footnotes 2014-03-14 04:36:31 +07:00
Ivan Lanin cd3f74e572 Footnote fix 2014-03-14 04:26:50 +07:00
Ivan Lanin b11cd40bba More unit tests 2014-03-14 04:25:09 +07:00
Ivan Lanin b3458b9c0a Test & migrate the remaining old samples 2014-03-14 00:49:27 +07:00