From df3cb623a79d925e6af048bc88e607094c6b692e Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Fri, 27 Oct 2017 09:38:50 +0200 Subject: Ajout de l’url pour avoir un calendrier correspondant seulement à un groupe. --- urls.py | 1 + 1 file changed, 1 insertion(+) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 58cf019..d269400 100644 --- a/urls.py +++ b/urls.py @@ -23,6 +23,7 @@ urlpatterns = [ url(r"^(?P[-\w]+)/(?P[-\w]+)/$", views.group_list, name="groups"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/$", views.timetable, name="timetable"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendar.ics$", feeds.IcalFeed(), name="ics"), + url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendar-group.ics$", feeds.IcalOnlyOneFeed(), name="ics-group"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/feed.atom$", feeds.AtomFeed(), name="atom"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/feed.rss$", feeds.RSSFeed(), name="rss"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/(?P[0-9]{4})/(?P[0-4]?[0-9]|5[0-3])/$", views.timetable, name="timetable"), -- cgit v1.2.1 From 7ef57a0226fa25b8ea5e9a6ff5526889dc300649 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Fri, 27 Oct 2017 21:51:12 +0200 Subject: Ajout d’une page pour lister les calendriers disponibles --- urls.py | 1 + 1 file changed, 1 insertion(+) (limited to 'urls.py') diff --git a/urls.py b/urls.py index d269400..b30e8d9 100644 --- a/urls.py +++ b/urls.py @@ -22,6 +22,7 @@ urlpatterns = [ url(r"^(?P[-\w]+)/$", views.mention_list, name="mentions"), url(r"^(?P[-\w]+)/(?P[-\w]+)/$", views.group_list, name="groups"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/$", views.timetable, name="timetable"), + url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendars$", views.calendar_list, name="calendar-list"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendar.ics$", feeds.IcalFeed(), name="ics"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendar-group.ics$", feeds.IcalOnlyOneFeed(), name="ics-group"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/feed.atom$", feeds.AtomFeed(), name="atom"), -- cgit v1.2.1 From f0790a2420684a39e2b48922beec1245f4446912 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sun, 29 Oct 2017 15:17:03 +0100 Subject: Revert "Ajout d’une page pour lister les calendriers disponibles" This reverts commit 7ef57a0226fa25b8ea5e9a6ff5526889dc300649. --- urls.py | 1 - 1 file changed, 1 deletion(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index b30e8d9..d269400 100644 --- a/urls.py +++ b/urls.py @@ -22,7 +22,6 @@ urlpatterns = [ url(r"^(?P[-\w]+)/$", views.mention_list, name="mentions"), url(r"^(?P[-\w]+)/(?P[-\w]+)/$", views.group_list, name="groups"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/$", views.timetable, name="timetable"), - url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendars$", views.calendar_list, name="calendar-list"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendar.ics$", feeds.IcalFeed(), name="ics"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendar-group.ics$", feeds.IcalOnlyOneFeed(), name="ics-group"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/feed.atom$", feeds.AtomFeed(), name="atom"), -- cgit v1.2.1 From c80a41ffafe3065f35f07b71063b5596d33d0ff2 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sun, 29 Oct 2017 15:37:43 +0100 Subject: Déplacement de tous les liens vers les ICS dans une page spéciale --- urls.py | 1 + 1 file changed, 1 insertion(+) (limited to 'urls.py') diff --git a/urls.py b/urls.py index d269400..c84ac75 100644 --- a/urls.py +++ b/urls.py @@ -22,6 +22,7 @@ urlpatterns = [ url(r"^(?P[-\w]+)/$", views.mention_list, name="mentions"), url(r"^(?P[-\w]+)/(?P[-\w]+)/$", views.group_list, name="groups"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/$", views.timetable, name="timetable"), + url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendars", views.calendars, name="calendars"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendar.ics$", feeds.IcalFeed(), name="ics"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/calendar-group.ics$", feeds.IcalOnlyOneFeed(), name="ics-group"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/feed.atom$", feeds.AtomFeed(), name="atom"), -- cgit v1.2.1 From eed022ccf449a4cfceb39c28bb41741bc490d343 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Mon, 30 Oct 2017 18:23:43 +0100 Subject: Ajout d’une URL pour les flatpages --- urls.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index c84ac75..1f686e4 100644 --- a/urls.py +++ b/urls.py @@ -13,11 +13,12 @@ # You should have received a copy of the GNU Affero General Public License # along with celcatsanitizer. If not, see . -from django.conf.urls import url +from django.conf.urls import include, url from . import feeds, views urlpatterns = [ url(r"^$", views.index, name="index"), + url(r"^pages/", include("django.contrib.flatpages.urls")), url(r"^contact$", views.contact, name="contact"), url(r"^(?P[-\w]+)/$", views.mention_list, name="mentions"), url(r"^(?P[-\w]+)/(?P[-\w]+)/$", views.group_list, name="groups"), -- cgit v1.2.1 From 55ad46fe32ce8122d884dda4eb498e20e39622ad Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Tue, 31 Oct 2017 12:38:34 +0100 Subject: Suppression de l’ancienne page de contact --- urls.py | 1 - 1 file changed, 1 deletion(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 1f686e4..487994e 100644 --- a/urls.py +++ b/urls.py @@ -19,7 +19,6 @@ from . import feeds, views urlpatterns = [ url(r"^$", views.index, name="index"), url(r"^pages/", include("django.contrib.flatpages.urls")), - url(r"^contact$", views.contact, name="contact"), url(r"^(?P[-\w]+)/$", views.mention_list, name="mentions"), url(r"^(?P[-\w]+)/(?P[-\w]+)/$", views.group_list, name="groups"), url(r"^(?P[-\w]+)/(?P[-\w]+)/(?P[-\w]+)/$", views.timetable, name="timetable"), -- cgit v1.2.1