hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into elastic-indexer

Browse Source 
Conflicts:
	composer.lock
	www/scripts/apps/admin/main/app.js
This commit is contained in:
Mathieu Darse
2015-03-10 15:25:20 +01:00
parent 38224cfae1 42a21e8e7d
commit 63eaaf1596
92 changed files with 27708 additions and 28968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/common/macros.html.twig
View File

@@ -97,7 +97,7 @@
{% macro caption_field(field, bounceable, extra_classes) %}
<div class="desc {{ extra_classes|join(' ') }}">
<b>{{ field.label }}</b> :
<b>{{ field.label_name }}</b> :
{{ _self.caption_value(field, bounceable|default(true))|highlight|linkify }}
</div>
{% endmacro %}