35aa6d6291
Merge branch 'master' of https://github.com/PHPOffice/PHPWord into upstream_develop
2018-01-03 14:27:34 +01:00
bdca366d91
remove link to obsolete URL [skip ci]
2018-01-03 14:15:59 +01:00
7d929fee8c
add branch alias for 0.15.0 [skip ci]
2017-12-29 21:48:15 +01:00
d480aab1b0
add branch alias for 0.15.0 [skip ci]
2017-12-29 21:48:08 +01:00
23693b403c
change impl to avoid compilation issue
2017-12-29 21:47:55 +01:00
ca29ceb1fa
add branch alias for 0.15.0 [skip ci]
2017-12-29 21:33:29 +01:00
d1a79b79f1
add branch alias for 0.15.0 [skip ci]
2017-12-29 21:29:31 +01:00
2d87fd320d
fix merge
2017-12-29 20:27:05 +01:00
400a8e65d3
rename 'Object' classes to 'ObjectElement' (php 7.2 compatibility) ( #1185 )
...
merge develop branch
2017-12-29 20:19:35 +01:00
526d0ac8de
create alias for develop branch
2017-12-29 15:46:31 +01:00
709ea1e14c
update changelog [skip ci]
2017-12-29 15:16:03 +01:00
46e179d148
add instructions on how to run the samples in a browser
2017-12-29 15:16:03 +01:00
b20cd4fa9f
output the source code of the sample that was run
2017-12-29 15:16:03 +01:00
1d8e7b8374
split composer scripts, add description (only works with composer 1.6)
2017-12-29 15:16:03 +01:00
d2b9e88047
add parsing of "align" HTML attribute
2017-12-29 15:16:03 +01:00
fd7ee76438
create alias for develop branch
2017-12-29 03:01:36 +01:00
b614497ae6
fix dependencies to have 7.1 compatible build ( #1228 )
...
* add assertions in test methods without assertions
* loosen dependencies so 7.0 & 7.1 builds can succeed
* fix some scrutinizer errors
* update release date
2017-12-29 02:30:53 +01:00
fce1bf28c8
format code
2017-12-25 22:05:46 +01:00
512cf952ae
randomise temp directory name to avoid collisions
2017-12-25 20:42:37 +01:00
4767703f86
Merge branch 'master' of https://github.com/PHPOffice/PHPWord into upstream_develop
2017-12-25 17:14:27 +01:00
7250b15e74
Title can be added in Cell
2017-12-25 08:33:02 +01:00
6daf31be8f
Merge pull request #1226 from PHPOffice/develop
...
Merge develop branch to master branch
2017-12-25 01:37:54 +01:00
56720df487
update version
2017-12-25 01:32:34 +01:00
ed704da5b2
set release date
2017-12-25 01:24:20 +01:00
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
200c2f1eb0
Merge pull request #1019 from jun-i-corn/feature/EnablePasswordProtection
...
enable password protection (Word)
2017-12-20 22:00:34 +01:00
7908491ba3
revert mistakenly deleted line
2017-12-19 22:14:52 +01:00
8929917677
Merge pull request #592 from ComputerTinker/ComputerTinker-FixEmptyDropdownEntry
...
Pad Empty Dropdown Entry
2017-12-19 21:53:59 +01:00
0f200d99f4
Merge pull request #1222 from carusogabriel/clean-elses
...
Clean elses
2017-12-19 21:41:21 +01:00
46a037ebd0
add composer scripts
2017-12-18 17:02:34 +01:00
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
87acd3764b
Clean elses
2017-12-14 12:21:16 -02:00
5d5362a3fd
sort imports
2017-12-14 00:15:23 +01:00
5a57409df0
fix tests
2017-12-13 23:55:48 +01:00
ad38d4c20f
Merge branch 'feature/EnablePasswordProtection' of https://github.com/jun-i-corn/PHPWord into feature/EnablePasswordProtection
2017-12-13 23:25:32 +01:00
f7d2ad7201
formatting
2017-12-13 23:24:37 +01:00
9e029415cc
align with pull request submitted in PHPOffice/Commom
2017-12-13 23:17:01 +01:00
dc7cb1ee75
update changelog & doc
2017-12-13 22:48:58 +01:00
253b060241
correctly parse on/off values (w:val="true|false|1|0|on|off")
2017-12-13 07:47:49 +01:00
194e5c47e4
Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into develop
2017-12-05 21:39:35 +01:00
f6dd78daa6
update doc and changelog
2017-12-05 21:39:28 +01:00
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
d4c6427418
Merge pull request #727 from irond/container_for_checkbox
...
Add TextRun as container for CheckBox
2017-12-05 21:28:59 +01:00
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
905029a59e
Merge branch 'develop' into html_br
2017-12-05 20:50:33 +01:00
fd156bf12a
Merge branch 'develop' into html_br
2017-12-05 20:50:13 +01:00
c079bf7f10
update changelog
2017-12-05 20:47:34 +01:00
9081ed9868
fix warning
2017-12-05 17:40:23 +01:00
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
05e2f1bf63
use non deprecated method
2017-12-05 08:02:23 +01:00
troosan
Maxim
SRG Group
Gabriel Caruso