221 Commits

Author SHA1 Message Date
Eric Lapouyade
90e6dc12c3 Add {%tc } tags for dynamic table columns v0.3.4 2017-02-07 09:58:31 +01:00
Eric Lapouyade
35df392f79 Remove version limitation over sphinx package in setup.py v0.3.2 v0.3.3 2017-01-31 09:26:14 +01:00
Eric Lapouyade
6e1b8b72cf Add PNG & JPEG in tests/test_files/ v0.3.1 2017-01-16 09:44:24 +01:00
Eric Lapouyade
86b1c49991 Add InlineImage class to add images into generated doc without using subdoc v0.3.0 2017-01-15 11:48:00 +01:00
Eric Lapouyade
4989ff6297 working on inline image... 2017-01-14 19:42:23 +01:00
Eric Lapouyade
e80f5c3fd1 add {% colspan %} tag, doc and test files v0.2.5 2017-01-14 17:39:23 +01:00
Eric Lapouyade
eb5830839d Merge pull request #60 from majkls23/master
add possibility to manage colspan cell property
2017-01-14 17:12:27 +01:00
majkls23
cdf1eb622c Example script for using colspan
This script uses changing colspan attribute for generation of table with dynamic column count depending on input data.
2017-01-13 13:23:04 +01:00
majkls23
44c129c5c7 Example for changing colspan property
Added example for changing colspan propery. Uses count filter for counting columns and then adjust the colspan value of top cell
2017-01-13 13:20:45 +01:00
majkls23
a92a219595 add possibility to manage colspan cell property
Added colspan subroutine to patch_xml(). Usage is like tag bgcolor in template, however parameter is number representing colspan
2017-01-13 09:50:20 +01:00
Eric Lapouyade
670471eb52 Merge pull request #57 from maerteijn/fix-sphinx-dependency
Install sphinx with pip install -e .[docs] from now on
2017-01-08 21:39:15 +01:00
Martijn Jacobs
1406462cf0 Install sphinx with pip install -e .[docs] from now on
Removed the sphinx dependency as we don't need it when installing the package.
2017-01-08 21:15:41 +01:00
Eric Lapouyade
47feece958 v0.2.4 v0.2.4 2016-11-30 09:12:36 +01:00
Eric Lapouyade
3e37fa795a py3 support merged 2016-11-30 09:07:01 +01:00
Eric Lapouyade
b56d474287 py3 support 2016-11-30 09:04:54 +01:00
Eric Lapouyade
5fb424405b v0.2.3 v0.2.3 2016-11-30 08:51:44 +01:00
Eric Lapouyade
59daded708 Merge pull request #54 from Ezequieltbh/patchBugEnter
Fix bug with \n in RichText.
2016-11-29 18:27:18 +01:00
EzequielTBH
803c3b332f Fix bug with enter in RichText.
The character (\n) is not escaped correctly, which causes that the line
break does not appear in any office version.
(Open office, Libre office or Microsoft office)
2016-11-29 12:49:12 -03:00
Eric Lapouyade
053bbdfdef Merge pull request #47 from nostalgiaz/master
Supporting py3
2016-08-09 17:08:12 +02:00
Mattia Larentis
548230732e supporting py3... 2016-08-09 16:47:35 +02:00
Mattia Larentis
ec7a93718f supporting py3... 2016-08-09 16:42:47 +02:00
Eric Lapouyade
fde82ef51f fix typo 2016-07-19 10:33:07 +02:00
Eric Lapouyade
4e024bef06 add utf-8 support in header/footer -> docxtpl 0.2.2 v0.2.2 2016-07-19 10:23:12 +02:00
Eric Lapouyade
12316e94d7 Autodetect header/footer encoding 2016-07-13 16:38:40 +02:00
Eric Lapouyade
4088bc4ab0 Version 0.2.1 2016-06-11 19:28:27 +00:00
Eric Lapouyade
686c519bf1 Fix bug in RichText, add new paragraph for \a,
add escape example, update doc
2016-04-09 11:35:16 +02:00
Eric Lapouyade
e3efb07d09 Merge pull request #37 from MrLeeh/patch-1
Update index.rst
2016-04-07 11:22:52 +02:00
Stefan Lehmann
03c73a22c9 Update index.rst
Fixed some small spelling issues
2016-04-07 09:41:35 +02:00
Eric Lapouyade
424af11f34 Add nested_for.py test 2016-03-26 16:53:11 +01:00
Eric Lapouyade
f333486577 fix typo 2016-03-17 14:06:15 +01:00
Eric Lapouyade
41baec8d2e Add header and footer support v0.2.0 2016-03-17 09:38:50 +01:00
Eric Lapouyade
f599a5d3ee fix '>' '<' in jinja tags 2016-03-01 15:26:53 +01:00
Eric Lapouyade
d9ee9620e5 version 0.1.10 2016-02-12 14:23:47 +01:00
Eric Lapouyade
f446c47a0e Add jinja_env render option 2016-02-11 15:09:55 +01:00
Eric Lapouyade
4501b1d842 Merge pull request #17 from Azelphur/patch-1
Fix inbalanced quotes
2016-01-25 21:33:22 +01:00
Alfie Day
4c9eb5e7d8 Fix inbalanced quotes
This bugged me. I had to fix it.
2016-01-25 19:19:35 +00:00
Eric Lapouyade
e7a9291723 better subdoc management : accept tables v0.1.9 2016-01-18 11:12:38 +01:00
Eric Lapouyade
755b7ae050 update .gitignore 2015-11-09 22:08:07 +01:00
Eric Lapouyade
0cd92de98c Update index.rst 2015-11-09 18:20:33 +01:00
Eric Lapouyade
97f421f2e7 add 'import re' in setup.py 2015-11-05 11:04:19 +01:00
Eric Lapouyade
67fd432dbd better xml code cleaning around Jinja2 tags 2015-11-05 09:30:23 +01:00
elapouya
630dfe996f Try a fix ... 2015-11-04 17:59:29 +01:00
Eric Lapouyade
0e83e0f9b3 Merge pull request #8 from jarretraim/master
Fix spelling mistake
2015-10-26 09:32:03 +01:00
Jarret Raim
d1b70f369c Fix spelling mistake
Examples not exemples.
2015-10-25 21:17:38 -05:00
Eric Lapouyade
57af466a29 version 0.1.7 2015-09-09 19:21:44 +02:00
Eric Lapouyade
c3f7369964 Merge pull request #4 from robert-malai/master
Port to Python 3
2015-09-09 18:48:02 +02:00
roba
f5831ecb46 Port to Python 3 2015-09-09 18:28:23 +03:00
Eric Lapouyade
8f472222d7 version 0.1.6 2015-07-17 09:56:34 +02:00
Eric Lapouyade
fcb7e9b960 Merge pull request #3 from jfdesrochers/master
Remove temp file in render_xml
2015-07-17 09:29:03 +02:00
Eric Lapouyade
fd6d5a17ed rm .settings from index 3 2015-07-16 10:49:12 +02:00