Commit Graph

  • 4ea5d5fdaa Cast to string, import cgi -> html elapouya 2018-10-05 14:24:05 +02:00
  • b987864c3f Declare package as python2 and python3 compatible elapouya 2018-09-19 09:47:00 +02:00
  • a3b3fdfa18 Add sub/superscript in RichText v0.5.4 elapouya 2018-09-19 09:42:48 +02:00
  • fe9a34ebbd
    Merge pull request #145 from jsve/add-subscript-and-superscript-to-list-of-styling-props v0.5.3 Eric Lapouyade 2018-09-19 08:31:47 +02:00
  • 01b2f2e397 added props for sub and super Johan Svensson 2018-09-18 21:22:10 +02:00
  • b84b52e97e v0.5.2 Eric Lapouyade 2018-09-13 09:45:34 +02:00
  • 0c02520b6d
    Merge pull request #142 from nickgashkov/fix/vmerge-w-t-attributes v0.5.2 Eric Lapouyade 2018-09-12 17:14:31 +02:00
  • 98ad7eebf7 Fix '{% vm %}' tag for table cells with XML attributes Nick Gashkov 2018-09-12 12:14:56 +03:00
  • 4b0b1da2eb
    Merge pull request #141 from nickgashkov/fix/six-print Eric Lapouyade 2018-09-11 15:44:37 +02:00
  • d6bfc8be79 Fix test incompatibility with Python 3 versions Nick Gashkov 2018-09-11 16:08:19 +03:00
  • f807749be5 Fix table vertical merge elapouya 2018-09-05 16:31:38 +02:00
  • aa903ac99f Testing new cell vertical merge v0.5.1 elapouya 2018-09-03 10:35:20 +02:00
  • ba1d4458ed
    Merge pull request #140 from nickgashkov/fix/vmerge-nested Eric Lapouyade 2018-09-03 10:20:14 +02:00
  • 5ae0dbbf29 Fix broken tables caused by vertical merge inside complex nested tables Nick Gashkov 2018-08-31 18:57:54 +03:00
  • 7f994dc107 Use 'six' in template_error.py test elapouya 2018-08-07 10:51:19 +02:00
  • cb6971009f
    Merge pull request #135 from jhpyle/error-context Eric Lapouyade 2018-08-07 10:19:57 +02:00
  • 0a3627d23a Added test script for TemplateError trapping Jonathan Pyle 2018-08-06 22:04:00 -04:00
  • 23fbe8c048 Add Hyperlink in RichText elapouya 2018-08-03 15:26:56 +02:00
  • c9afd31320
    Merge pull request #134 from jhpyle/error-context Eric Lapouyade 2018-08-03 11:26:21 +02:00
  • 3b221fb0c6 add docx file context to TemplateError exceptions Jonathan Pyle 2018-08-02 14:30:00 -04:00
  • 5456b1cfad Subdocument can now be based on an existing docx Eric Lapouyade 2018-06-21 15:10:11 +02:00
  • 76345f454f
    Merge pull request #124 from isaacsucn/master 0.4.13 Eric Lapouyade 2018-06-21 12:16:40 +02:00
  • 871dd85d49 Inset exist document as subdocument isaacsucn 2018-06-21 17:57:42 +08:00
  • 95ffebb3fe Add font option in RichText Eric Lapouyade 2018-06-07 16:42:12 +02:00
  • 86350034bb
    Merge pull request #123 from f1remind/master v0.4.12 Eric Lapouyade 2018-06-07 15:53:59 +02:00
  • 8453ad58de Fixed Typo Jan-Niklas Nowak 2018-06-06 15:26:16 +02:00
  • 197807d272 Experimental font option for RichText objects Jan-Niklas Nowak 2018-06-06 14:31:28 +02:00
  • a3c15b226e Fix runtests.py v0.4.11 elapouya 2018-05-16 14:03:37 +02:00
  • 7437268425 Better tabs and spaces management for MS Word 2016 elapouya 2018-05-16 13:56:50 +02:00
  • f2e76d0e61 Add jinja2 tags test file Eric Lapouyade 2018-05-15 18:21:20 +02:00
  • aa9889fc26 Manage autoscaping on InlineImage, Richtext and Subdoc Eric Lapouyade 2018-05-08 14:20:43 +02:00
  • ee9cfd1d3e Purge MANIFEST.in file Eric Lapouyade 2018-04-20 18:35:14 +02:00
  • fc9eb4733f Accept variables starting with 'r' in {{}} when no space after {{ v0.4.8 Eric Lapouyade 2018-02-03 10:58:33 +01:00
  • 03703cb84a
    Merge pull request #100 from anselal/patch-1 v0.4.7 Eric Lapouyade 2017-12-20 15:28:36 +01:00
  • f6bbbcf52a
    Fix minor typo Anastasios Selalmazidis 2017-12-20 12:07:31 +02:00
  • 57fbf33ff5 Remove debug traces v0.4.6 elapouya 2017-10-16 08:19:15 +02:00
  • 3d96e6e5f1 Add {% vm %} to merge cell vertically within a loop 0.4.6 Eric Lapouyade 2017-10-15 16:29:41 +02:00
  • 41671a0363 Merge pull request #93 from Arthaslixin/master v0.4.5 Eric Lapouyade 2017-10-15 11:41:18 +02:00
  • e35f8858f9 del .DS_Store Arthas 2017-10-15 11:01:59 +08:00
  • 10dba16ce9 recover order.py Arthas 2017-10-15 10:57:58 +08:00
  • 52df98c914 recover order.py&doc and create vertical_merge.py&doc Arthas 2017-10-15 10:52:56 +08:00
  • 0903bf42fc use six.iteritems() instead of iteritems for python 3 compatibility elapouya 2017-10-13 10:04:48 +02:00
  • 992b52f223 Fixed Bug #95 on replace_pic() method v0.4.4 elapouya 2017-10-13 09:47:25 +02:00
  • a7348b2dfb modify testfiles for virtical merge Arthas 2017-10-10 00:09:00 +08:00
  • 2a7630a80b add {% vm %} to make the table cell virtically merged within a {% for %} Arthas 2017-10-09 23:18:25 +08:00
  • 12f759cb8e Merge pull request #92 from rgusmero/master v0.4.3 Eric Lapouyade 2017-10-06 08:15:50 +02:00
  • 399d8d995c Pass a file-like object to replace_pic Riccardo Gusmeroli 2017-10-06 08:05:02 +02:00
  • a322097223 Merge pull request #1 from elapouya/master Riccardo Gusmeroli 2017-10-06 08:03:28 +02:00
  • b94fad8232 Add replace_pic() method to replace pictures from its filename (Thanks to Riccardo Gusmeroli) Eric Lapouyade 2017-10-05 18:01:36 +02:00
  • 625e2c5968 Revert "New method for image replacement" revert-91-master Eric Lapouyade 2017-10-05 16:53:54 +02:00
  • 997c9e3168 Merge pull request #91 from rgusmero/master v0.4.2 Eric Lapouyade 2017-10-05 16:53:29 +02:00
  • d1452e5a8b Comments fix Riccardo Gusmeroli 2017-10-05 12:39:09 +02:00
  • c7425832b0 New image replacement function Riccardo Gusmeroli 2017-10-05 12:32:07 +02:00
  • c0e50b47e0 Improve image attachment for InlineImage ojects Eric Lapouyade 2017-09-10 12:41:15 +02:00
  • 7e168168a6 Merge pull request #88 from hugokernel/defer-image-attachment v0.4.1 Eric Lapouyade 2017-09-10 12:33:31 +02:00
  • b2295a7d4b Merge branch 'master' into defer-image-attachment Eric Lapouyade 2017-09-10 12:33:18 +02:00
  • be149b367d - Add replace_embedded() method (useful for embedding docx) - Add replace_media() method (useful for header/footer images) v0.4.0.1 Eric Lapouyade 2017-09-09 12:28:22 +02:00
  • 35cac9c937 Defer image attachment hugokernel 2017-09-08 11:51:30 +02:00
  • b7947ca10c Add replace_medias() utility (useful for header/footer images) Eric Lapouyade 2017-09-03 20:36:31 +02:00
  • a4fa1b4f26 Fix exception in fix_table() v0.4.0 Eric Lapouyade 2017-06-27 16:38:40 +02:00
  • dac4425a1f Fix bug when using more than one {{r }} or {%r %} in the same run v0.3.9 Eric Lapouyade 2017-06-21 00:15:43 +02:00
  • 00db8d49c8 Better head/footer jinja2 handling& Eric Lapouyade 2017-06-13 08:55:05 +02:00
  • fcbfdfc484 Better head/footer jinja2 handling& v0.3.7 Eric Lapouyade 2017-06-10 11:03:30 +02:00
  • 6f89e33d4f Update tests hugokernel 2017-06-09 10:08:21 +02:00
  • 546dc55077 Remove useless code hugokernel 2017-06-09 10:07:25 +02:00
  • 878197a93c Force header / footer nodes format. hugokernel 2017-06-09 10:06:33 +02:00
  • 1e6523d464 Put xml to string code in a new independent method hugokernel 2017-06-09 10:05:52 +02:00
  • c35a4ed676 Fix bug where one is using '%' (modulo operator) inside a tag v0.3.6 Eric Lapouyade 2017-02-20 09:12:54 +01:00
  • 84062c0c28 Add Listing class to manage \n and \a (new paragraph) and escape text AND keep current styling v0.3.5 Eric Lapouyade 2017-02-14 11:20:46 +01:00
  • 90e6dc12c3 Add {%tc } tags for dynamic table columns v0.3.4 Eric Lapouyade 2017-02-07 09:58:31 +01:00
  • 35df392f79 Remove version limitation over sphinx package in setup.py v0.3.3 v0.3.2 Eric Lapouyade 2017-01-31 09:26:14 +01:00
  • 6e1b8b72cf Add PNG & JPEG in tests/test_files/ v0.3.1 Eric Lapouyade 2017-01-16 09:44:24 +01:00
  • 86b1c49991 Add InlineImage class to add images into generated doc without using subdoc v0.3.0 Eric Lapouyade 2017-01-15 11:48:00 +01:00
  • 4989ff6297 working on inline image... Eric Lapouyade 2017-01-14 19:42:23 +01:00
  • e80f5c3fd1 add {% colspan %} tag, doc and test files v0.2.5 Eric Lapouyade 2017-01-14 17:39:23 +01:00
  • eb5830839d Merge pull request #60 from majkls23/master Eric Lapouyade 2017-01-14 17:12:27 +01:00
  • cdf1eb622c Example script for using colspan majkls23 2017-01-13 13:23:04 +01:00
  • 44c129c5c7 Example for changing colspan property majkls23 2017-01-13 13:20:45 +01:00
  • a92a219595 add possibility to manage colspan cell property majkls23 2017-01-13 09:50:20 +01:00
  • 670471eb52 Merge pull request #57 from maerteijn/fix-sphinx-dependency Eric Lapouyade 2017-01-08 21:39:15 +01:00
  • 1406462cf0 Install sphinx with pip install -e .[docs] from now on Martijn Jacobs 2017-01-08 21:15:41 +01:00
  • 47feece958 v0.2.4 v0.2.4 Eric Lapouyade 2016-11-30 09:12:36 +01:00
  • 3e37fa795a py3 support merged Eric Lapouyade 2016-11-30 09:07:01 +01:00
  • b56d474287 py3 support Eric Lapouyade 2016-11-30 09:04:54 +01:00
  • 5fb424405b v0.2.3 v0.2.3 Eric Lapouyade 2016-11-30 08:51:44 +01:00
  • 59daded708 Merge pull request #54 from Ezequieltbh/patchBugEnter Eric Lapouyade 2016-11-29 18:27:18 +01:00
  • 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) EzequielTBH 2016-11-29 12:49:12 -03:00
  • 053bbdfdef Merge pull request #47 from nostalgiaz/master Eric Lapouyade 2016-08-09 17:08:12 +02:00
  • 548230732e supporting py3... Mattia Larentis 2016-08-09 16:47:35 +02:00
  • ec7a93718f supporting py3... Mattia Larentis 2016-08-09 16:42:47 +02:00
  • fde82ef51f fix typo Eric Lapouyade 2016-07-19 10:33:07 +02:00
  • 4e024bef06 add utf-8 support in header/footer -> docxtpl 0.2.2 v0.2.2 Eric Lapouyade 2016-07-19 10:23:12 +02:00
  • 12316e94d7 Autodetect header/footer encoding Eric Lapouyade 2016-07-13 16:38:40 +02:00
  • 4088bc4ab0 Version 0.2.1 Eric Lapouyade 2016-06-11 19:28:27 +00:00
  • 686c519bf1 Fix bug in RichText, add new paragraph for \a, add escape example, update doc Eric Lapouyade 2016-04-09 11:35:16 +02:00
  • e3efb07d09 Merge pull request #37 from MrLeeh/patch-1 Eric Lapouyade 2016-04-07 11:22:52 +02:00
  • 03c73a22c9 Update index.rst Stefan Lehmann 2016-04-07 09:41:35 +02:00
  • 424af11f34 Add nested_for.py test Eric Lapouyade 2016-03-26 16:53:11 +01:00
  • f333486577 fix typo Eric Lapouyade 2016-03-17 14:06:15 +01:00
  • 41baec8d2e Add header and footer support v0.2.0 Eric Lapouyade 2016-03-17 09:38:50 +01:00