X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=ChangeLog;h=8fb93763816f5aa7621ebfee6651be0e349740f6;hb=2b6704a9e6c438094b633c1049ac0eb1d383a681;hp=ff999384f2be3780e6e30dae225fb8a103504d8a;hpb=5291f7585d6ed846e924538615846d9e1305fd9a;p=platal.git

diff --git a/ChangeLog b/ChangeLog
index ff99938..8fb9376 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,54 @@
 ================================================================================
-VERSION 1.1.0                                                         XX XX XXXX
+VERSION 1.1.1                                                         XX XX XXXX
+
+Bug/Wish:
+
+    * Emails:
+        - #1459: Lists and administrates aliases on main domain            -JAC
+
+From 1.1.0 branch:
+
+    * Search:
+        - #1449: Load json2 on IE because IE<=7 do not implement JSON      -FRU
+
+================================================================================
+VERSION 1.1.0                                                         26 03 2011
+
+New:
+
+    * Search:
+        - Add suggestions on quicksearch box                               -FRU
 
 Bug/Wish:
 
     * Admin:
+        - #1042: Implements a url-shortener                                -JAC
+        - #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
+
+    * Newsletter:
+        - #664: Adds tool to search in nl archives                         -JAC
+        - #908: Displays remaining lines and characters in submission      -JAC
+        - #1393: Logs main nl events (create, delete, validate, cancel)    -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
 
+    * Xnet:
+        - Accounts for xnet only users                                     -JAC
+
     * XnetGrp:
         - #907: Adds more info about groups (address, phones, positions)   -JAC