Merge branch 'master' into develop

This commit is contained in:
Nabin Hait 2018-03-13 16:12:09 +05:30
commit 06d816e12b
2 changed files with 5 additions and 3 deletions

View file

@ -15,7 +15,7 @@ from past.builtins import cmp
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
__version__ = '10.1.4'
__version__ = '10.1.5'
__title__ = "Frappe Framework"
local = Local()

View file

@ -13,12 +13,14 @@
<span class="likes-count">{{ (_liked_by.length > 99 ? "99+" : _liked_by.length) || "" }}</span>
</span>
{% } %}
{% var anchor_title = (_full_title).replace(/["]/g, "&\quot;"); %}
<a class="grey list-id {{ css_seen }} ellipsis"
data-name="{{ _name }}"
href="#Form/{{ _doctype_encoded }}/{{ _name_encoded }}"
title="{{ _full_title }}">{{ strip_html(_title) }}</a>
title="{{ anchor_title }}">{{ strip_html(_title) }}</a>
{% if (_workflow && !_without_workflow) { %}
<span class="label label-{{ _workflow.style }} filterable"
data-filter="{{ _workflow.fieldname }},=,{{ _workflow.value }}">
{%= _workflow.value %}</span>
{% } %}
{% } %}