Merge scodoc/master into main96

version 9.6.964
Assiduité : signal_assiduites_diff : plage depuis args url closes #741
2024-04-26 09:07:43 +02:00 · 2024-04-24 20:58:02 +02:00 · 2024-04-24 20:55:21 +02:00 · 2024-04-24 20:55:21 +02:00 · 2024-04-24 20:55:21 +02:00 · 2024-04-24 20:55:21 +02:00
4 changed files with 4 additions and 4 deletions
--- a/app/templates/error_access_denied.j2
+++ b/app/templates/error_access_denied.j2
@ -6,7 +6,7 @@

 <h2>Accès non autorisé</h2>

-{{ exc | safe }}
+{{ exc }}

 <p class="footer">
    {% if g.scodoc_dept %}
--- a/app/templates/sco_value_error.j2
+++ b/app/templates/sco_value_error.j2
@ -5,7 +5,7 @@

 <h2>Erreur !</h2>

-{{ exc | safe }}
+{{ exc }}

 <div style="margin-top: 16px;">
    {% if g.scodoc_dept %}
--- a/sco_version.py
+++ b/sco_version.py
@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-

-SCOVERSION = "9.6.963"
+SCOVERSION = "9.6.964"

 SCONAME = "ScoDoc"

--- a/tools/build_release.sh
+++ b/tools/build_release.sh
@ -96,7 +96,7 @@ mkdir -p "$optdir" || die "mkdir failure for $optdir"
 archive="$FACTORY_DIR"/"$PACKAGE_NAME-$RELEASE_TAG".tar.gz
 echo "Downloading $GIT_RELEASE_URL ..."
 # curl -o "$archive" "$GIT_RELEASE_URL" || die "curl failure for $GIT_RELEASE_URL"
-#wget --progress=dot -O  "$archive" "$GIT_RELEASE_URL" || die "wget failure for $GIT_RELEASE_URL"
+wget --progress=dot -O  "$archive" "$GIT_RELEASE_URL" || die "wget failure for $GIT_RELEASE_URL"
 # -nv

 # On décomprime
Author	SHA1	Message	Date
Iziram	6dcc4611cc	Merge scodoc/master into main96	2024-04-26 09:07:43 +02:00
Emmanuel Viennet	18b1f00586	version 9.6.964	2024-04-24 20:58:02 +02:00
Iziram	6b985620e9	Assiduité : signal_assiduites_diff : plage depuis args url closes #741	2024-04-24 20:55:21 +02:00
Iziram	4d234ba353	Assiduité : désactiver saisie présence closes #793	2024-04-24 20:55:21 +02:00
Iziram	5d45fcf656	Assiduité : signal_assiduites_group : bug fix suppr assi autre	2024-04-24 20:55:21 +02:00
Iziram	0a5919b788	Assiduité : pseudo-fix (catch + http error) #872	2024-04-24 20:55:21 +02:00
Iziram	09f4525e66	Assiduité : maj couleurs minitimeline + legende	2024-04-24 20:55:21 +02:00
Emmanuel Viennet	0bc57807de	release build script using gitea again	2024-04-24 20:37:03 +02:00
Emmanuel Viennet	87aaf12d27	Protect against Reflected XSS on home page (and other exception-handling pages)	2024-04-23 18:28:00 +02:00