# HG changeset patch
# User souliane <souliane@mailoo.org>
# Date 1421526985 -3600
# Node ID 2fdbf8ebb72b0d2e9c77ddd74bc63b3b41290a34
# Parent  9bab976241dc921e94de266344be48fd0a3850b2
upgrade to Django 1.7.3

diff -r 9bab976241dc -r 2fdbf8ebb72b README
--- a/README	Thu Jul 24 12:30:08 2014 +0200
+++ b/README	Sat Jan 17 21:36:25 2015 +0100
@@ -1,5 +1,6 @@
 Salut à Toi's website
 (c) Jérôme Poisson aka Goffi 2012
+(c) Adrien Cossa aka Souliane 2015
 
 ** LICENCE **
 
@@ -28,7 +29,7 @@
 ** ABOUT **
 
 This is the source code of Salut à Toi's presentation website.
-Salut à Toi is a communication software base on XMPP. You can have more informations on http://sat.goffi.org (the website ran by this code).
+Salut à Toi is a communication software base on XMPP. You can have more informations on http://salut-a-toi.org (the website ran by this code).
 
 ** SETTINGS **
 
@@ -38,6 +39,8 @@
 	SAT_DL_PREFIX = 'ftp://ftp.goffi.org/sat' #this prefix will be joined to the filename pointed by the previous link
 	SAT_DL_PATH = 'ftp://ftp.goffi.org/sat/sat.tar.bz2' #if set, this link will be used instead of the joined dl_prefix + filename
 
+Note that the Django application "markdown_deux" ( https://github.com/trentm/django-markdown-deux ) is required.
+
 ** CREDIT **
 
 The following third party project are shipped with this source code:
diff -r 9bab976241dc -r 2fdbf8ebb72b sat_website/urls.py
--- a/sat_website/urls.py	Thu Jul 24 12:30:08 2014 +0200
+++ b/sat_website/urls.py	Sat Jan 17 21:36:25 2015 +0100
@@ -24,5 +24,6 @@
 
 urlpatterns = patterns('sat_website.views',
     url(r'^(?P<category>\w*)(.html)?$', 'generic_cat'),
+    (r'^i18n/', include('django.conf.urls.i18n')),
 )
 
diff -r 9bab976241dc -r 2fdbf8ebb72b templates/sat_website/social_contract.html
--- a/templates/sat_website/social_contract.html	Thu Jul 24 12:30:08 2014 +0200
+++ b/templates/sat_website/social_contract.html	Sat Jan 17 21:36:25 2015 +0100
@@ -22,7 +22,7 @@
 
 {% load i18n %}
 {% load staticfiles %}
-{% load markup %}
+{% load markdown_deux_tags %}
 {% block headline %}{% trans "Salut à Toi's social contract" %}{% endblock %}
 {% block main_container %}
 <div class="row">