253 Commits

Author SHA1 Message Date
Eric Lapouyade
9f1cb53205
Merge pull request #203 from edufresne/master
Fix need to "Recover document" after using replace_media and saving to file-like object
v0.6.1
2019-06-05 09:06:30 +02:00
ericdufresne
fbb930d3ea Provide better support for file-like objects with replace-media 2019-06-03 11:34:16 -04:00
Eric Lapouyade
d9b5a4d2ab v0.6.0 : DocxTemplate now accepts file-like objects 2019-06-03 16:31:45 +02:00
Eric Lapouyade
d3ddb59d1c
Merge pull request #201 from edufresne/master
#200 - fix issue with reading and writing to file-like object using replace_media
v0.6.0
2019-06-03 16:02:26 +02:00
ericdufresne
a021c517f5 Issue- #200 2019-05-30 10:34:39 -04:00
Eric Lapouyade
b46f4f8ff5 fix #199 v0.5.20 2019-05-23 15:58:51 +02:00
Eric Lapouyade
53ad9eedc4
Merge pull request #199 from jfcorbett/setup-encoding
Explicitly specify utf-8 encoding when opening file in setup.py
2019-05-23 15:00:30 +02:00
JEACO
c86b1ffeb5 Explicitly specify utf-8 encoding when opening file in setup.py 2019-05-23 13:53:31 +02:00
Eric Lapouyade
5c89f43eb8 Add support for file-like objects for replace_media (#197) 2019-05-23 08:37:34 +02:00
Eric Lapouyade
e956892d61
Merge pull request #198 from edufresne/master
Issue #197 - Add support for file-like objects for replace_media
v0.5.19
2019-05-23 08:25:00 +02:00
ericdufresne
20819a7368 Fixed doc typo 2019-05-22 15:32:48 -04:00
ericdufresne
cd77712b5e Issue #197 - Add support for file-like objects for replace_media 2019-05-22 15:15:19 -04:00
Eric Lapouyade
8472d4ed55
Merge pull request #196 from mzetea/master
fixed division by zero situation
2019-05-22 17:05:24 +02:00
Mircea Zetea
a69aa8777f fixed division by zero situation 2019-05-22 17:28:13 +03:00
elapouya
7cb606e2da Fix #176 2019-05-20 09:57:03 +02:00
Eric Lapouyade
3291da7ff3
Merge pull request #177 from nickgashkov/fix/issue-176
Fix #176
v0.5.18
2019-01-24 16:07:41 +01:00
Nick Gashkov
527de6190f Fix #176 2019-01-24 16:33:54 +03:00
Eric Lapouyade
0bbe5a80b9 Delegated autoescaping to Jinja2 Environment (#175) 2019-01-20 11:23:14 +01:00
Eric Lapouyade
53be7aa768
Merge pull request #175 from mx2048/master
Delegated autoescaping to Jinja2 Environment.
v0.5.17
2019-01-20 10:55:37 +01:00
Max Podolskii
355432ccb0 Delegated autoescaping to Jinja2 Environment. 2019-01-17 14:29:26 -08:00
elapouya
12e709f80b Force to use python-docx 0.8.7 2019-01-11 15:13:11 +01:00
Eric Lapouyade
651b59fc21
Merge pull request #171 from anhphamduy/master
Getting undeclared variables in a template
v0.5.16
2019-01-11 15:00:32 +01:00
Anh Pham
01825a1fa2 Add getting undeclared variables in the template 2019-01-11 15:56:03 +11:00
Eric Lapouyade
2fad92046e Added PAGE_BREAK feature (#168) 2019-01-02 11:41:41 +01:00
Eric Lapouyade
e6b7b58c92
Merge pull request #168 from mx2048/master
Added `PAGE_BREAK` feature
v0.5.15
2019-01-02 10:35:57 +01:00
Max Podolskii
5f6a5c4d6c Added PAGE_BREAK feature: use '\f' in your text to get a manual page break rendered. 2018-12-27 22:21:46 -08:00
Eric Lapouyade
68d2fd6e84 Fixed issue #159: autoescaped values for both str and unicode. 2018-12-23 11:36:20 +01:00
Eric Lapouyade
bafdf1a310
Merge pull request #166 from mx2048/master
Fixed issue #159: autoescaped values for both str and unicode.
v0.5.14
2018-12-23 11:23:33 +01:00
Max Podolskii
758daeeaab Fixed issue #159: autoescaped values for both str and unicode. 2018-12-19 23:13:06 -08:00
Eric Lapouyade
aa088a274b Fix tables with gridSpan that have less cells after the tc forloop (#164) v0.5.12 2018-12-18 08:22:36 +01:00
Eric Lapouyade
8ffc7b80e8
Merge pull request #164 from nickgashkov/fix/less-cells-after-loop-grid-span
Fix tables with gridSpan that have less cells after the tc forloop
2018-12-18 08:09:00 +01:00
Nick Gashkov
195d6a7090 Fix tables with gridSpan that still have less cells after the tc forloop 2018-12-17 15:27:14 +03:00
Eric Lapouyade
126b2a6b37
Merge pull request #163 from elapouya/revert-162-fix/less-cells-after-loop
Revert "Fix tables that have less cells after the tc forloop"
2018-12-17 09:01:00 +01:00
Eric Lapouyade
a81c7cf31a
Revert "Fix tables that have less cells after the tc forloop" 2018-12-17 08:57:41 +01:00
Eric Lapouyade
b48b6b1b82
Merge pull request #162 from nickgashkov/fix/less-cells-after-loop
Fix tables that have less cells after the tc forloop
2018-12-17 08:45:40 +01:00
Nick Gashkov
484c2c32bc Fix 'gridSpan' of tables that have less cells after the '{%tc for%}' 2018-12-13 19:30:54 +03:00
elapouya
32e39b7b67 Update doc 2018-12-05 09:28:44 +01:00
elapouya
25825a79f1 Update doc 2018-12-05 09:24:25 +01:00
elapouya
cd89aa33aa Update doc 2018-12-05 09:14:55 +01:00
elapouya
0382ece29d Update doc 2018-12-05 09:08:41 +01:00
elapouya
77043c1a66 Update doc 2018-12-05 09:07:33 +01:00
elapouya
c15ece28c1 Smart double quotes in jinja tags are now converted into simple double quotes 2018-11-21 09:41:44 +01:00
Eric Lapouyade
e5c4c14966 - Smart quotes in jinja tags are now converted into simple quotes
- Add custom jinja filter example in tests/
- Reformat the code to be a little more PEP8 compliant
v0.5.11
2018-11-20 15:30:12 +01:00
Eric Lapouyade
20e30c541c v0.5.9 v0.5.10 2018-11-18 17:56:14 +01:00
Eric Lapouyade
b0560c87b9
Merge pull request #158 from nickgashkov/feature/horizontal-merge
Implemented horizontal merge tag
v0.5.9
2018-11-18 16:46:09 +01:00
Nick Gashkov
9aa6019d25 Add horizontal merge '{% hm %}' tag support 2018-11-16 16:44:12 +03:00
Eric Lapouyade
8b351236f7 fix #154 2018-11-08 12:20:09 +01:00
Eric Lapouyade
d73a47fc6b Merge remote-tracking branch 'origin/master' v0.5.8 2018-11-08 12:13:23 +01:00
Eric Lapouyade
01f4d16767
Merge pull request #155 from mx2048/master
Added compatibility with Python 2.7 as to the method `escape_values`.
2018-11-08 12:12:46 +01:00
Eric Lapouyade
fe7362f4d4 run tests 2018-11-08 12:11:59 +01:00