de286936f2
Merge pull request #184 from andrew-kzoo/fix-exif-imagetype
...
Get image dimensions without EXIF extension
2014-03-28 09:56:37 +07:00
160c2c7922
Merge branch 'master' of https://github.com/gianis6/PHPWord into gianis6-master
2014-03-28 09:49:16 +07:00
a8da5b1b72
Get image dimensions without EXIF extension
...
Use `getimagesize` when `exif_imagetype` doesn't exist.
2014-03-27 17:25:09 -04:00
10df0722d1
Merge pull request #179 from ivanlanin/simplified-docblock
...
Simplify/add page level docblocks
2014-03-28 00:17:48 +07:00
e6a26dd8fc
Simplify all classes docblock
2014-03-27 23:55:06 +07:00
f6ca40392f
Merge remote-tracking branch 'upstream/develop' into simplified-docblock
2014-03-27 23:17:47 +07:00
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
c6fc1d4e89
Moved the autoloader in the basic usage to the installation section in the read me
2014-03-27 07:55:03 -04:00
75a6729565
Updated change log
2014-03-27 07:38:24 -04:00
ab6503eb0d
Test folder updated
...
Test folder updated for new file CheckBoxText
2014-03-27 10:17:07 +02:00
0f16da9a56
Fix psr-4 base dir in composer.json
2014-03-27 10:04:34 +03:00
af8ea2c266
Update README.md
...
Change link to RTD.
2014-03-26 18:05:56 +07:00
a6568e988b
Proposed simplified docblock
2014-03-26 17:21:23 +07:00
ac6f5a39a4
Merge pull request #177 from PHPOffice/develop
...
Version 0.9.0
2014-03-26 10:41:15 +01:00
72bb688020
Merge remote-tracking branch 'upstream/develop' into develop
2014-03-26 16:34:56 +07:00
c72dc688ff
Revert project name capitalization #176
2014-03-26 16:33:20 +07:00
b04eb6ca35
Merge pull request #176 from ivanlanin/develop
...
Update README.md #174 , docs, and version number
2014-03-26 16:13:32 +07:00
dfccd54e66
Update README.md, docs, and version number
2014-03-26 15:53:17 +07:00
004edd5346
Merge pull request #169 from ivanlanin/#160-refactoring
...
#160 refactoring: Merge TableFull-Table Style + Merge MemoryImage-Image
2014-03-26 15:30:54 +07:00
3055a0e6fc
Merge remote-tracking branch 'upstream/develop' into #160-refactoring
2014-03-26 15:16:16 +07:00
2d7126e5a8
FIXED: ERROR - Expected 1 newline at end of file.
2014-03-25 10:27:08 -07:00
4aeef04afb
Fix for tests 5.
2014-03-25 10:02:42 -07:00
0da5eb12ad
Fix for tests #4 .
2014-03-25 09:30:36 -07:00
31dc246cfb
Merge pull request #175 from RomanSyroeshko/develop
...
Fix for tests #3 .
2014-03-25 09:00:38 -07:00
efa77efb7a
https://github.com/PHPOffice/PHPWord/issues/58 - fix for tests #3 .
2014-03-25 19:58:50 +04:00
e607c3ffe5
Merge pull request #173 from RomanSyroeshko/develop
...
Fix for tests #2 .
2014-03-25 07:50:19 -07:00
4261f5a9f2
https://github.com/PHPOffice/PHPWord/issues/58 - fix for tests #2 .
2014-03-25 18:38:05 +04:00
300ac8b6e4
Merge pull request #172 from RomanSyroeshko/develop
...
Fix for unit tests.
2014-03-25 06:25:17 -07:00
6b17492383
https://github.com/PHPOffice/PHPWord/issues/58 - fix for unit tests.
2014-03-25 17:24:26 +04:00
c76b61894b
Merge pull request #171 from RomanSyroeshko/develop
...
"\PhpOffice\PhpWord\Shared\File" class was cut out.
2014-03-25 06:02:20 -07:00
a0e8b43193
https://github.com/PHPOffice/PHPWord/issues/58 - "\PhpOffice\PhpWord\Shared\File" class was cut out.
2014-03-25 17:00:07 +04:00
e802ea3119
Update Readme.MD for moving link for docs & fork
2014-03-25 13:26:05 +01:00
db2460fc49
Update Readme.MD for improving the first introduction
2014-03-25 13:11:52 +01:00
8aba90ded9
Change exception type
2014-03-25 17:53:10 +07:00
3b020f660c
Update documentation
2014-03-25 10:25:48 +07:00
841157e442
Delete MemoryImageTest.php and TableFullTest.php
2014-03-25 10:07:25 +07:00
92a76d0c0c
Merge branch 'develop' into #160-refactoring
2014-03-25 09:45:12 +07:00
6796883d43
added samples for bgColor and tableRowHeightRules
...
Signed-off-by: Julien Carignan <julien.carignan@hotmail.com>
2014-03-24 14:03:29 -04:00
e2cdf434ba
"php://output" content-length + tmpfile location
...
- added content-length header to know the total file size during the download
- Tmp file should go into sys_get_temp_dir() instead of "./"
Signed-off-by: Julien Carignan <julien.carignan@hotmail.com>
2014-03-24 13:56:49 -04:00
e990c77b47
Added height rules for table row
...
- mostly for removing the added space after a table
- Code mostly come from this discussion: https://phpword.codeplex.com/discussions/440933
- Usage: $table->addRow(5000, $rowStyle, "exact");
Signed-off-by: Julien Carignan <julien.carignan@hotmail.com>
2014-03-24 13:51:21 -04:00
27840ab710
Font-style addition: bgColor
...
Signed-off-by: Julien Carignan <julien.carignan@hotmail.com>
2014-03-24 13:44:19 -04:00
ecdaeefab8
More unit tests
2014-03-24 20:59:42 +07:00
e6466f0ee5
Changed travis branch in read me to master
2014-03-24 08:42:16 -04:00
57ff17ed04
Changed test directory in travis config
2014-03-24 08:31:58 -04:00
626902d9d1
Renamed test directory to tests
2014-03-24 08:23:59 -04:00
eed86f3768
Merge MemoryImage with Image, but left addMemoryImage for backward compatibility
2014-03-24 18:30:45 +07:00
286d37ca60
Changed PHPWord logo to SVG
2014-03-24 07:03:41 -04:00
5dac76a5e6
Changed travis icon to SVG for us, poor souls with retina displays
2014-03-24 06:39:19 -04:00
3830df5796
Merge branch 'refs/heads/develop'
...
Conflicts:
.travis.yml
README.md
2014-03-24 06:26:32 -04:00
b24550d060
Merge Table and TableFull style
2014-03-24 13:34:45 +07:00
Ivan Lanin
Ivan Lanin
Andrew Collins
gianis6
Gabriel Bull
ozilion
Anton Tyutin
Progi1984
Roman Syroeshko
Roman Syroeshko
Julien Carignan