X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=ChangeLog;h=26e5f8e0ab45d7ff81e83cecedd5f5f71113ea28;hb=f3bfd6c9a14b70736b9416a1892d7548e160880b;hp=f48b63cdce45e5a24143d4aef8dc9b75e68ddc10;hpb=24758809f6a48523c76e8cf25488fa32fa7b848f;p=platal.git

diff --git a/ChangeLog b/ChangeLog
index f48b63c..26e5f8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,29 @@
 ================================================================================
 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
+        - #1035: Bases emails on users types (eg educationnal types)       -JAC
+        - #1404: Implements best_domain                                    -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 +31,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,8 +57,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
-        - #1389: Do not require validation for private names modifications -JAC
-        - #1401: Main addresses are displayed before secondary addresses   -JAC
 
     * Register:
         - #1374: Adapts registration for master and doctorate              -JAC
@@ -48,9 +68,6 @@ Bug/Wish:
     * XnetEvent:
         - #1373: Fixes acceptance of non member in xnet events.            -JAC
 
-    * XnetGrp:
-        - #907: Adds more info about groups (address, phones, positions)   -JAC
-
 ================================================================================
 VERSION 1.0.1                                                         26 10 2010