Commit Graph

1124 Commits

Author SHA1 Message Date
Roman Syroeshko 7b2ec5e85e Reverted #373. 2014-10-16 21:04:59 +04:00
Progi1984 d231641680 Update Documentation 2014-10-15 22:13:38 +02:00
Roman Syroeshko fa575ef12c Minor refactoring. 2014-10-14 21:33:04 +04:00
Roman Syroeshko 06d6b715a3 [CHANGED] "tests/bootstrap.php". 2014-10-14 21:06:47 +04:00
Roman Syroeshko 2c81d5f38b Some phpdoc for https://github.com/PHPOffice/PHPWord/pull/390. 2014-10-10 21:20:52 +04:00
Roman Syroeshko 4445fd3258 Replaced `array_key_exists` with `isset` for better performance. 2014-10-10 21:10:29 +04:00
Progi1984 9d73173dce Merge pull request #390 from spikex/develop
Add missing setters for pageSizeW and pageSizeH
2014-10-03 09:15:58 +02:00
Spike Ilacqua 112712012e Update Changelog for setPageSizeW and setPageSizeH 2014-10-02 11:06:14 -06:00
Spike Ilacqua cea15f3d23 Use page width and height default constants in tests 2014-10-02 10:50:50 -06:00
Spike Ilacqua cf5625b643 Update pageSizeW and pageSizeH docs
Conflicts:
	docs/containers.rst
2014-10-02 10:48:15 -06:00
Spike Ilacqua cf96ea0e18 Width/Height set/get tests 2014-10-02 10:44:46 -06:00
Spike Ilacqua 4e25283195 Add missing setters for pageSizeW and pageSizeH 2014-10-02 10:44:34 -06:00
Progi1984 5e68fd9bbd Merge pull request #389 from PHPOffice/revert-379-master
Revert "Add missing setters for pageSizeW and pageSizeH"
2014-10-02 17:21:27 +02:00
Progi1984 8ebe3b3738 Revert "Add missing setters for pageSizeW and pageSizeH" 2014-10-02 17:21:17 +02:00
Progi1984 1a783d1cbd Merge pull request #379 from spikex/master
Add missing setters for pageSizeW and pageSizeH
2014-10-02 17:21:07 +02:00
Spike Ilacqua ecaeb96376 Update pageSizeW and pageSizeH docs 2014-10-02 09:04:45 -06:00
Spike Ilacqua e5a3d01835 Width/Height set/get tests 2014-10-02 08:33:53 -06:00
Progi1984 439f013e09 Merge pull request #386 from PHPOffice/revert-385-patch-1
Revert "Fix page break sample code block"
2014-09-29 17:01:50 +02:00
Progi1984 57c3235365 Revert "Fix page break sample code block" 2014-09-29 17:01:43 +02:00
Progi1984 d39ba21a98 Merge pull request #385 from jaggyspaghetti/patch-1
Fix page break sample code block
2014-09-29 17:01:35 +02:00
Jaggy Gauran 7869912348 Fix page break sample code block 2014-09-29 03:07:54 +08:00
Spike Ilacqua 0a8635ece8 Add missing setters for pageSizeW and pageSizeH 2014-09-22 16:58:00 -06:00
Progi1984 6c3088ea07 Merge pull request #378 from franzholz/patch-4
Update Head.php
2014-09-22 16:11:57 +02:00
Progi1984 556a8b52c3 Merge pull request #377 from franzholz/patch-3
Update installing.rst
2014-09-22 16:11:27 +02:00
Franz Holzinger 27b0c69fd4 Update Head.php
The generated HTML and PDF tables are missing the border lines. Sample_07_TemplateCloneRow.docx shows the lines around the table and the table cells. However the generated HTML and PDF file are missing those lines. This patch fixes this issue.
2014-09-22 15:46:55 +02:00
Franz Holzinger c8b6499332 Update installing.rst
Add the missing info how to setup Composer to fetch the latest Develop branch instead of the outdated Master branch.
2014-09-22 14:51:21 +02:00
Progi1984 b49f08bd91 Merge pull request #376 from franzholz/patch-3
Update CONTRIBUTING.md
2014-09-21 10:56:51 +02:00
Franz Holzinger 891278632e Update CONTRIBUTING.md
I have added a link to an important video. Without this video I was not able to synchronise my Fork with the Develop branch.
2014-09-20 19:21:36 +02:00
Progi1984 dbe160d794 Merge pull request #374 from franzholz/patch-3
Update installing.rst
2014-09-18 14:26:51 +02:00
Franz Holzinger 24d8cc7e64 Update installing.rst
Show the way how to install PHPWord using Git.
2014-09-18 09:39:27 +02:00
Roman Syroeshko 68422efcf9 Merge pull request #373 from franzholz/patch-3
Update CONTRIBUTING.md
2014-09-17 20:47:46 +04:00
Franz Holzinger 5cdf329919 Update CONTRIBUTING.md
The PHPUnit tests run into error messages if PHPWord has not been installed by Composer.
2014-09-16 21:59:14 +02:00
Progi1984 5b11071d4a Merge pull request #366 from franzholz/patch-1
Update CONTRIBUTING.md
2014-09-11 09:14:27 +02:00
Franz Holzinger 941d2c7a58 Update CONTRIBUTING.md 2014-09-10 17:05:38 +02:00
Roman Syroeshko 5adbae4f29 Merge pull request #356 from GMTA/develop 2014-09-07 19:07:39 +04:00
Roman Syroeshko fdbd983d14 Merge pull request #356 from GMTA/develop
Set the right method name for addShape() for AbstractContainer
2014-09-07 18:52:29 +04:00
Roman Syroeshko 5811aac272 Merge pull request #302 from basjan/absolute-positioning 2014-09-07 18:21:24 +04:00
Roman Syroeshko 42955f17dd Merge pull request #302 from basjan/absolute-positioning 2014-09-07 18:19:10 +04:00
Roman Syroeshko c4cbabeb36 Merge pull request #302 from basjan/absolute-positioning
For absolute positioning vPos and hPos need to be set to POS_ABSOLUTE
2014-09-07 18:01:53 +04:00
Jelle Raaijmakers 9b3b1aa7a0 Set the right method name for addShape() in PHPDoc @method for AbstractContainer. 2014-08-31 00:06:00 +02:00
Roman Syroeshko d11b0deaf9 [FIXED] https://github.com/PHPOffice/PHPWord/issues/340 2014-08-23 20:25:41 +04:00
Roman Syroeshko 9757fbb033 [FIXED] https://github.com/PHPOffice/PHPWord/issues/340 2014-08-23 20:19:48 +04:00
Progi1984 48322ca89c Merge pull request #339 from franzholz/patch-2
Update CONTRIBUTING.md
2014-08-18 21:26:40 +02:00
Franz Holzinger 62c799172e Update CONTRIBUTING.md
misspelling
2014-08-18 20:36:13 +02:00
Roman Syroeshko bf0136c156 https://github.com/PHPOffice/PHPWord/issues/216 2014-08-16 15:46:38 +04:00
Progi1984 d66e8559e6 #23 : Implement Word97 aka MsDoc Reader (Documentation ) 2014-08-16 13:28:27 +02:00
Progi1984 8da62eb7b2 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into develop 2014-08-16 13:25:58 +02:00
Progi1984 0151a21c0f #23 : Implement Word97 aka MsDoc Reader (Documentation ) 2014-08-16 13:25:38 +02:00
Roman Syroeshko 5a75d84f8f Merge remote-tracking branch 'origin/develop' into develop 2014-08-16 15:22:35 +04:00
Roman Syroeshko ec25dd338b https://github.com/PHPOffice/PHPWord/issues/216 2014-08-16 15:21:58 +04:00