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

1840 Commits

Author SHA1 Message Date
troosan 9e5da1e025 update changelog 2018-12-28 22:26:30 +01:00
troosan ccf291234e Avoid warning if variable is null 2018-12-28 20:32:10 +01:00
troosan d8d697c848 added convertors with test 2018-12-28 18:04:36 +01:00
troosan a4b532083b
Merge pull request #1162 from abcdmitry/patch-2 
Break the references in foreach within TemplateProcessor
 2018-12-27 22:22:20 +01:00
troosan 7790b6a6b0 Pass values to replace macros with in cloneBlock 2018-12-27 22:13:48 +01:00
troosan 01209ddbd1 improve template processor documentation 2018-12-27 21:05:56 +01:00
troosan 75620caf51 add parameter to keep backward compatibility + add test 2018-12-27 01:44:37 +01:00
troosan 1bcef04ddc Merge remote-tracking branch 'JPBetley/PHPWord/clone-block-variables' into rebase_pull_request 2018-12-27 01:29:51 +01:00
troosan 1717bd4978 add test for cloneBlock operation 2018-12-27 00:30:04 +01:00
troosan 0f963e40a7
Merge pull request #1536 from Samuel-BF/fix-RTF-numerals 
For RTF writers, sizes should should never have decimals
 2018-12-26 23:16:22 +01:00
troosan bbe517aa60
Merge pull request #1541 from morrisdj/develop 
Add "Plain Text" type to SDT (Structured Document Tags)
 2018-12-26 23:16:06 +01:00
troosan 254d300ea7
Merge pull request #1511 from carusogabriel/ternary-expressions 
Remove unnecessary ternary expressions
 2018-12-26 23:15:49 +01:00
troosan dcf637df5a update changelog 2018-12-26 22:53:49 +01:00
troosan d84da93a36 Add test and fix warnings 2018-12-26 22:50:19 +01:00
troosan 8ffaa1c8b7 add test to cover get TemplateProcessor::getVariables 2018-12-26 22:27:17 +01:00
Daniel Morris 5e2374be4a Merge remote-tracking branch 'upstream/develop' into develop 2018-12-26 21:49:41 +02:00
Daniel Morris a5ec49d99d Add plain text SDT type 2018-12-26 21:45:32 +02:00
troosan 575c5531b8 replace self with static 2018-12-26 20:07:53 +01:00
troosan 2a088fb45b Update changelog 2018-12-26 20:07:32 +01:00
troosan 6cf10b4562
Merge pull request #1161 from abcdmitry/patch-1 
Get rid of duplicated code in TemplateProcessor
call static methods with static:: instead of self::
 2018-12-26 20:04:18 +01:00
troosan c9b19cf65b Merge remote-tracking branch 'upstream/master' into rebase_pull_request 2018-12-26 19:54:41 +01:00
troosan 10b106ce05
Update CHANGELOG.md 2018-12-26 17:20:15 +01:00
troosan 56ca30ab95
Merge pull request #1539 from GautierDele/develop 
Update documentation on usage of ListItemRun
 2018-12-26 14:35:42 +01:00
Maxim d5da80b56e Support adding images in Templates (#1170) 
* setImageValue() + fix adding files via ZipArchive
* fix phpdoc variable name
* Changed logic that determines extension image file extension for document to depend on MIME type. This same logic is used in Element/Image.php
* support <w:t> tags with arguments
* allow setup size of image into template variable
* support of 'ratio' replace attribute + documentation
 2018-12-26 14:35:21 +01:00
Gautier 0b99f8f3e2 docs: ListItemRun 2018-12-26 11:23:43 +01:00
troosan e6496bf411
Merge pull request #1537 from isometriks/patch-1 
[WIP] Still add text if link missing
 2018-12-23 21:11:30 +01:00
Craig Blanchette b1661af71a
Still add text if link missing 
If link target doesn't exist, still add the text anyway.
 2018-12-19 15:17:42 -05:00
Samuel BF c0f8cae55c Fixing RTF writers : numbers should be printed as integers and not float. 
This is specified in the spec, for example here :
http://www.biblioscape.com/rtf15_spec.htm#Heading2
« The delimiter marks the end of an RTF control word, and can be one of the following : [...]
* A digit or a hyphen (-), which indicates that a numeric parameter follows. The subsequent digital sequence is then delimited by a space or any character other than a letter or a digit. »
 2018-12-18 15:04:25 +01:00
troosan 0db21ae115
Merge pull request #1272 from nicoder/add-getVariableCount-method 
Add getVariableCount method in TemplateProcessor
 2018-12-11 21:56:14 +01:00
troosan b188ab94e1
Merge branch 'develop' into add-getVariableCount-method 2018-12-11 21:31:18 +01:00
troosan 8f85424fb7 update changelog 2018-12-11 21:30:18 +01:00
Nathan Dench cf3132acac Add ability to pass a Style object to a Section element (#1416) 
* Add ability to pass a Style object to a Section
* Fix typo
* update changelog
 2018-12-08 23:35:32 +01:00
Alex Morozov c2b54cc343 add support for hidden text (#1527) 
* added hidden text word 2007
* update changelog
* update documentation
* added unit test
* docx reader
* html reader/writer
* odt writer
* updated samples
 2018-12-08 23:21:59 +01:00
Yurii.sio2 260bb75fc2 Fix TemplateProcessor :: fixBrokenMacros; (#1502) 
* Fix TemplateProcessor :: fixBrokenMacros;
* add unit test for fixBrokenMacros
 2018-12-07 23:22:04 +01:00
troosan af5a271e9e
Line spacing is wrong when using "exact" line spacing rule (#1509) 
* Only add 240 twips when in auto lineRule
* don't add 1 line when using EXACT line spacing rule
* fix style & scrutinizer warning
 2018-12-03 16:09:20 +01:00
troosan c15d4d155d
Merge pull request #1521 from bulbaka/patch-1 
Update Language.php
 2018-12-03 16:08:03 +01:00
Eugene Bulbaka 7930f5d136
Update Language.php 
Added Language constants and values for Ukrainian (lines 71, 72):
const UK_UA = 'uk-UA';
const UK_UA_ID = 1058;
 2018-12-03 16:04:19 +02:00
troosan 7b3b723646
Merge pull request #1430 from nicoder/patch-4 
allow to override TemplateProcessor#ensureUtf8Encoded
 2018-12-03 01:01:51 +01:00
troosan c177c55d07
Merge pull request #1433 from Tom-Magill/develop 
Add feature to set Chart Title and Legend visibility
 2018-12-03 00:58:54 +01:00
troosan 9f684c745e update changelog 2018-12-02 23:54:40 +01:00
troosan 0c4bd1d02f update documentation 2018-12-02 23:54:32 +01:00
troosan 5b688d50d8 fix formatting 2018-12-02 23:54:25 +01:00
troosan 31968fa814 Merge branch 'develop' of https://github.com/Tom-Magill/PHPWord into develop_upstream 2018-12-02 23:38:08 +01:00
troosan fb60865b8d test build php 7.3 2018-12-02 22:09:24 +01:00
troosan a44aee8c34 fix some sonar warnings 2018-12-01 21:13:11 +01:00
troosan 6a7594630c add sonar config files 2018-12-01 21:12:41 +01:00
troosan d9165f00fa
Merge pull request #1513 from carusogabriel/phpunit 
Use dedicated PHPUnit assertions
 2018-11-30 22:58:01 +01:00
troosan 9dd5e0c27d
Merge pull request #1441 from aarangara/add_html_table_layout 
Adding table layout to the generated HTML
 2018-11-29 17:39:31 +01:00
troosan f472bfbc75
Merge branch 'develop' into add_html_table_layout 2018-11-28 22:58:29 +01:00
troosan b50de97a41 support `auto` table layout too 2018-11-28 22:54:57 +01:00