Merge commit 'origin/fusionax' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 12 Jan 2009 11:04:48 +0000 (12:04 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 12 Jan 2009 11:04:48 +0000 (12:04 +0100)
commitbe638e733bce413df4324d985297d9a4d94dcbca
treea5300fb96a4c913acd86c712bb9e2dc982a6e74f
parentcb8a8977a6af58cd7d1ee4bf0c94dbc857e1c96e
parent9891bd15f772caef0c199a98f036e976bf4ab94a
Merge commit 'origin/fusionax' into account

Conflicts:

core
include/rss.inc.php
include/secure_hash.inc.php
modules/profile/general.inc.php
plugins/insert.getName.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
77 files changed:
classes/platalglobals.php.in
classes/platallogger.php
classes/profile.php
classes/user.php
classes/xnetsession.php
classes/xorgsession.php
htdocs/css/base.css
htdocs/css/keynote.css
htdocs/webredirect.php
include/banana/forum.inc.php
include/banana/hooks.inc.php
include/banana/ml.inc.php
include/emails.combobox.inc.php
include/emails.inc.php
include/googleapps.inc.php
include/marketing.inc.php
include/massmailer.inc.php
include/notifs.inc.php
include/user.func.inc.php
include/userset.inc.php
include/validations.inc.php
include/validations/aliases.inc.php
include/validations/homonymes.inc.php
include/validations/listes.inc.php
include/vcard.inc.php
modules/admin.php
modules/admin/homonyms.inc.php
modules/auth.php
modules/auth/auth.inc.php
modules/axletter.php
modules/carnet.php
modules/email.php
modules/events.php
modules/forums.php
modules/fusionax.php
modules/lists.php
modules/lists/lists.inc.php
modules/newsletter.php
modules/platal.php
modules/profile.php
modules/profile/addresses.inc.php
modules/profile/decos.inc.php
modules/profile/general.inc.php
modules/profile/groups.inc.php
modules/profile/jobs.inc.php
modules/profile/mentor.inc.php
modules/profile/page.inc.php
modules/profile/skills.inc.php
modules/register.php
modules/register/register.inc.php
modules/stats.php
modules/xnetgrp.php
modules/xnetlists.php
templates/admin/accounts.tpl
templates/admin/deces_promo.tpl
templates/admin/homonymes.tpl
templates/admin/utilisateurs.tpl
templates/admin/wiki.tpl
templates/axletter/letter.mail.tpl
templates/carnet/index.tpl
templates/carnet/mescontacts.tpl
templates/carnet/panel.tpl
templates/core/password_prompt.tpl
templates/emails/alias.tpl
templates/emails/broken-web.mail.tpl
templates/emails/broken.tpl
templates/emails/send.tpl
templates/events/index.tpl
templates/newsletter/nl.mail.tpl
templates/platal/changeLog.tpl
templates/platal/filrss.tpl
templates/platal/preferences.tpl
templates/platal/webredirect.tpl
templates/profile/general.tpl
templates/xnetgrp/asso.tpl
templates/xnetlists/alias-admin.tpl
templates/xnetlists/sync.tpl