Skip to content

Commit

Permalink
DAStaticFiles in .docx; curly bracket .docx adjustment; Word sidebar
Browse files Browse the repository at this point in the history
  • Loading branch information
jhpyle committed Sep 18, 2018
1 parent f0b19fb commit 21a4ea1
Show file tree
Hide file tree
Showing 41 changed files with 9,104 additions and 288 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Change Log

## [0.2.97] - 2018-09-17
### Added
- Playground "Variables, etc." for the Word task pane.
### Changed
- It is no longer necessary to remove curly quotes from .docx Jinja2
code. They will be converted to straight quotes before processing.
### Fixed
- Google Maps JavaScript was loading synchronously, which slowed down
loading.
- A `choices` list could not contain a list of numeric, boolean,
or `NoneType` values.
- `DAStaticFile`s could not be inserted into .docx templates.

## [0.2.96] - 2018-09-12
### Added
- Integration between Microsoft OneDrive and the Playground.
Expand Down
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

When contributing to this repository, please first discuss the change
you wish to make via issue, email, or any other method with the owner
of this repository before making a change.
of this repository before making a change. The best way to contribute
a change is through a pull request.

## How to contribute to the documentation

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015-2017 Jonathan Pyle
Copyright (c) 2015-2018 Jonathan Pyle

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
18 changes: 18 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
## Reporting security issues

To report a security issue, email [email protected] and include the
phrase "docassemble security" in the subject line.

You will receive a response indicating the next steps in handling your
report. After the initial reply to your report, you will be kept
informed of the progress towards a fix and full announcement, and you
may be asked for additional information or guidance.

Report security bugs in third-party modules to the person or team
maintaining the module.

To learn more about ensuring security in **docassemble**, please see
the [Security] section in the [documentation].

[Security]: https://docassemble.org/docs/security.html
[documentation]: https://docassemble.org/docs.html
2 changes: 1 addition & 1 deletion docassemble_base/docassemble/base/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -2308,7 +2308,7 @@ def show(self, width=None):
if self.mimetype == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
return docassemble.base.file_docx.include_docx_template(self)
else:
return docassemble.base.file_docx.image_for_docx(self.number, docassemble.base.functions.this_thread.current_question, docassemble.base.functions.this_thread.docx_template, width=width)
return docassemble.base.file_docx.image_for_docx(docassemble.base.functions.DALocalFile(self.path()), docassemble.base.functions.this_thread.current_question, docassemble.base.functions.this_thread.docx_template, width=width)
else:
if width is not None:
return('[FILE ' + str(self.filename) + ', ' + str(width) + ']')
Expand Down
Loading

0 comments on commit 21a4ea1

Please sign in to comment.