a4b6b843ad
Merge pull request #40 from gavroche/master
...
PR40 - Added support for Composer, Images Wrapping, Unit Testing and started re-writing code to be PSR-2 compliant
2013-12-16 04:14:06 -08:00
d09f0958c6
Fixed some merge issues
2013-12-16 06:40:30 -05:00
39e4dd2259
Merge branch 'master' of https://github.com/PHPOffice/PHPWord
...
Conflicts:
.gitignore
Classes/PHPWord.php
Classes/PHPWord/Section.php
Classes/PHPWord/Section/Footer.php
Classes/PHPWord/Section/Header.php
Classes/PHPWord/Section/Table/Cell.php
Classes/PHPWord/Section/TextRun.php
Classes/PHPWord/Shared/String.php
Classes/PHPWord/Style/Cell.php
Classes/PHPWord/Style/Paragraph.php
Classes/PHPWord/Template.php
Classes/PHPWord/Writer/Word2007.php
Classes/PHPWord/Writer/Word2007/Base.php
Classes/PHPWord/Writer/Word2007/Document.php
Examples/AdvancedTable.php
Examples/BasicTable.php
Examples/HeaderFooter.php
Examples/Link.php
Examples/ListItem.php
Examples/Object.php
Examples/Section.php
Examples/Template.php
Examples/Textrun.php
Examples/TitleTOC.php
Examples/Watermark.php
Examples/_earth.JPG
Examples/_mars.jpg
Examples/_sheet.xls
changelog.txt
samples/old/AdvancedTable.php
samples/old/BasicTable.php
samples/old/Image.php
samples/old/Link.php
samples/old/ListItem.php
samples/old/Object.php
samples/old/Section.php
samples/old/Template.php
samples/old/Textrun.php
samples/old/TitleTOC.php
samples/old/Watermark.php
samples/old/_earth.jpg
samples/old/_mars.jpg
samples/old/_sheet.xls
src/Examples/AdvancedTable.php
src/Examples/BasicTable.php
src/Examples/Link.php
src/Examples/ListItem.php
src/Examples/Object.php
src/Examples/Section.php
src/Examples/Template.php
src/Examples/Textrun.php
src/Examples/TitleTOC.php
src/Examples/Watermark.php
src/Examples/_earth.JPG
src/Examples/_mars.jpg
src/Examples/_sheet.xls
2013-12-15 14:15:28 -05:00
fa7de9c977
Word2007 : Support Multiple headers
2013-12-15 15:54:09 +01:00
72977545bd
Merge pull request #42 from RLovelett/multiple-headers
...
Support Multiple headers
2013-12-15 06:55:03 -08:00
4fb18005ce
Sections can support multiple headers
...
Each section can now have a single header (previous behavior). It can
now also support multiple headers. The spec defines three types of
headers: default, first, and even. These code changes provide support
for all three.
The HeaderFooter.php example has also been updated to illustrate how to
use the new multiple headers for a section.
Used these pages as spec reference:
http://www.schemacentral.com/sc/ooxml/e-w_headerReference-1.html
http://www.schemacentral.com/sc/ooxml/a-w_type-4.html
2013-12-15 09:49:02 -05:00
95f16cc3a5
Temporary files naming logic in PHPWord_Template can lead to a collision (GH-38)
2013-12-15 14:58:44 +01:00
9557dd9da8
FIXED : "Warning: Invalid error type specified in ...\PHPWord.php on line 226" is thrown when the specified template file is not found GH-32
2013-12-15 14:50:08 +01:00
049c89d079
IMPROVED : Advanced string replace in setValue for Template
2013-12-15 14:46:05 +01:00
38a15e5da5
Word2007 : Support for tab stops
2013-12-15 14:35:18 +01:00
a610c34a18
Word2007 : Add rowspan and colspan to cells
2013-12-15 13:42:36 +01:00
0d19d57cba
IMPROVED : Moved examples out of Classes directory
2013-12-15 13:35:17 +01:00
1b849ec1bb
Added PHPWord_Exception and exception when could not copy the template
2013-12-15 13:18:07 +01:00
5d6bb15825
ADDED : Changelog
2013-12-15 13:11:28 +01:00
3c78edd9f4
IMPROVED : Test if text is UTF-8 before converting
2013-12-15 12:56:40 +01:00
6b2511e34e
Merge develop
2013-12-15 12:36:34 +01:00
e345d862b7
Merge pull request #37 from RomanSyroeshko/PHPWord#34
...
PHPWord_Shared_String.IsUTF8 returns FALSE for Cyrillic UTF-8 input
2013-12-15 03:17:48 -08:00
5c6319f15b
Now only define PHPWORD_BASE_PATH once
2013-12-13 09:07:50 -05:00
b6a5bf21b8
Merge branch 'refs/heads/develop'
...
Conflicts:
.travis.yml
composer.json
src/PHPWord/Writer/Word2007/Base.php
2013-12-13 06:45:37 -05:00
1e50dc0c4b
CI via Travis
2013-12-13 11:39:03 +01:00
3f098ba901
Support de Composer
2013-12-13 11:38:22 +01:00
ea81f578b3
Support de Composer
2013-12-13 11:36:36 +01:00
be1e357b83
Changed version number
2013-12-11 19:57:36 -05:00
dd5e20e7e5
Moved image example to README.md
2013-12-11 16:17:53 -05:00
d8ea62c50e
Added test for image wrapping behind
2013-12-11 16:09:58 -05:00
822ffc19af
Fixed bug with autoloader
2013-12-11 15:34:07 -05:00
50a9ab52b0
Added Unit Tests and fixed bugs with Autoloader
2013-12-11 15:08:54 -05:00
fa77c4f159
Added wrapping style to images
2013-12-11 14:51:35 -05:00
b6c33c8931
Formatted PHP code toward PSR-2 compliance
2013-12-11 14:45:44 -05:00
3f7ed20a28
Moved examples outside of the source
2013-12-11 14:41:54 -05:00
8c4efdd607
Added support for composer
2013-12-11 14:39:43 -05:00
5e90c066e8
https://github.com/PHPOffice/PHPWord/issues/34
...
PHPWord_Shared_String.IsUTF8 returns FALSE for Cyrillic UTF-8 input
2013-11-08 04:40:18 -08:00
f58524b262
Merge pull request #11 from deds/pindent
...
add indentation support to paragraphs
2013-01-12 13:23:16 -08:00
30a7a178e2
add indentation support to paragraphs
2012-10-17 23:48:59 +08:00
1257b461b6
Add superscript/subscript styling in Excel2007 Writer
2012-10-02 07:45:14 +01:00
ad47f3997c
Merge pull request #7 from SergeC/patch-1
...
Update src/PHPWord/Template.php
2012-09-08 03:43:28 -07:00
db59063352
Merge pull request #3 from jlocashio/master
...
Added alphanumeric list type
2012-09-08 03:41:55 -07:00
9d6b2ff7bd
Update src/PHPWord/Template.php
...
This function returns array of all variables in template.
Test code:
$PHPWord = new PHPWord();
$document = $PHPWord->loadTemplate('Template.docx');
var_dump($document->getVariables());
2012-08-11 23:02:57 +03:00
a302fe1c37
Update master
2012-07-12 15:04:44 -07:00
4f457c99e6
Added readme and license file
2012-07-05 07:25:13 +02:00
a15a9b522b
ADDED : Writer/RTF for generating a simple file with some formatting texts and paragraphs
2012-05-30 00:07:50 +02:00
bedf584e12
CLEANED : Some spaces in code
2012-05-30 00:07:07 +02:00
869b5fd180
IMPROVED : Samples\Sample01
2012-05-30 00:06:11 +02:00
95180b502d
CHANGED : .gitignore
2012-05-30 00:05:53 +02:00
f29ce0fc4a
CHANGED : .gitignore
2012-05-30 00:05:31 +02:00
e9a6a2c4f9
IMPROVED : Writer/ODText for just generating a simple file with some formatting texts and paragraphs
2012-05-29 20:59:22 +02:00
f5da76e90a
IMPROVED : Samples\Sample01
2012-05-29 20:57:12 +02:00
de11f4d038
ADDED : .gitignore
2012-05-29 20:56:28 +02:00
cc536c4b6d
REMOVED : Files of examples
2012-05-21 21:04:19 +02:00
9e711124e9
ADDED : Writer ODText (Version de base)
2012-05-06 23:25:37 +02:00
Progi1984
Gabriel Bull
Ryan Lovelett
Roman Syroeshko
Mark Baker
Deds Castillo
Mark Baker
SergeC
jlocashio
Maarten Balliauw