Merge branch 'master' into template_history_view

Conflicts:
	requirements.txt
This commit is contained in:
Rebecca Law
2016-05-13 17:30:33 +01:00
10 changed files with 133 additions and 104 deletions

View File

@@ -81,7 +81,7 @@
{{ item.to }}
</p>
<p class="hint">
<a href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.template.id) }}">{{ item.template.name }}</a>
<a href="{{ url_for('.view_template_version', service_id=current_service.id, template_id=item.template.id, version=item.template_version) }}">{{ item.template.name }}</a>
sent from
{% if item.job %}
<a href="{{ url_for(".view_job", service_id=current_service.id, job_id=item.job.id) }}">{{ item.job.original_file_name }}</a>