Merge branch 'qrcode' into 'main'

Draft: Qrcode See merge request bde/nk20!196
Merge branch 'sda' into 'main'
2024-10-11 05:06:54 +02:00 · 2024-10-10 23:44:22 +02:00 · 2024-10-10 01:48:23 +02:00
1 changed files with 6 additions and 1 deletions
--- a/note_kfet/templates/base.html
+++ b/note_kfet/templates/base.html
@ -159,6 +159,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
    </nav>
    <div class="{% block containertype %}container{% endblock %} my-3">
 	<div id="messages">
 	    {% if user.is_authenticated %}
 		<div class="alert alert-info">
 		    Venez au festival des Sens de l'Art du 2 au 7 décembre 🐘 !
 		</div>
 	    {% endif %}
            {% if user.is_authenticated %}
                {% if not user|is_member:"BDE" %}
                    <div class="alert alert-danger">
Author	SHA1	Message	Date
Otthorn	78838b404c	Merge branch 'qrcode' into 'main' Draft: Qrcode See merge request bde/nk20!196	2024-10-11 05:06:54 +02:00
quark	7975fe47a6	Merge branch 'sda' into 'main' Donation goal la note kfet x les SdA See merge request bde/nk20!277	2024-10-10 23:44:22 +02:00
quark	476fbceeea	Donation goal la note kfet x les SdA	2024-10-10 01:48:23 +02:00