X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=ChangeLog;h=cf678cb7ccea089f87058b06d290e18957901bc8;hb=7c5d90fb9d4de8e0b1f4b4b44c855430aed19f55;hp=bcf4cf48bfab4f6df129fa8b589b0e506f2eab7e;hpb=bb72e95a09f2b1ac33a6c5d7111e3c2f2982fd83;p=platal.git

diff --git a/ChangeLog b/ChangeLog
index bcf4cf4..cf678cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,30 @@
 ================================================================================
-VERSION 1.1.4                                                         XX XX XXXX
+VERSION 1.1.5                                                         XX XX XXXX
+
+Bug/Wish:
+
+    * Search:
+        - #1574: Correctly displays State corps                            -GLN
+
+    * XnetEvent:
+        - #1577: Fixes alternative payements given by admins               -GLN
+        - #1578: Fixes deletion of people inscriptions                     -GLN
+        - #1348: Keeps the amount paid when updating participation         -GLN
+
+From 1.1.4 branch:
+
+    * XnetEvent:
+        - #1566: Corrects the total number in events                       -GLN
+        - #1567: Payment takes into account the amount when it is given    -GLN
+
+================================================================================
+VERSION 1.1.4                                                         14 11 2011
 
 New:
 
     * Newsletter:
         - Displays number of subscribers without any valid redirection     -JAC
+        - Provides statistics about subscribers                            -JAC
 
     * Search:
         - Switches autocomplete to jQuery UI                               -JAC
@@ -23,22 +43,27 @@ Bug/Wish:
     * Email:
         - #1529: Stores and uses preferences for sending emails from site  -JAC
         - #1516: Enables @polytechnique.edu adresses for old promotions    -GLN
+        - #1549: Updates aliases and MLs on new redirection addition       -JAC
 
     * Lists:
         - #1543: Displays no member in directory view for empty lists      -JAC
+        - #1555: Ensures an email is given only once in mass subscription  -JAC
 
     * Newsletter:
         - #1509: Adds a Reply-To field for newsletters                     -GLN
         - #1526: Shows user filter used after sending                      -GLN
+        - #1538: Improves display in main NL administration page       -FUL/JAC
 
     * Payments:
         - #1512: Allows payments for unlogged users                        -JAC
         - #1537: Replaces payments page on main site by a donation page    -JAC
 
     * Profile:
+        - #1289: Links binet to their xnet page if any on profiles         -FUL
         - #1381: Adds levels to medals                                     -JAC
         - #1446: Adds field for sports and hobbies                         -JAC
         - #1535: Moves and displays skills with mentoring informations     -JAC
+        - #1554: Allows admins to modify unregisterd users' ref birthdate  -JAC
 
     * Search:
         - #1284: If a country is chosen, only proposes its cities          -JAC
@@ -46,6 +71,12 @@ Bug/Wish:
     * XnetGrp:
         - #1525: Fixes broken page on erroneous group page edition         -JAC
         - #1530: Enables reminder for xnet accounts                        -JAC
+        - #1558: Allows (un)subscription to be notified not to all admins  -JAC
+
+From 1.1.3 branch:
+
+    * Profile:
+        - #1545: Fixes link to profiles on IE7                             -FRU
 
 ================================================================================
 VERSION 1.1.3                                                         10 09 2011