From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 9 Oct 2018 07:52:33 +0000 (+0200)
Subject: Merge branch 'master' of git.parisson.com:git/teleforma
X-Git-Tag: 1.4.1~10^2~10
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9d5c03164f160a22a1a82adf734a900063122206;p=teleforma.git

Merge branch 'master' of git.parisson.com:git/teleforma

Conflicts:
	teleforma/templates/teleforma/inc/newsitems_portlet.html
---

9d5c03164f160a22a1a82adf734a900063122206
diff --cc teleforma/templates/teleforma/inc/newsitems_portlet.html
index 5b3a247c,6f333647..4ac62f03
--- a/teleforma/templates/teleforma/inc/newsitems_portlet.html
+++ b/teleforma/templates/teleforma/inc/newsitems_portlet.html
@@@ -27,10 -27,10 +27,10 @@@
          <section>
              {% for newsitem in all_newsitems %} {% include "teleforma/inc/newsitem.html" %} {% endfor %}
          </section>
-         {% if all_newsitems|length >= 5 %}
-         <footer>
-             <a href="{% url newsitem-list period_id=period_id %}">Voir plus</a>
-         </footer>
-         {% endif %}
+ {#        {% if all_newsitems|length >= 5 %}#}
+ {#        <footer>#}
+ {#            <a href="{% url newsitem-list period_id=period_id %}">Voir plus</a>#}
+ {#        </footer>#}
+ {#        {% endif %}#}
      </div>
 -</div>
 +</div>