X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=ChangeLog;h=62fb6e1332124617848a71ab097bb3d467c245bf;hb=b80cbf0db8e7ac7e11ea2bb49bbf3efd79f4fadf;hp=4b6ad77754e075e2cbb438155718a97684f06258;hpb=b18348d854ec999c08d2cc431df871b9b4062b18;p=platal.git

diff --git a/ChangeLog b/ChangeLog
index 4b6ad77..62fb6e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,40 @@
 ================================================================================
+VERSION 1.1.0                                                         XX XX XXXX
+
+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:
+        - #1211: Adds login page for xnet users                            -JAC
+
+    * XnetGrp:
+        - #907: Adds more info about groups (address, phones, positions)   -JAC
+
+================================================================================
 VERSION 1.0.2                                                         31 01 2011
 
 Bug/Wish: