Commit Graph

448 Commits

Author SHA1 Message Date
Ivan Lanin 72bb688020 Merge remote-tracking branch 'upstream/develop' into develop 2014-03-26 16:34:56 +07:00
Ivan Lanin c72dc688ff Revert project name capitalization #176 2014-03-26 16:33:20 +07:00
Ivan Lanin b04eb6ca35 Merge pull request #176 from ivanlanin/develop
Update README.md  #174, docs, and version number
2014-03-26 16:13:32 +07:00
Ivan Lanin dfccd54e66 Update README.md, docs, and version number 2014-03-26 15:53:17 +07:00
Ivan Lanin 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
Ivan Lanin 3055a0e6fc Merge remote-tracking branch 'upstream/develop' into #160-refactoring 2014-03-26 15:16:16 +07:00
Roman Syroeshko 2d7126e5a8 FIXED: ERROR - Expected 1 newline at end of file. 2014-03-25 10:27:08 -07:00
Roman Syroeshko 4aeef04afb Fix for tests 5. 2014-03-25 10:02:42 -07:00
Roman Syroeshko 0da5eb12ad Fix for tests #4. 2014-03-25 09:30:36 -07:00
Roman Syroeshko 31dc246cfb Merge pull request #175 from RomanSyroeshko/develop
Fix for tests #3.
2014-03-25 09:00:38 -07:00
Roman Syroeshko efa77efb7a https://github.com/PHPOffice/PHPWord/issues/58 - fix for tests #3. 2014-03-25 19:58:50 +04:00
Roman Syroeshko e607c3ffe5 Merge pull request #173 from RomanSyroeshko/develop
Fix for tests #2.
2014-03-25 07:50:19 -07:00
Roman Syroeshko 4261f5a9f2 https://github.com/PHPOffice/PHPWord/issues/58 - fix for tests #2. 2014-03-25 18:38:05 +04:00
Roman Syroeshko 300ac8b6e4 Merge pull request #172 from RomanSyroeshko/develop
Fix for unit tests.
2014-03-25 06:25:17 -07:00
Roman Syroeshko 6b17492383 https://github.com/PHPOffice/PHPWord/issues/58 - fix for unit tests. 2014-03-25 17:24:26 +04:00
Roman Syroeshko c76b61894b Merge pull request #171 from RomanSyroeshko/develop
"\PhpOffice\PhpWord\Shared\File" class was cut out.
2014-03-25 06:02:20 -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
Progi1984 e802ea3119 Update Readme.MD for moving link for docs & fork 2014-03-25 13:26:05 +01:00
Progi1984 db2460fc49 Update Readme.MD for improving the first introduction 2014-03-25 13:11:52 +01:00
Ivan Lanin 8aba90ded9 Change exception type 2014-03-25 17:53:10 +07:00
Ivan Lanin 3b020f660c Update documentation 2014-03-25 10:25:48 +07:00
Ivan Lanin 841157e442 Delete MemoryImageTest.php and TableFullTest.php 2014-03-25 10:07:25 +07:00
Ivan Lanin 92a76d0c0c Merge branch 'develop' into #160-refactoring 2014-03-25 09:45:12 +07:00
Julien Carignan 6796883d43 added samples for bgColor and tableRowHeightRules
Signed-off-by: Julien Carignan <julien.carignan@hotmail.com>
2014-03-24 14:03:29 -04:00
Julien Carignan 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
Julien Carignan 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
Julien Carignan 27840ab710 Font-style addition: bgColor
Signed-off-by: Julien Carignan <julien.carignan@hotmail.com>
2014-03-24 13:44:19 -04:00
Ivan Lanin ecdaeefab8 More unit tests 2014-03-24 20:59:42 +07:00
Gabriel Bull e6466f0ee5 Changed travis branch in read me to master 2014-03-24 08:42:16 -04:00
Gabriel Bull 57ff17ed04 Changed test directory in travis config 2014-03-24 08:31:58 -04:00
Gabriel Bull 626902d9d1 Renamed test directory to tests 2014-03-24 08:23:59 -04:00
Ivan Lanin eed86f3768 Merge MemoryImage with Image, but left addMemoryImage for backward compatibility 2014-03-24 18:30:45 +07:00
Gabriel Bull 286d37ca60 Changed PHPWord logo to SVG 2014-03-24 07:03:41 -04:00
Gabriel Bull 5dac76a5e6 Changed travis icon to SVG for us, poor souls with retina displays 2014-03-24 06:39:19 -04:00
Gabriel Bull 3830df5796 Merge branch 'refs/heads/develop'
Conflicts:
	.travis.yml
	README.md
2014-03-24 06:26:32 -04:00
Ivan Lanin b24550d060 Merge Table and TableFull style 2014-03-24 13:34:45 +07:00
Ivan Lanin db57346c47 Reactivate CodeSniffer for both src and test. PSR-2 has included PSR-1. 2014-03-24 03:22:52 +07:00
Ivan Lanin aff112a13b Method name & code format for PSR/phpdoc compliance 2014-03-24 03:20:18 +07:00
Gabriel Bull d7a66ca15e Removed CodeSniffer from travis because we are not passing it 2014-03-23 13:00:16 -04:00
Gabriel Bull 29d9a21e10 Removed files from gitignore 2014-03-23 12:55:37 -04:00
Gabriel Bull d75c00caf4 Fixed unit tests 2014-03-23 12:48:18 -04:00
Gabriel Bull 66c73c07c5 Fixed exceptions in reader/writer 2014-03-23 12:48:18 -04:00
Gabriel Bull 421b6e6f9d Made autoloader PSR-4 compliant and removed PHPWORD_BASE_DIR global constant 2014-03-23 12:48:18 -04:00
Gabriel Bull a7444cb482 Changed tests namespace to reflect the namespace of the source code 2014-03-23 12:48:17 -04:00
Gabriel Bull e893b351fa Renamed Tests to test 2014-03-23 12:48:17 -04:00
Progi1984 42286026e3 FIXED : Validation of composer.json (composer validate) after Packagists mails 2014-03-23 16:59:28 +01:00
Ivan Lanin 17ab0ce3c0 Update .travis.yml
Comment out phpmd since this is blocking the process. Please CMIIW.
2014-03-23 22:44:57 +07:00
Ivan Lanin cd0db8921f Update .travis.yml
Allow failures for 5.3.3 for awhile since this is blocking the whole process
2014-03-23 22:41:02 +07:00
Progi1984 05aaad8ad2 FIXED : Travis-CI (/home/travis/build.sh: line 215: phpcs: command not found) 2014-03-23 16:17:12 +01:00
Ivan Lanin 5a84f99fde Update Travis 2014-03-23 21:44:46 +07:00