X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=ChangeLog;h=20b5c779837c9ea0082a4da10babc860616dd847;hb=d4b13ec795a2056134834b8efb7e6798ad33d7aa;hp=4e44b0476fd21a34b217e6cca9d99210e44e63c4;hpb=1f61d10d19dc33d19ff34c52ecff120ac663b521;p=platal.git

diff --git a/ChangeLog b/ChangeLog
index 4e44b04..20b5c77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,27 @@
 ================================================================================
 VERSION 1.1.0                                                         XX XX XXXX
 
+Bug/Wish:
+
+    * Admin:
+        - #1315: Displays antispam level in users email admin pages        -JAC
+        - #1399: Displays all similar entreprises only on demand           -JAC
+        - #1403: Displays grade if any in medal validation process         -JAC
+
+    * Emails:
+        - Allows antispam level choice for each redirection                -JAC
+
+    * Payments:
+        - #1398: Creates csv for payments                                  -JAC
+
+    * Profile:
+        - #1324,1352: Adds jobs to vcards                                  -JAC
+        - #1380: Allows multiple entries for some medals                   -JAC
+        - #1389: Do not require validation for private names modifications -JAC
+        - #1401: Main addresses are displayed before secondary addresses   -JAC
+
+    * XnetGrp:
+        - #907: Adds more info about groups (address, phones, positions)   -JAC
 
 ================================================================================
 VERSION 1.0.2                                                         31 01 2011
@@ -8,7 +29,6 @@ VERSION 1.0.2                                                         31 01 2011
 Bug/Wish:
 
     * Admin:
-        - #1399: Displays all similar entreprises only on demand           -JAC
         - #1362: List last profile modifications for secretary             -JAC
 
     * Core:
@@ -35,7 +55,6 @@ Bug/Wish:
         - #1367: Improves postal address formatting                        -JAC
         - #1368: Allows admin profile edition even if birthdate is unknown -JAC
         - #1369: Properly displays moderated jobs                          -JAC
-        - #1401: Main addresses are displayed before secondary addresses   -JAC
 
     * Register:
         - #1374: Adapts registration for master and doctorate              -JAC