Commit Graph

  • 01fd27df11 Update doc Eric Lapouyade 2020-04-29 14:41:27 +02:00
  • 581717e5ee Fix #271 v0.9.2 Eric Lapouyade 2020-04-26 10:50:40 +02:00
  • aba8c6bb7b Fix #271 Eric Lapouyade 2020-04-24 16:15:32 +02:00
  • a9ebb9d78d Fix codestyling Eric Lapouyade 2020-04-17 10:47:48 +02:00
  • 9175f0cbd6 Fix codestyling according to flake8 rules Edwin Smulders 2020-04-16 22:51:59 +02:00
  • 45a46eb924 Add a Github action for codestyling Edwin Smulders 2020-04-16 13:57:11 +02:00
  • ccdf20a121 v0.9.0 Eric Lapouyade 2020-04-15 15:11:47 +02:00
  • 97be69b950 {%- xxx -%} merging feature v0.9.0 Eric Lapouyade 2020-04-14 22:51:36 +02:00
  • ccac13390a fix #266 Eric Lapouyade 2020-04-14 10:35:58 +02:00
  • 2b75638aa8 v0.8.0 v0.8.1 Eric Lapouyade 2020-04-10 11:27:23 +02:00
  • cba0521d55 Merge branch 'Dutchy--master' v0.8.0 Eric Lapouyade 2020-04-10 11:21:33 +02:00
  • e8bc36c57e Make headers and footers work with both python-docx 0.8.7 and 0.8.10 - attempt 2 Edwin Smulders 2020-04-09 17:41:25 +02:00
  • 888dd085f6 v0.7.0 Eric Lapouyade 2020-04-09 16:01:45 +02:00
  • dc571cfaf7
    Merge pull request #263 from Dutchy-/master v0.7.0 Eric Lapouyade 2020-04-09 14:29:18 +02:00
  • 227abbbb54
    Merge pull request #262 from komawar/minor-ref-fix Eric Lapouyade 2020-04-09 14:29:02 +02:00
  • 444f862efa Add replace_zipname() Eric Lapouyade 2020-04-09 14:26:22 +02:00
  • 17a2c6e1fe Make headers and footers work with both python-docx 0.8.7 and 0.8.10 Edwin Smulders 2020-04-08 16:48:43 +02:00
  • 4efd49c8f2 Reference RichText section Nikhil Komawar 2020-04-08 11:11:18 +05:30
  • 114e5149bc
    Merge pull request #260 from komawar/fix-documentation-grammar v0.6.9 Eric Lapouyade 2020-04-06 16:14:01 +02:00
  • b65d04750e Fix grammar in index.rst Nikhil Komawar 2020-04-06 11:34:54 +05:30
  • 72a9be558a v0.6.4 Eric Lapouyade 2020-04-06 07:06:41 +02:00
  • dd588034e9
    Merge pull request #258 from awesomo4000/fix-lxml-parse v0.6.4 Eric Lapouyade 2020-04-06 06:59:31 +02:00
  • a7c5531f20 Prevent lxml from attempting to parse None Aaron Rhodes 2020-03-30 17:50:07 -04:00
  • 4fe1cc507d
    Merge pull request #236 from mneitsabes/master Eric Lapouyade 2019-11-09 20:41:21 +01:00
  • 9a4dd4e28c Adds the ability to add a RichText object to another RichText object Sébastien MAUROY 2019-11-09 12:14:24 +01:00
  • 74fbb615bb PR #207 and #209 Eric Lapouyade 2019-06-20 16:25:03 +02:00
  • e3bf22376a
    Merge pull request #207 from edufresne/master v0.6.3 Eric Lapouyade 2019-06-17 16:26:10 +02:00
  • 1f80377013
    Merge pull request #209 from vesatoivonen/issue-208 Eric Lapouyade 2019-06-17 16:25:19 +02:00
  • 1bba2f92b7 Keep undeclared_template_variables as a property Vesa Toivonen 2019-06-17 11:07:14 +03:00
  • b01f033d14 Allow jinja environment to be passed to undeclared_template_variables Vesa Toivonen 2019-06-12 10:54:57 +03:00
  • b3094f660a Truncate zip file before re-writing it. This prevents a misplaced zip file table of contents which can cause Microsoft word to go into recovery mode for a newly generated document. ericdufresne 2019-06-11 10:03:53 -04:00
  • 671c7c78a7 Handle spaces correctly when run are split by Jinja code (#205) Eric Lapouyade 2019-06-09 12:38:22 +02:00
  • 68fb31ec22
    Merge pull request #205 from toloco/fix-spacing v0.6.2 Eric Lapouyade 2019-06-09 12:31:28 +02:00
  • 28ed545e85 Bump version Tolo Palmer 2019-06-07 11:16:38 +01:00
  • 333a046180 Handle spaces correctly when run are split by Jinja code Tolo Palmer 2019-06-07 11:04:34 +01:00
  • ab7adb5d21 v0.6.0 : DocxTemplate now accepts file-like objects Eric Lapouyade 2019-06-05 09:44:35 +02:00
  • 9f1cb53205
    Merge pull request #203 from edufresne/master v0.6.1 Eric Lapouyade 2019-06-05 09:06:30 +02:00
  • fbb930d3ea Provide better support for file-like objects with replace-media ericdufresne 2019-06-03 11:34:16 -04:00
  • d9b5a4d2ab v0.6.0 : DocxTemplate now accepts file-like objects Eric Lapouyade 2019-06-03 16:31:45 +02:00
  • d3ddb59d1c
    Merge pull request #201 from edufresne/master v0.6.0 Eric Lapouyade 2019-06-03 16:02:26 +02:00
  • a021c517f5 Issue- #200 ericdufresne 2019-05-30 10:23:51 -04:00
  • b46f4f8ff5 fix #199 v0.5.20 Eric Lapouyade 2019-05-23 15:58:51 +02:00
  • 53ad9eedc4
    Merge pull request #199 from jfcorbett/setup-encoding Eric Lapouyade 2019-05-23 15:00:30 +02:00
  • c86b1ffeb5 Explicitly specify utf-8 encoding when opening file in setup.py JEACO 2019-05-23 13:53:31 +02:00
  • 5c89f43eb8 Add support for file-like objects for replace_media (#197) Eric Lapouyade 2019-05-23 08:37:34 +02:00
  • e956892d61
    Merge pull request #198 from edufresne/master v0.5.19 Eric Lapouyade 2019-05-23 08:25:00 +02:00
  • 20819a7368 Fixed doc typo ericdufresne 2019-05-22 15:32:48 -04:00
  • cd77712b5e Issue #197 - Add support for file-like objects for replace_media ericdufresne 2019-05-22 15:15:19 -04:00
  • 8472d4ed55
    Merge pull request #196 from mzetea/master Eric Lapouyade 2019-05-22 17:05:24 +02:00
  • a69aa8777f fixed division by zero situation Mircea Zetea 2019-05-22 17:28:13 +03:00
  • 7cb606e2da Fix #176 elapouya 2019-05-20 09:57:03 +02:00
  • 3291da7ff3
    Merge pull request #177 from nickgashkov/fix/issue-176 v0.5.18 Eric Lapouyade 2019-01-24 16:07:41 +01:00
  • 527de6190f Fix #176 Nick Gashkov 2019-01-24 16:33:54 +03:00
  • 0bbe5a80b9 Delegated autoescaping to Jinja2 Environment (#175) Eric Lapouyade 2019-01-20 11:23:14 +01:00
  • 53be7aa768
    Merge pull request #175 from mx2048/master v0.5.17 Eric Lapouyade 2019-01-20 10:55:37 +01:00
  • 355432ccb0 Delegated autoescaping to Jinja2 Environment. Max Podolskii 2019-01-17 14:29:26 -08:00
  • 12e709f80b Force to use python-docx 0.8.7 elapouya 2019-01-11 15:13:11 +01:00
  • 651b59fc21
    Merge pull request #171 from anhphamduy/master v0.5.16 Eric Lapouyade 2019-01-11 15:00:32 +01:00
  • 01825a1fa2 Add getting undeclared variables in the template Anh Pham 2019-01-11 15:56:03 +11:00
  • 2fad92046e Added PAGE_BREAK feature (#168) Eric Lapouyade 2019-01-02 11:41:41 +01:00
  • e6b7b58c92
    Merge pull request #168 from mx2048/master v0.5.15 Eric Lapouyade 2019-01-02 10:35:57 +01:00
  • 5f6a5c4d6c Added PAGE_BREAK feature: use '\f' in your text to get a manual page break rendered. Max Podolskii 2018-12-27 22:21:46 -08:00
  • 68d2fd6e84 Fixed issue #159: autoescaped values for both str and unicode. Eric Lapouyade 2018-12-23 11:36:20 +01:00
  • bafdf1a310
    Merge pull request #166 from mx2048/master v0.5.14 Eric Lapouyade 2018-12-23 11:23:33 +01:00
  • 758daeeaab Fixed issue #159: autoescaped values for both str and unicode. Max Podolskii 2018-12-19 23:13:06 -08:00
  • aa088a274b Fix tables with gridSpan that have less cells after the tc forloop (#164) v0.5.12 Eric Lapouyade 2018-12-18 08:22:36 +01:00
  • 8ffc7b80e8
    Merge pull request #164 from nickgashkov/fix/less-cells-after-loop-grid-span Eric Lapouyade 2018-12-18 08:09:00 +01:00
  • 195d6a7090 Fix tables with gridSpan that still have less cells after the tc forloop Nick Gashkov 2018-12-17 15:27:14 +03:00
  • 126b2a6b37
    Merge pull request #163 from elapouya/revert-162-fix/less-cells-after-loop Eric Lapouyade 2018-12-17 09:01:00 +01:00
  • a81c7cf31a
    Revert "Fix tables that have less cells after the tc forloop" revert-162-fix/less-cells-after-loop Eric Lapouyade 2018-12-17 08:57:41 +01:00
  • b48b6b1b82
    Merge pull request #162 from nickgashkov/fix/less-cells-after-loop Eric Lapouyade 2018-12-17 08:45:40 +01:00
  • 484c2c32bc Fix 'gridSpan' of tables that have less cells after the '{%tc for%}' Nick Gashkov 2018-12-13 19:30:54 +03:00
  • 32e39b7b67 Update doc elapouya 2018-12-05 09:28:44 +01:00
  • 25825a79f1 Update doc elapouya 2018-12-05 09:24:25 +01:00
  • cd89aa33aa Update doc elapouya 2018-12-05 09:14:55 +01:00
  • 0382ece29d Update doc elapouya 2018-12-05 09:08:41 +01:00
  • 77043c1a66 Update doc elapouya 2018-12-05 09:07:33 +01:00
  • c15ece28c1 Smart double quotes in jinja tags are now converted into simple double quotes elapouya 2018-11-21 09:41:44 +01:00
  • 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 Eric Lapouyade 2018-11-20 15:30:12 +01:00
  • 20e30c541c v0.5.9 v0.5.10 Eric Lapouyade 2018-11-18 17:56:14 +01:00
  • b0560c87b9
    Merge pull request #158 from nickgashkov/feature/horizontal-merge v0.5.9 Eric Lapouyade 2018-11-18 16:46:09 +01:00
  • 9aa6019d25 Add horizontal merge '{% hm %}' tag support Nick Gashkov 2018-11-16 16:44:12 +03:00
  • 8b351236f7 fix #154 Eric Lapouyade 2018-11-08 12:20:09 +01:00
  • d73a47fc6b Merge remote-tracking branch 'origin/master' v0.5.8 Eric Lapouyade 2018-11-08 12:13:23 +01:00
  • 01f4d16767
    Merge pull request #155 from mx2048/master Eric Lapouyade 2018-11-08 12:12:46 +01:00
  • fe7362f4d4 run tests Eric Lapouyade 2018-11-08 12:11:59 +01:00
  • be2e9942bc run rests Eric Lapouyade 2018-11-08 12:07:24 +01:00
  • 4564fed0b3 Added compatibility with Python 2.7 as to the method escape_values. Max P 2018-11-07 17:38:57 -08:00
  • d5335cb36f Removed import sys and corresponding code. Max P 2018-11-07 17:17:24 -08:00
  • 5ac9c5f2c6 Imported escape and unescape methods for Python 2.7 Max P 2018-11-07 17:14:39 -08:00
  • 2420a560e3 Fixed SyntaxError connected with nonlocal Python3-specific keyword. Max P 2018-11-07 17:09:04 -08:00
  • bc9820e7cf Render can now autoescape context dict elapouya 2018-11-07 16:56:25 +01:00
  • 69f8320fd4
    Merge pull request #153 from mx2048/master v0.5.7 Eric Lapouyade 2018-11-07 16:31:17 +01:00
  • 8dc7cc7de3 Added reminder for the test files. Max P 2018-11-05 18:31:16 -08:00
  • 7e72603441 Added test files for the auto escape. Max P 2018-11-05 18:29:33 -08:00
  • 40bf39cde7 Added method escape_values. Exclusively for Python3. Max P 2018-11-05 18:17:43 -08:00
  • 5ee43cf3e1 Imported unescape. Max P 2018-11-05 17:36:05 -08:00
  • c04483e4d5 v0.5.6 - Fix #152 Eric Lapouyade 2018-10-18 10:07:28 +02:00
  • 344fe8215d
    Merge pull request #152 from devgt/master Eric Lapouyade 2018-10-16 15:54:51 +02:00
  • 0c2b27584d Fix invalid xml Vuong Quoc Binh 2018-10-16 15:13:25 +07:00