X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=ChangeLog;h=26e5f8e0ab45d7ff81e83cecedd5f5f71113ea28;hb=f3bfd6c9a14b70736b9416a1892d7548e160880b;hp=51a1b29369b77fef4b3bf06bea2a3deebbddbcd6;hpb=4294dc6c2242bd3079b7b66a854f3bc0cc31b889;p=platal.git

diff --git a/ChangeLog b/ChangeLog
index 51a1b29..26e5f8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,9 +4,15 @@ 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