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

1350 Commits

Author SHA1 Message Date
antoine 6e49e89547 Merge branch 'support_comments' into develop 2017-05-15 23:00:10 +02:00
antoine 1cfb62de0d Add support for comments 2017-05-15 22:49:02 +02:00
antoine 0e0817c972 ignore the build directory 2017-05-12 00:45:31 +02:00
antoine 759794d746 fix twig dependency so build can succeed 2017-05-12 00:45:21 +02:00
Progi1984 4decaffd53 PHPWord is looking for a new maintainer 2017-03-13 14:45:57 +01:00
Maria Haubner 488b10b73b allow setValue() for SDTs 2017-03-08 13:08:33 +01:00
Andrey Tyshev f9cab8d02c Fix name of style definitions 2017-02-21 21:42:56 +03:00
antoine d8c5703e06 Merge remote-tracking branch 
'github_troosan/fix_for_different_even_odd_headers' into develop

Conflicts:
	tests/PhpWord/SettingsTest.php
	tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
 2017-01-29 14:54:08 +01:00
antoine aef7a0ba76 add possibility to write w:evenAndOddHeaders in settings.xml 2017-01-29 14:34:19 +01:00
antoine 7c08dd595b Merge remote-tracking branch 'github_troosan/fix_image_loading_over_https' into develop 2017-01-29 13:47:59 +01:00
antoine 217fd6ecf1 fix image loading over https 2017-01-29 13:37:43 +01:00
antoine 517c432ee6 fix image loading over https 2017-01-29 13:16:54 +01:00
antoine 91f79d85cf Merge branch 'show_hide_spelling_grammatical_errors' into develop 2017-01-28 12:04:51 +01:00
antoine d23409f687 Add possibility to show/hide spelling and grammatical errors 2017-01-28 11:39:43 +01:00
sergeizelenyi 8b960c79d5 stylization code 2017-01-23 16:43:56 +03:00
sergeizelenyi 1ab93e7e8a added functionality specified alias and tag 2017-01-23 16:15:33 +03:00
antoine 8d7775552c Merge remote-tracking branch 'github_troosan/paper_size_computation' into develop 2017-01-22 15:16:16 +01:00
antoine fc3bc29a02 fix default page size 2017-01-22 11:09:44 +01:00
antoine da60645be3 Merge remote-tracking branch 'github_troosan/paper_size_computation' into develop 2017-01-21 19:29:14 +01:00
antoine b6a9f7c9b3 fix paper size and add tests for Paper class 2017-01-21 19:06:49 +01:00
antoine 38a4e79c3c Merge branch 'image_from_string' into develop 2016-12-14 22:41:28 +01:00
Stéphane Mourey 1a1b362f40 Update Paragraph.php 2016-12-13 21:51:44 +01:00
Progi1984 6da9d8a0bf Merge pull request #928 from likeuntomurphy/develop 
Fixes PHPOffice/PHPWord#927
 2016-12-13 16:56:57 +01:00
Progi1984 c4c35ddb63 Merge pull request #937 from troosan/image_from_string 
add support for Image creation from string image data
 2016-12-13 09:32:25 +01:00
antoine 204f0c32ec update documentation 2016-12-12 20:39:10 +01:00
antoine 51c6b5fc38 add support for Image creation from string image data 2016-11-08 23:40:10 +01:00
antoine a070628225 Merge remote-tracking branch 'origin/develop' into develop 2016-11-08 23:33:50 +01:00
antoine 46eebe2136 add support for Image creation from string image data 2016-11-08 23:22:22 +01:00
Progi1984 60e7f53945 Merge pull request #935 from liangtaohy/patch-1 
Update MsDoc.php
 2016-11-08 13:51:36 +01:00
liangtaohy 3f9ab94812 Update MsDoc.php 
fix style\font not found bug
 2016-11-08 18:32:22 +08:00
Jonathan Cox 000e36acfe Fixes PHPOffice/PHPWord#927 2016-10-28 20:06:03 -04:00
antoine 1c0444646e Merge branch 'fix_font_style_based_on' into develop 2016-10-28 23:30:11 +02:00
antoine c50e3c581a replace tab with spaces 2016-10-28 23:28:05 +02:00
antoine 18474c56c4 replace tab with spaces 2016-10-28 23:27:24 +02:00
antoine 2216bc6130 Merge branch 'fix_font_style_based_on' into develop 2016-10-28 23:15:05 +02:00
antoine 8318b412e9 Merge remote-tracking branch 'github_troosan/support_for_xe_and_index_field' into develop 2016-10-28 23:14:34 +02:00
antoine 77ed1565c3 make FontStyle based on paragraph if it set 2016-10-28 22:40:44 +02:00
antoine e7229fc15c make FontStyle based on paragraph if it set 2016-10-28 22:27:05 +02:00
antoine 0953065b8c improve code coverage 2016-10-28 00:20:47 +02:00
antoine d52d9b8985 Add support for XE and INDEX fields 2016-10-27 23:12:26 +02:00
Stéphane Mourey 23e19a2d47 Fix division by zero 
See #886
 2016-09-12 16:43:21 +02:00
Brandon Skrtich 49492b2516 Fix incorrect image size between windows and mac. 
See Issue #224
 2016-08-26 11:06:19 -06:00
Progi1984 c71069022e Merge pull request #821 from brutto/patch-1 
Add info about Invalid image
 2016-08-23 10:24:27 +02:00
Roman Syroeshko 0a3f873972 Updated change log. 2016-07-31 12:53:39 +04:00
Roman Syroeshko 31cc01a3d1 Updated change log. 2016-07-31 12:51:09 +04:00
Roman Syroeshko 4486e2befb Updated change log. 2016-07-31 12:50:01 +04:00
Roman Syroeshko 2bcfacfbf9 Updated copyright. 2016-07-31 12:35:08 +04:00
Roman Syroeshko 1827eab20c Removed deprecated code. 2016-07-30 22:41:31 +04:00
Roman Syroeshko 7817524b31 https://github.com/PHPOffice/PHPWord/issues/399. 2016-07-30 22:33:24 +04:00
Roman Syroeshko 54013a6164 https://github.com/PHPOffice/PHPWord/issues/399. 2016-07-30 22:32:32 +04:00