From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Fri, 14 Nov 2008 20:07:29 +0000 (+0100)
Subject: Merge commit 'origin/master' into fusionax
X-Git-Tag: xorg/1.0.0~332^2~498
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=065cd7ed086ef7806f294f92e675f16232704d6a;p=platal.git

Merge commit 'origin/master' into fusionax

Conflicts:

	ChangeLog
	htdocs/xorg.php
	templates/profile/general.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

065cd7ed086ef7806f294f92e675f16232704d6a
diff --cc ChangeLog
index 03744cf,c55d219..bbfbc4c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,26 -1,26 +1,40 @@@
  ================================================================================
 +VERSION 0.f.0                                                         XX XX XXXX
 +
 +New:
 +    * Core:
 +        - Centralises email management through an email combobox           -JAC
 +
 +Bug/Wish:
 +    * Profile:
 +        - #188: Adds informations about the Corps d'État                   -JAC
 +        - #209: Thoroughly changes education's implementation              -JAC
 +        - #386: Adds the possibility to fill in multiple nationalities     -JAC
 +        - #891: Improves education display                                 -JAC
 +
 +================================================================================
- VERSION 0.9.18                                                        XX XX XXXX
+ VERSION 0.10.0                                                        XX XX XXXX
  
  New:
+ 
      * Core:
+         - Move plat/al engine in a separated library                       -FRU
          - Introduction of 'hruid' as a replacement for 'forlife'           -VZA
  
+     * Newsletter:
+         - Tool to process bounces                                          -mYk
+ 
+     * OpenId:
+         - OpenId provider                                                  -mYk
+ 
  Bug/Wish:
  
+     * Admin:
+         - #912: Fix error when validating an 'alread-validated' request    -FRU
+ 
+     * Core:
+         - #918: Use POST for wiki preview                                  -FRU
+ 
      * Search:
          - #691: Adds search on postcode and thus on "arrondissements"      -JAC
          - #791: Adds the possibility to do an exact search                 -JAC
diff --cc htdocs/xorg.php
index 6a31d1d,6098a04..e3516a5
--- a/htdocs/xorg.php
+++ b/htdocs/xorg.php
@@@ -25,7 -25,7 +25,7 @@@ $platal = new Xorg('auth', 'carnet', 'e
                     'geoloc', 'lists', 'marketing', 'payment', 'platal',
                     'profile', 'register', 'search', 'stats', 'admin',
                     'newsletter', 'axletter', 'bandeau', 'survey',
-                    'fusionax', 'gadgets', 'googleapps', 'poison');
 -                   'gadgets', 'googleapps', 'poison', 'openid');
++                   'fusionax', 'gadgets', 'googleapps', 'poison', 'openid');
  
  if (!($path = Env::v('n')) || ($path{0} < 'A' || $path{0} > 'Z')) {
      $platal->run();