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

2044 Commits

Author SHA1 Message Date
troosan d905e764e3
Merge pull request #2063 from tpv-ebben/develop 
when adding image to relationship first check that the generated RID is actually unique
 2021-05-29 17:58:25 +02:00
troosan d6e0a3ebdb
Merge pull request #2070 from PHPOffice/dependabot/add-v2-config-file 
Upgrade to GitHub-native Dependabot
 2021-05-05 21:01:50 +02:00
dependabot-preview[bot] a9deeb8c25
Upgrade to GitHub-native Dependabot 2021-04-29 21:47:21 +00:00
troosan 7fd0489567 fix checkstyle issues 2021-04-16 23:38:14 +02:00
Ebben Feagan 524c08bafb running composer fix 2021-04-16 15:19:55 -05:00
Ebben Feagan 94b74c27a4 when adding image to relationship list check that the generated relationship id is actually unique 2021-04-16 15:06:37 -05:00
troosan ab7d82274e
Merge pull request #2052 from dfsd534/develop 
Update chart, don't write 'c:overlap' if grouping is 'clustered'
 2021-04-15 22:23:24 +02:00
troosan fa52c92561
Merge pull request #2041 from joelgo/patch-1 
Update Html parser to accept line-height:normal
 2021-04-15 22:23:08 +02:00
DE TROOSTEMBERGH Antoine 3a7301c700 try to fix the php-cs-fixer pr annotation 2021-04-15 21:44:37 +02:00
DE TROOSTEMBERGH Antoine 0692a55fa4 checkstyle fixes 2021-04-15 21:19:38 +02:00
DE TROOSTEMBERGH Antoine a4055fb7a0 'normal' line-height means default line height 
Add unit test
 2021-04-15 21:04:45 +02:00
DE TROOSTEMBERGH Antoine 8efd9ff9da Merge branch 'develop' into develop_tmp 2021-04-14 22:19:05 +02:00
DE TROOSTEMBERGH Antoine d731e9284f fix checkstyle issues 2021-04-14 22:15:58 +02:00
troosan 55defcc892 relax some phpmd rules 2021-04-14 00:16:28 +02:00
dfsd534 afed126ab1 update 2021-04-10 11:49:32 +08:00
joelgo 7f78322d04
Update html.php 
For acept text in line-height how "line-height:normal", etc.
 2021-03-17 13:09:13 -05:00
troosan a30bbbdc62
Merge pull request #2021 from kamilmmach/develop 
Fix image border in Word2007 Writer for LibreOffice 7
 2021-03-13 17:27:03 +01:00
Adrien Crivelli 06b90e39a3
0.18.1 2021-03-08 10:06:35 +09:00
Adrien Crivelli 84d1da6ce2
Merge pull request #2032 from mussbach/f_2028_dont_replace_package 
Fix BC break in #1946. This package does not replace laminas/laminas-zendframework-bridge
 2021-03-08 10:02:32 +09:00
Sami Mussbach 556a250fb3 Fix BC break in #1946. This package does not replace laminas/laminas-zendframework-bridge 
This commit fixes the BC break introduced by #1946 where it was stated
that phpword replaces package laminas/laminas-zendframework-bridge which
is not the case. Package laminas/laminas-zendframework-bridge only was
replaced from phpword.
 2021-03-04 17:50:16 +01:00
troosan 5dcb3e53ee coverage with xdebug 2021-02-21 21:46:22 +01:00
troosan 2ae000cbad hack for phpunit 8 compatibility 2021-02-21 21:32:45 +01:00
troosan b71b4fdb71 update phpunit params 2021-02-21 21:16:27 +01:00
troosan 2961b72c7a don't fail on non existing lock file 2021-02-21 21:07:20 +01:00
troosan 1e5fd83222 remove travis config file 2021-02-21 21:01:01 +01:00
troosan 67ea85688e add git workflow 2021-02-21 20:53:45 +01:00
Kamil Mach 68cbca530f Fix image border in Word2007 Writer for LibreOffice 7 2021-02-17 09:22:32 +01:00
troosan 1bd7cd6238 set release date 2021-02-12 22:28:06 +01:00
troosan c2e2ec4004
Merge pull request #1832 from Matze2010/udz-checkbox-feature 
Add parsing of HTML checkbox input field
 2021-02-12 20:37:35 +01:00
troosan 659d3d7b4b
Update Html.php 
fix
 2021-02-12 20:16:18 +01:00
troosan bed1f7afbf
pass the paragraph style 2021-02-11 21:44:20 +01:00
troosan 4c5e760871 Merge branch 'master' of https://github.com/PHPOffice/PHPWord.git into develop 2021-02-11 20:39:01 +01:00
troosan c550a53c3e prepare changelog for 0.18.0 2021-02-11 20:38:40 +01:00
troosan a382f9d754
fix 2021-02-11 19:25:28 +01:00
troosan 8bb0b73733 fix merge 2021-02-10 21:10:06 +01:00
troosan d4f08a3f8a Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into tmp 
Conflicts:
	tests/PhpWord/Shared/HtmlTest.php
 2021-02-10 21:04:16 +01:00
troosan 9736d37bc9
Merge pull request #1986 from emnabs/develop 
add/setting page element border style.
 2021-02-10 20:49:37 +01:00
troosan 81d613bc4d php 5.3 compatible code 2021-02-10 08:25:09 +01:00
troosan 4840faa422
Merge pull request #1922 from csk83/develop 
Add Option for Dynamic Chart Legend Position #1699
 2021-02-09 21:26:47 +01:00
troosan 1b7b43a4e5 fix code formatting 2021-02-08 22:58:14 +01:00
troosan e1bbc85cc4
Make syntax php 5.3 compliant 2021-02-08 22:40:46 +01:00
troosan b2585dfd28 move constants to simpleType 2021-02-08 22:20:00 +01:00
troosan 1c3fdd2719 prepare release 0.18.0 2021-02-08 22:12:24 +01:00
troosan 264f1590f0 make xmlReplaceBlock public 2021-02-08 22:08:29 +01:00
troosan cba1edc9e8
remove trailing whitespaces 2021-02-08 00:59:44 +01:00
troosan 486321bb02
Compatibility with old PHP versions 2021-02-08 00:58:00 +01:00
troosan 6db2927484
Merge pull request #1965 from naept/feature_handle-style-inheritance-for-html 
feat: Update addHtml to handle style inheritance
 2021-02-08 00:51:34 +01:00
troosan f832a7c9db
Merge branch 'develop' into develop 2021-02-08 00:37:42 +01:00
troosan ca45d14511
Merge pull request #1809 from juzser/dev-master 
Update the regexp to avoid catastrophic backtracking
 2021-02-07 23:42:57 +01:00
troosan 5080139511
Merge pull request #1824 from ErnestStaug/locale_support 
Some document have non-standard locale code
 2021-02-07 23:33:14 +01:00