Merge branch '3.8'

Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
This commit is contained in:
Romain Neutron
2013-11-08 19:04:26 +01:00
68 changed files with 250 additions and 158 deletions

View File

@@ -347,10 +347,10 @@
<option value="{{ ord }}">{{ ord_name }}</option>
{% endfor %}
</select>
{% if app['phraseanet.SE'].hasStemming() %}
{% if app['phraseanet.SE'].hasStemming() and app['phraseanet.SE'].isStemmingEnabled() %}
<div>
<label class="checkbox">
<input type="checkbox" {% if app['phraseanet.SE'].isStemmingEnabled() %} checked="checked" {% endif %} name="stemme" /> {% trans 'rechercher par stemme' %}
<input type="checkbox" checked="checked" name="stemme" /> {% trans 'rechercher par stemme' %}
</label>
</div>
{% endif %}