From: Stéphane Jacob <jacou@melix.net>
Date: Tue, 16 Dec 2008 15:45:40 +0000 (+0100)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~344^2~67
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=f4035298fd421e87b9a58f6a801b53da348613de;p=platal.git

Merge commit 'origin/master' into fusionax
---

f4035298fd421e87b9a58f6a801b53da348613de
diff --cc ChangeLog
index 778ee12,c8a6109..6248cdf
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,20 -1,17 +1,31 @@@
  ================================================================================
 +VERSION 0.f.0                                                         XX XX XXXX
 +
 +New:
 +    * Core:
 +        - Centralises email management through an email combobox           -JAC
 +
 +Bug/Wish:
 +    * Profile:
 +        - #188: Adds informations about the Corps d'État                   -JAC
 +        - #209: Thoroughly changes education's implementation              -JAC
 +        - #386: Adds the possibility to fill in multiple nationalities     -JAC
 +        - #891: Improves education display                                 -JAC
 +
 +================================================================================
  VERSION 0.10.1                                                        XX XX XXXX
  
+ From 0.10.0 branch:
+ 
+     * Auth:
+         - Fix use of deprecated PlLogger in password recovery              -JAC
+ 
+     * Lists:
+         - #942: Fix missing MLs in ML listing                              -FRU
+         - #943: Fix adding member to a list                                -FRU
+ 
+     * Profile:
+         - Fix malformed query leading to error when adding an address      -FRU
  
  ================================================================================
  VERSION 0.10.0                                                        11 12 2008