troosan
|
fce1bf28c8
|
format code
|
2017-12-25 22:05:46 +01:00 |
troosan
|
512cf952ae
|
randomise temp directory name to avoid collisions
|
2017-12-25 20:42:37 +01:00 |
troosan
|
4767703f86
|
Merge branch 'master' of https://github.com/PHPOffice/PHPWord into upstream_develop
|
2017-12-25 17:14:27 +01:00 |
troosan
|
7250b15e74
|
Title can be added in Cell
|
2017-12-25 08:33:02 +01:00 |
troosan
|
6daf31be8f
|
Merge pull request #1226 from PHPOffice/develop
Merge develop branch to master branch
|
2017-12-25 01:37:54 +01:00 |
troosan
|
56720df487
|
update version
|
2017-12-25 01:32:34 +01:00 |
troosan
|
ed704da5b2
|
set release date
|
2017-12-25 01:24:20 +01:00 |
SRG Group
|
3e6745f146
|
HTML image support & TextRun paragraph style (#934)
* Adding setParagraphStyle to Textrun for indentation
* Html Image support added
* fix formatting, add tests & update changelog
|
2017-12-21 00:03:52 +01:00 |
troosan
|
200c2f1eb0
|
Merge pull request #1019 from jun-i-corn/feature/EnablePasswordProtection
enable password protection (Word)
|
2017-12-20 22:00:34 +01:00 |
troosan
|
7908491ba3
|
revert mistakenly deleted line
|
2017-12-19 22:14:52 +01:00 |
troosan
|
8929917677
|
Merge pull request #592 from ComputerTinker/ComputerTinker-FixEmptyDropdownEntry
Pad Empty Dropdown Entry
|
2017-12-19 21:53:59 +01:00 |
troosan
|
0f200d99f4
|
Merge pull request #1222 from carusogabriel/clean-elses
Clean elses
|
2017-12-19 21:41:21 +01:00 |
troosan
|
46a037ebd0
|
add composer scripts
|
2017-12-18 17:02:34 +01:00 |
troosan
|
219f3bcee1
|
Merge pull request #1221 from troosan/fix_parsing_of_on-off
correctly parse on/off values (w:val="true|false|1|0|on|off")
|
2017-12-18 08:52:35 +01:00 |
Gabriel Caruso
|
87acd3764b
|
Clean elses
|
2017-12-14 12:21:16 -02:00 |
troosan
|
5d5362a3fd
|
sort imports
|
2017-12-14 00:15:23 +01:00 |
troosan
|
5a57409df0
|
fix tests
|
2017-12-13 23:55:48 +01:00 |
troosan
|
ad38d4c20f
|
Merge branch 'feature/EnablePasswordProtection' of https://github.com/jun-i-corn/PHPWord into feature/EnablePasswordProtection
|
2017-12-13 23:25:32 +01:00 |
troosan
|
f7d2ad7201
|
formatting
|
2017-12-13 23:24:37 +01:00 |
troosan
|
9e029415cc
|
align with pull request submitted in PHPOffice/Commom
|
2017-12-13 23:17:01 +01:00 |
troosan
|
dc7cb1ee75
|
update changelog & doc
|
2017-12-13 22:48:58 +01:00 |
troosan
|
253b060241
|
correctly parse on/off values (w:val="true|false|1|0|on|off")
|
2017-12-13 07:47:49 +01:00 |
troosan
|
194e5c47e4
|
Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into develop
|
2017-12-05 21:39:35 +01:00 |
troosan
|
f6dd78daa6
|
update doc and changelog
|
2017-12-05 21:39:28 +01:00 |
troosan
|
88bbe49d01
|
Merge pull request #1217 from troosan/html_br
Added support for linebreaks <br/> in Shared\Html::addHtml()
|
2017-12-05 21:38:55 +01:00 |
troosan
|
d4c6427418
|
Merge pull request #727 from irond/container_for_checkbox
Add TextRun as container for CheckBox
|
2017-12-05 21:28:59 +01:00 |
troosan
|
0c7593ba10
|
Merge pull request #582 from SSchwaiger/patch-2
A chart object can also be added to a table cell
|
2017-12-05 21:04:07 +01:00 |
troosan
|
905029a59e
|
Merge branch 'develop' into html_br
|
2017-12-05 20:50:33 +01:00 |
troosan
|
fd156bf12a
|
Merge branch 'develop' into html_br
|
2017-12-05 20:50:13 +01:00 |
troosan
|
c079bf7f10
|
update changelog
|
2017-12-05 20:47:34 +01:00 |
troosan
|
9081ed9868
|
fix warning
|
2017-12-05 17:40:23 +01:00 |
troosan
|
8f512bf618
|
Merge branch 'develop-html-br' of https://github.com/anrikun/PHPWord
into develop
Conflicts:
src/PhpWord/Shared/Html.php
|
2017-12-05 17:33:51 +01:00 |
troosan
|
05e2f1bf63
|
use non deprecated method
|
2017-12-05 08:02:23 +01:00 |
troosan
|
3b7b894290
|
Merge branch 'develop' into feature/EnablePasswordProtection
|
2017-12-05 00:35:29 +01:00 |
troosan
|
cfc89b7853
|
Merge branch 'develop' into feature/EnablePasswordProtection
|
2017-12-05 00:34:14 +01:00 |
troosan
|
86115b9e2d
|
update installation instructions
|
2017-12-05 00:14:57 +01:00 |
troosan
|
3b6f9cea21
|
Allow use of stdlib 3.x
|
2017-12-04 22:31:10 +01:00 |
troosan
|
274f50ce5a
|
Add unit tests & add array type checks
|
2017-12-04 22:30:49 +01:00 |
troosan
|
ca25eba8aa
|
Scrutinizer fixes
|
2017-11-26 22:55:37 +01:00 |
troosan
|
23bc837666
|
Scrutinizer fixes
|
2017-11-26 17:54:47 +01:00 |
troosan
|
6a460c292d
|
Merge pull request #1206 from troosan/odt_page_break
Implement PageBreak for the ODText writer
|
2017-11-26 00:39:25 +01:00 |
troosan
|
def9123575
|
Merge branch 'develop' into odt_page_break
|
2017-11-26 00:37:16 +01:00 |
troosan
|
911739a0b2
|
Merge branch 'develop' into odt_page_break
|
2017-11-26 00:36:37 +01:00 |
troosan
|
01008a591b
|
update changelog
|
2017-11-26 00:35:21 +01:00 |
troosan
|
355027d854
|
PHP-CS fix, improve code coverage
|
2017-11-26 00:11:09 +01:00 |
troosan
|
2ea9ffbdd4
|
Merge branch 'develop' of https://github.com/cookiekiller/PHPWord into odt_page_break
|
2017-11-25 23:45:04 +01:00 |
troosan
|
72a6b1b19f
|
Add unit test
|
2017-11-25 23:44:46 +01:00 |
Michael Spahn
|
5d928db916
|
Implement PageBreak for odt writer
|
2017-11-25 23:44:45 +01:00 |
troosan
|
6faddc684a
|
Merge pull request #1205 from troosan/update_fields
Allow to force an update of all fields on opening a document
|
2017-11-25 21:56:17 +01:00 |
troosan
|
5a5ae48bb6
|
also add w:bCs
|
2017-11-25 21:37:11 +01:00 |