Merge branch 'nix-shell' into 'main'

Nix shell See merge request bde/nk20!201
Merge branch 'new_logo' into 'main'
2024-12-02 21:26:53 +00:00 · 2024-06-04 03:46:25 +02:00 · 2024-06-03 22:00:03 +02:00 · 2024-06-03 21:59:44 +02:00 · 2024-06-03 21:53:01 +02:00 · 2024-05-30 20:21:56 +02:00
10 changed files with 30 additions and 21 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -8,19 +8,19 @@ variables:
  GIT_SUBMODULE_STRATEGY: recursive

 # Debian Buster
-py37-django22:
-  stage: test
-  image: debian:buster-backports
-  before_script:
-    - >
-        apt-get update &&
-        apt-get install --no-install-recommends -t buster-backports -y
-        python3-django python3-django-crispy-forms
-        python3-django-extensions python3-django-filters python3-django-polymorphic
-        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
-        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
-        python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py37-django22
+#  py37-django22:
+#   stage: test
+#   image: debian:buster-backports
+#   before_script:
+#     - >
+#         apt-get update &&
+#         apt-get install --no-install-recommends -t buster-backports -y
+#         python3-django python3-django-crispy-forms
+#         python3-django-extensions python3-django-filters python3-django-polymorphic
+#         python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
+#         python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
+#         python3-bs4 python3-setuptools tox texlive-xetex
+#   script: tox -e py37-django22

 # Ubuntu 20.04
 py38-django22:
@ -56,7 +56,7 @@ py39-django22:

 linters:
  stage: quality-assurance
-  image: debian:buster-backports
+  image: debian:bullseye
  before_script:
    - apt-get update && apt-get install -y tox
  script: tox -e linters
--- a/apps/activity/templates/activity/activity_form.html
+++ b/apps/activity/templates/activity/activity_form.html
@ -17,6 +17,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
    </form>
  </div>
 </div>
+{% endblock %}
+
+{% block extrajavascript %}
 <script>
  var date_end = document.getElementById("id_date_end");
  var date_start = document.getElementById("id_date_start");
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@ -3388,6 +3388,10 @@ msgstr "Support technique"
 msgid "FAQ (FR)"
 msgstr "FAQ (FR)"

+#: note_kfet/templates/base.html:200
+msgid "Charte Info (FR)"
+msgstr "Charte Info (FR)"
+
 #: note_kfet/templates/base_search.html:15
 msgid "Search by attribute such as name…"
 msgstr "Chercher par un attribut tel que le nom …"
--- a/note_kfet/fixtures/initial.json
+++ b/note_kfet/fixtures/initial.json
@ -4,7 +4,7 @@
        "pk": 1,
        "fields": {
            "domain": "note.crans.org",
-            "name": "La Note Kfet \ud83c\udf7b"
+            "name": "La Note Kfet 🍪"
        }
    }
 ]
--- a/note_kfet/templates/base.html
+++ b/note_kfet/templates/base.html
@ -194,6 +194,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
                           class="text-muted">{% trans "Contact us" %}</a> &mdash;
                        <a href="mailto:{{ "SUPPORT_EMAIL" | getenv }}"
                           class="text-muted">{% trans "Technical Support" %}</a> &mdash;
+                        <a href="https://perso.crans.org/club-bde/charte_informatique.pdf"
+                           class="text-muted">{% trans "Charte Info (FR)" %}</a> &mdash;
                        <a href="https://note.crans.org/doc/faq/"
                           class="text-muted">{% trans "FAQ (FR)" %}</a> &mdash;
                    </span>
Author	SHA1	Message	Date
aeltheos	432ecb008d	Merge branch 'nix-shell' into 'main' Nix shell See merge request bde/nk20!201	2024-06-04 03:46:25 +02:00
korenstin	201d6b114a	Merge branch 'new_logo' into 'main' New logo See merge request bde/nk20!247	2024-06-03 22:00:03 +02:00
korenstin	19e77df299	Merge branch 'main' into 'new_logo' # Conflicts: # .gitlab-ci.yml	2024-06-03 21:59:44 +02:00
korenstin	5fd6ec5668	Merge branch 'charte_info' into 'main' Charte info See merge request bde/nk20!248	2024-06-03 21:53:01 +02:00
korenstin	10a01c5bc2	linters	2024-05-30 20:21:56 +02:00
korenstin	989905ea64	Update .gitlab-ci.yml	2024-05-26 18:41:49 +02:00
korenstin	0218d43a17	Update .gitlab-ci.yml	2024-05-26 16:00:26 +02:00
test	5d30b0e819	charte info	2024-05-26 15:46:50 +02:00
korenstin	ec759dd3c0	error py37-django22	2024-05-23 22:38:09 +02:00
korenstin	2eb965291d	new_logo	2024-05-23 21:46:01 +02:00