git.polytechnique.org Git - platal.git/commit

author	Stéphane Jacob <sj@m4x.org>
	Sun, 8 Nov 2009 13:27:30 +0000 (14:27 +0100)
committer	Stéphane Jacob <sj@m4x.org>
	Sun, 8 Nov 2009 13:27:30 +0000 (14:27 +0100)
commit	e46cf8c46341b447cc3701c8afcc9baec3da11e5
tree	1258aeb236d1f555920dcea3ef892a7ab179e3e0	tree \| snapshot
parent	1831341c5d0280c21a032e4c2cad30f80b56f5bf	commit \| diff
parent	1dc71da137a384e771723b8a893539a7f5cc9fab	commit \| diff

Merge commit 'origin/fusionax' into account

63 files changed:

configs/platal.ini	diff1 \|	diff2 \|	blob \| history
include/emails.inc.php	diff1 \|	diff2 \|	blob \| history
include/marketing.inc.php	diff1 \|	diff2 \|	blob \| history
include/validations.inc.php	diff1 \|	diff2 \|	blob \| history
include/validations/aliases.inc.php	diff1 \|	diff2 \|	blob \| history
include/validations/homonymes.inc.php	diff1 \|	diff2 \|	blob \| history
include/validations/listes.inc.php	diff1 \|	diff2 \|	blob \| history
include/validations/marketing.inc.php	diff1 \|	diff2 \|	blob \| history
modules/admin.php	diff1 \|	diff2 \|	blob \| history
modules/axletter.php	diff1 \|	diff2 \|	blob \| history
modules/axletter/axletter.inc.php	diff1 \|	diff2 \|	blob \| history
modules/carnet.php	diff1 \|	diff2 \|	blob \| history
modules/email.php	diff1 \|	diff2 \|	blob \| history
modules/lists.php	diff1 \|	diff2 \|	blob \| history
modules/marketing.php	diff1 \|	diff2 \|	blob \| history
modules/newsletter.php	diff1 \|	diff2 \|	blob \| history
modules/payment.php	diff1 \|	diff2 \|	blob \| history
modules/platal.php	diff1 \|	diff2 \|	blob \| history
modules/profile.php	diff1 \|	diff2 \|	blob \| history
modules/profile/general.inc.php	diff1 \|	diff2 \|	blob \| history
modules/profile/page.inc.php	diff1 \|	diff2 \|	blob \| history
modules/register.php	diff1 \|	diff2 \|	blob \| history
modules/register/register.inc.php	diff1 \|	diff2 \|	blob \| history
modules/stats.php	diff1 \|	diff2 \|	blob \| history
modules/xnetevents.php	diff1 \|	diff2 \|	blob \| history
modules/xnetevents/xnetevents.inc.php	diff1 \|	diff2 \|	blob \| history
modules/xnetgrp.php	diff1 \|	diff2 \|	blob \| history
modules/xnetlists.php	diff1 \|	diff2 \|	blob \| history
templates/admin/dead_but_active.tpl	diff1 \|	diff2 \|	blob \| history
templates/admin/wiki.tpl	diff1 \|	diff2 \|	blob \| history
templates/carnet/index.tpl	diff1 \|	diff2 \|	blob \| history
templates/carnet/notifs.tpl	diff1 \|	diff2 \|	blob \| history
templates/core/password_prompt.tpl	diff1 \|	diff2 \|	blob \| history
templates/emails/alias.tpl	diff1 \|	diff2 \|	blob \| history
templates/emails/broken.tpl	diff1 \|	diff2 \|	blob \| history
templates/emails/send.tpl	diff1 \|	diff2 \|	blob \| history
templates/events/index.tpl	diff1 \|	diff2 \|	blob \| history
templates/include/minifiche.tpl	diff1 \|	diff2 \|	blob \| history
templates/marketing/promo.tpl	diff1 \|	diff2 \|	blob \| history
templates/marketing/this_week.tpl	diff1 \|	diff2 \|	blob \| history
templates/newsletter/nl.mail.tpl	diff1 \|	diff2 \|	blob \| history
templates/payment/xnet.tpl	diff1 \|	diff2 \|	blob \| history
templates/platal/filrss.tpl	diff1 \|	diff2 \|	blob \| history
templates/platal/preferences.tpl	diff1 \|	diff2 \|	blob \| history
templates/platal/webredirect.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnet/skin.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetevents/admin.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetevents/edit.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetevents/index.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetevents/subscribe.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/annuaire.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/asso.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/edit.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/inscrire.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/mail.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/membres-add.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/membres-del.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/membres-edit.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/subscribe-valid.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetlists/alias-admin.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetlists/alias-create.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetlists/create.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetlists/index.tpl	diff1 \|	diff2 \|	blob \| history

plat/al

RSS Atom

configs/platal.ini	diff1 \|	diff2 \|	blob \| history
include/emails.inc.php	diff1 \|	diff2 \|	blob \| history
include/marketing.inc.php	diff1 \|	diff2 \|	blob \| history
include/validations.inc.php	diff1 \|	diff2 \|	blob \| history
include/validations/aliases.inc.php	diff1 \|	diff2 \|	blob \| history
include/validations/homonymes.inc.php	diff1 \|	diff2 \|	blob \| history
include/validations/listes.inc.php	diff1 \|	diff2 \|	blob \| history
include/validations/marketing.inc.php	diff1 \|	diff2 \|	blob \| history
modules/admin.php	diff1 \|	diff2 \|	blob \| history
modules/axletter.php	diff1 \|	diff2 \|	blob \| history
modules/axletter/axletter.inc.php	diff1 \|	diff2 \|	blob \| history
modules/carnet.php	diff1 \|	diff2 \|	blob \| history
modules/email.php	diff1 \|	diff2 \|	blob \| history
modules/lists.php	diff1 \|	diff2 \|	blob \| history
modules/marketing.php	diff1 \|	diff2 \|	blob \| history
modules/newsletter.php	diff1 \|	diff2 \|	blob \| history
modules/payment.php	diff1 \|	diff2 \|	blob \| history
modules/platal.php	diff1 \|	diff2 \|	blob \| history
modules/profile.php	diff1 \|	diff2 \|	blob \| history
modules/profile/general.inc.php	diff1 \|	diff2 \|	blob \| history
modules/profile/page.inc.php	diff1 \|	diff2 \|	blob \| history
modules/register.php	diff1 \|	diff2 \|	blob \| history
modules/register/register.inc.php	diff1 \|	diff2 \|	blob \| history
modules/stats.php	diff1 \|	diff2 \|	blob \| history
modules/xnetevents.php	diff1 \|	diff2 \|	blob \| history
modules/xnetevents/xnetevents.inc.php	diff1 \|	diff2 \|	blob \| history
modules/xnetgrp.php	diff1 \|	diff2 \|	blob \| history
modules/xnetlists.php	diff1 \|	diff2 \|	blob \| history
templates/admin/dead_but_active.tpl	diff1 \|	diff2 \|	blob \| history
templates/admin/wiki.tpl	diff1 \|	diff2 \|	blob \| history
templates/carnet/index.tpl	diff1 \|	diff2 \|	blob \| history
templates/carnet/notifs.tpl	diff1 \|	diff2 \|	blob \| history
templates/core/password_prompt.tpl	diff1 \|	diff2 \|	blob \| history
templates/emails/alias.tpl	diff1 \|	diff2 \|	blob \| history
templates/emails/broken.tpl	diff1 \|	diff2 \|	blob \| history
templates/emails/send.tpl	diff1 \|	diff2 \|	blob \| history
templates/events/index.tpl	diff1 \|	diff2 \|	blob \| history
templates/include/minifiche.tpl	diff1 \|	diff2 \|	blob \| history
templates/marketing/promo.tpl	diff1 \|	diff2 \|	blob \| history
templates/marketing/this_week.tpl	diff1 \|	diff2 \|	blob \| history
templates/newsletter/nl.mail.tpl	diff1 \|	diff2 \|	blob \| history
templates/payment/xnet.tpl	diff1 \|	diff2 \|	blob \| history
templates/platal/filrss.tpl	diff1 \|	diff2 \|	blob \| history
templates/platal/preferences.tpl	diff1 \|	diff2 \|	blob \| history
templates/platal/webredirect.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnet/skin.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetevents/admin.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetevents/edit.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetevents/index.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetevents/subscribe.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/annuaire.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/asso.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/edit.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/inscrire.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/mail.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/membres-add.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/membres-del.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/membres-edit.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetgrp/subscribe-valid.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetlists/alias-admin.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetlists/alias-create.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetlists/create.tpl	diff1 \|	diff2 \|	blob \| history
templates/xnetlists/index.tpl	diff1 \|	diff2 \|	blob \| history