Merge branch 'branch-1.1'

Conflicts: core/context_processors.py
fgaudin · May 9, 2011 · 24f4345 · 24f4345
2 parents 5dd70c9 + ed48474
commit 24f4345
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/core/context_processors.py b/core/context_processors.py
@@ -6,4 +6,3 @@ def common(request=None):
             'version': '1.2',
             'GOOGLE_API_KEY': settings.GOOGLE_API_KEY,
             'demo_mode': settings.DEMO}
-
diff --git a/core/views.py b/core/views.py
@@ -452,7 +452,7 @@ def paypal_ipn(request):
     data = dict(request.POST.items())
     args = {'cmd': '_notify-validate'}
     args.update(data)
-    params = urllib.urlencode(args)
+    params = urllib.urlencode(dict([k, v.encode('utf-8')] for k, v in args.items()))
     paypal_response = urllib2.urlopen(settings.PAYPAL_URL + '/cgi-bin/webscr', params).read()
 
     # process the payment

diff --git a/templates/changelog.html b/templates/changelog.html
@@ -14,6 +14,14 @@
   </head>
 
   <body style="margin:10px">
+      <h1>Version 1.1.4</h1>
+    <ul>
+        <li>Correction d'un bug dans le paiement paypal</li>
+    </ul>
+      <h1>Version 1.1.3</h1>
+    <ul>
+        <li>Correction d'une régression sur l'export pdf en présence d'accent</li>
+    </ul>
     <h1>Version 1.1.2</h1>
     <ul>
         <li>Correction d'une régression sur le bloc d'annonce</li>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,3 @@ def common(request=None):
		'version': '1.2',
		'GOOGLE_API_KEY': settings.GOOGLE_API_KEY,
		'demo_mode': settings.DEMO}