Backport

[platal.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 6ac127a..ad5f8d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,12 +19,15 @@ New:
     * Core:
         - Work hard to add nice URI's into Platal.                          -MC
         - Use fancy icons from http://www.famfamfam.com/ for flags.         -MC
+        - Merge htdocs/htdocs.net using apache tricks, share more code.     -MC
+        - Remove seldome used files in plugins/ and do explicit registers.  -MC
 
     * Emails:
         - Switch to the new URI scheme.                                     -MC
 
     * Events:
-        - Switch to the new URI scheme.                                     -MC
+        - Switch to the new URI scheme.                                 -MC/FRU
+        - Rework Events administration interface.                          -FRU
 
     * Geoloc:
         - Switch to the new URI scheme.                                 -MC/Car
@@ -87,6 +90,7 @@ Bug/Wish:
 
     * Core:
         - #371: Users can send bugs directly to plat/al tracker.           -Car
+
     * Emails:
         - #426: Add an identification header in mails.                     -FRU
 
@@ -99,9 +103,9 @@ Bug/Wish:
         - #422: Parasitic strings in vcard.                                -FRU
 
     * Xnet:
-        - #426: Add an identification header in mails.                     -FRU
-        - #384: Substitution of non-X's names in mail from web interface.  -FRU
         - #380: Add sex for non-X.                                         -FRU
+        - #384: Substitution of non-X's names in mail from web interface.  -FRU
+        - #426: Add an identification header in mails.                     -FRU
         - #439: Move doc to the wiki                                   -Car/FRU
 
 From 0.9.10 Branch: