X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=ChangeLog;h=41b5bfc7c40dd2dfd134e656ca6817c4c682f7eb;hb=784e89ec6ed8b97fa0d87066770de61e19e704dd;hp=f02824cc7ff0ccee6c1a1202b5c6f0e07219de33;hpb=ba1cbd51cd218c3a8caf6d9518df9d2367a9ae54;p=platal.git

diff --git a/ChangeLog b/ChangeLog
index f02824c..41b5bfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,47 @@
 ================================================================================
-VERSION 1.1.4                                                         XX XX XXXX
+VERSION 1.1.5                                                         XX XX XXXX
+
+Bug/Wish:
+
+    * Admin:
+        - #1604: Displays AX id on admin page                              -JAC
+
+    * Auth:
+        - #1608: Displays proper url in auth-group-x login                 -JAC
+
+    * Search:
+        - #1572: Removes remaining results count from queries              -JAC
+        - #1574: Correctly displays State corps                            -GLN
+
+    * Validations:
+        - #1571: Fixes the opening of the comments panel                   -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
+        - #1603: Fixes Xnet events edition for users without profile       -JAC
+
+    * XnetGrp:
+        - #1609: Adds link to account on Xnet account validation           -JAC
+
+    * XnetNl:
+        - #1606: Fixes Xnet NL deletion                                    -JAC
+
+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
@@ -39,6 +76,7 @@ Bug/Wish:
         - #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
@@ -50,6 +88,7 @@ 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: