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

963 Commits

Author SHA1 Message Date
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 a382f9d754
fix 2021-02-11 19:25:28 +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 b2585dfd28 move constants to simpleType 2021-02-08 22:20:00 +01:00
troosan 264f1590f0 make xmlReplaceBlock public 2021-02-08 22:08:29 +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
troosan 6baf287a5f
Merge branch 'develop' into udz-checkbox-feature 2021-02-07 23:30:28 +01:00
troosan 9e322dd6e7
Merge pull request #1902 from lubosdz/develop 
Enhancements to addHTML parser
 2021-02-07 22:53:53 +01:00
troosan bf8f2ac12f
Merge pull request #1763 from TimeTonic/fixes-1750-block-with-images-inside 
TemplateProcessor cloneBlock wrongly clones images
 2021-02-07 22:27:40 +01:00
troosan 137238faed
Merge pull request #1967 from jsochor/develop 
fix image limit
 2021-02-07 22:09:34 +01:00
troosan 26e479422a
Fix formatting 2021-02-07 15:06:01 +01:00
Antoine de Troostembergh 31259f6448 fix 2021-02-06 22:12:19 +01:00
Antoine de Troostembergh 1168789e8a fix formatting 2021-02-06 21:32:30 +01:00
dbarzin 48ee2eb78a fix param error 2021-02-06 10:50:21 +01:00
dbarzin 31002fc6e8 add chart in template 2021-02-06 10:40:52 +01:00
troosan 4e87e72110
Merge pull request #1716 from enflow/allowImageClosure 
Allow a closure to be passed with image replacement tags
 2021-02-05 22:08:56 +01:00
troosan 8922632ead
Merge pull request #1936 from YannikFirre/patch-1 
Add null check when setComplexValue is not found
 2021-02-05 21:26:02 +01:00
troosan 24e46544d8
remove space 2021-02-05 21:25:21 +01:00
troosan 13384f63d3
update comment 2021-02-05 21:15:51 +01:00
Antoine de Troostembergh 83ba5a7b57 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into patch-1 2021-02-05 21:12:43 +01:00
troosan 554e90a46c
Merge pull request #1851 from oleibman/defaultpaper 
Make Default Paper Configurable
 2021-01-12 21:40:26 +01:00
troosan c391b90823
Merge pull request #1924 from sven-ahrens/feature/parse-shapes 
Feature Request: Read shape node values
 2021-01-12 21:37:23 +01:00
Libor M ea917c28da fix coverage 2021-01-10 14:06:19 +01:00
Libor M 681d5c4709 fix PHP 8.0 compatibility 2021-01-02 09:08:43 +01:00
Libor M a2c8d8c2d5 \PhpOffice\Common\XMLWriter -> \PhpOffice\PhpWord\Shared\XMLWriter 2021-01-02 08:26:46 +01:00
Libor M 0cca050bcd \PhpOffice\Common\XMLReader -> \PhpOffice\PhpWord\Shared\XMLReader 2021-01-01 16:33:27 +01:00
Libor M 9a26ad9189 \PhpOffice\Common\Microsoft\PasswordEncoder -> \PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder 2021-01-01 16:23:58 +01:00
Libor M b656720619 \PhpOffice\Common\Drawing -> \PhpOffice\PhpWord\Shared\Drawing 2021-01-01 16:15:24 +01:00
Libor M c52686c243 \PhpOffice\Common\Text -> \PhpOffice\PhpWord\Shared\Text 2021-01-01 16:09:16 +01:00
Antoine de Troostembergh cf808cb3fc Fix merge issue 2020-12-31 21:56:45 +01:00
Antoine de Troostembergh 834a95c503 fix formatting 2020-12-30 20:29:43 +01:00
Yannik Firre 15ee5dee05
Fix missing space after if keyword 2020-12-30 14:02:29 +01:00
troosan 20856fc102
Merge pull request #1858 from oleibman/wordcoverage 
Improve Word2007 Test Coverage
 2020-12-29 23:56:22 +01:00
troosan 7c7d7fd405
Merge pull request #1983 from FCG-Group/allow_to_use_customized_pdf_libraries 
allow to use customized pdf library
 2020-12-29 23:41:23 +01:00
troosan 31d8b547c8
Merge pull request #1992 from Adizbek/develop 
Fix image stroke in libreoffice 7.x
 2020-12-29 23:32:32 +01:00
troosan e3732ef610
Merge pull request #1907 from SailorMax/patch-2 
Allow to redefine TCPDF object
 2020-12-29 23:19:47 +01:00
troosan b2335d2b73
Merge pull request #1796 from oleibman/odtchanges 
ODT Changes
 2020-12-29 23:18:23 +01:00
Ergashev Adizbek 18e41a1c4e
Update TemplateProcessor.php 2020-12-23 16:00:06 +05:00
Ciki 1f67c993e2
Fix deprecated warning for non-hexadecimal number 
I've come across this deprecated warning when trying to save docx to pdf.. if cellBgColor is set to `auto` it should be converted back to `null` which has in practice the same functionality.
 2020-12-22 12:12:18 +01:00
emhome cc9dfb8630 add/setting page element border style. 2020-12-19 16:46:14 +08:00
SailorMax c8de86a7ec allow to use customized pdf library 2020-12-16 17:24:42 +03:00