Merge branch 'Fix_time_zone_calendar.ics' into 'main'

Update views.py - Fix calendar.ics See merge request bde/nk20!237
Merge branch 'prez-perm' into 'main'
2025-02-24 09:01:18 +00:00 · 2024-03-22 16:19:51 +01:00 · 2024-03-22 12:56:09 +01:00 · 2024-03-22 12:27:08 +01:00 · 2024-03-11 10:25:48 +01:00
2 changed files with 4 additions and 3 deletions
--- a/apps/activity/views.py
+++ b/apps/activity/views.py
@ -315,8 +315,8 @@ X-WR-CALNAME:Kfet Calendar
 NAME:Kfet Calendar
 CALSCALE:GREGORIAN
 BEGIN:VTIMEZONE
-TZID:Europe/Berlin
+TZID:Europe/Paris
-X-LIC-LOCATION:Europe/Berlin
+X-LIC-LOCATION:Europe/Paris
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@ -3228,7 +3228,8 @@
 			"name": "Pr\u00e9sident\u00b7e de club",
 			"permissions": [
 				62,
-				142
+				142,
 				135
 			]
 		}
 	},
Author	SHA1	Message	Date
charliep	76e3b608c1	Merge branch 'Fix_time_zone_calendar.ics' into 'main' Update views.py - Fix calendar.ics See merge request bde/nk20!237	2024-03-22 16:19:51 +01:00
mcngnt	50f98fd5ad	Merge branch 'prez-perm' into 'main' changed permission for club president See merge request bde/nk20!242	2024-03-22 12:56:09 +01:00
mcngnt	402e19d1ce	changed permission for club president	2024-03-22 12:27:08 +01:00
charliep	6c61daf1c5	Update views.py Passage à la time zone Europe/Paris	2024-03-11 10:25:48 +01:00