projects / platal.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 833a6e8 a959b19)
Merge commit 'origin/master' into account
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 14 Feb 2010 19:47:18 +0000 (20:47 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 14 Feb 2010 19:47:18 +0000 (20:47 +0100)
commitfb813fb52d5ab65ca9a5b92b5cb9089523380d79
tree69357ff67462fc7f7067b149de907c4b62339b71tree | snapshot
parent833a6e86ea17d40444ae32cd6c92b9359f383e71commit | diff
parenta959b199b8f4790bf311c4e9c4b96b4ffb494eebcommit | diff
Merge commit 'origin/master' into account

Conflicts:

core
include/applis.func.inc.php
include/geoloc.inc.php
include/secure_hash.inc.php
include/synchro_ax.inc.php
modules/geoloc.php
modules/profile.php
modules/xnetlists.php
plugins/function.geoloc_country.php
plugins/function.geoloc_region.php
plugins/insert.getName.php
templates/events/rss.tpl
templates/include/minifiche.tpl
templates/include/plview.geoloc.tpl
templates/profile/general.edu.tpl
templates/profile/jobs.sub_sector.tpl
templates/profile/nomusage.tpl
templates/xnetgrp/announce-rss.tpl
templates/xnetgrp/annuaire-csv.tpl
templates/xnetlists/sync.tpl
upgrade/0.9.14/connect.db.inc.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
196 files changed:
bin/cron/checkdb.php diff1 | diff2 | blob | history
bin/cron/clean.php diff1 | diff2 | blob | history
bin/cron/compliance.php diff1 | diff2 | blob | history
bin/cron/notifs.birthday.php diff1 | diff2 | blob | history
bin/search.rebuild_db.php diff1 | diff2 | blob | history
classes/platalglobals.php.in diff1 | diff2 | blob | history
classes/platallogger.php diff1 | diff2 | blob | history
classes/user.php diff1 | diff2 | blob | history
classes/xnetpage.php diff1 | diff2 | blob | history
classes/xnetsession.php diff1 | diff2 | blob | history
classes/xorgsession.php diff1 | diff2 | blob | history
htdocs/css/base.css diff1 | diff2 | blob | history
htdocs/css/default.css diff1 | diff2 | blob | history
htdocs/css/keynote.css diff1 | diff2 | blob | history
htdocs/css/openweb.css diff1 | diff2 | blob | history
htdocs/javascript/profile.js diff1 | diff2 | blob | history
htdocs/listes_redirect.php diff1 | diff2 | blob | history
htdocs/webredirect.php diff1 | diff2 | blob | history
htdocs/xnet.php diff1 | diff2 | blob | history
htdocs/xorg.php diff1 | diff2 | blob | history
include/banana/forum.inc.php diff1 | diff2 | blob | history
include/banana/hooks.inc.php diff1 | diff2 | blob | history
include/banana/ml.inc.php diff1 | diff2 | blob | history
include/common.inc.php diff1 | diff2 | blob | history
include/emails.inc.php diff1 | diff2 | blob | history
include/googleapps.inc.php diff1 | diff2 | blob | history
include/marketing.inc.php diff1 | diff2 | blob | history
include/massmailer.inc.php diff1 | diff2 | blob | history
include/notifs.inc.php diff1 | diff2 | blob | history
include/profil.func.inc.php diff1 | diff2 | blob | history
include/reminder/profile_update.inc.php diff1 | diff2 | blob | history
include/reminder/promotion_ml.inc.php diff1 | diff2 | blob | history
include/user.func.inc.php diff1 | diff2 | blob | history
include/userset.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
include/validations/names.inc.php diff1 | diff2 | blob | history
include/validations/orange.inc.php diff1 | diff2 | blob | history
include/validations/paiements.inc.php diff1 | diff2 | blob | history
include/vcard.inc.php diff1 | diff2 | blob | history
modules/admin.php diff1 | diff2 | blob | history
modules/admin/homonyms.inc.php diff1 | diff2 | blob | history
modules/auth.php diff1 | diff2 | blob | history
modules/auth/auth.inc.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/carnet/contacts.pdf.inc.php diff1 | diff2 | blob | history
modules/carnet/feed.inc.php diff1 | diff2 | blob | history
modules/email.php diff1 | diff2 | blob | history
modules/events.php diff1 | diff2 | blob | history
modules/events/feed.inc.php diff1 | diff2 | blob | history
modules/forums.php diff1 | diff2 | blob | history
modules/gadgets.php diff1 | diff2 | blob | history
modules/googleapps.php diff1 | diff2 | blob | history
modules/lists.php diff1 | diff2 | blob | history
modules/lists/lists.inc.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/payment/money.inc.php diff1 | diff2 | blob | history
modules/payment/money/cyberpaiement.inc.php diff1 | diff2 | blob | history
modules/payment/money/paypal.inc.php diff1 | diff2 | blob | history
modules/platal.php diff1 | diff2 | blob | history
modules/profile.php diff1 | diff2 | blob | history
modules/profile/addresses.inc.php diff1 | diff2 | blob | history
modules/profile/decos.inc.php diff1 | diff2 | blob | history
modules/profile/general.inc.php diff1 | diff2 | blob | history
modules/profile/groups.inc.php diff1 | diff2 | blob | history
modules/profile/jobs.inc.php diff1 | diff2 | blob | history
modules/profile/mentor.inc.php diff1 | diff2 | blob | history
modules/profile/page.inc.php diff1 | diff2 | blob | history
modules/profile/skills.inc.php diff1 | diff2 | blob | history
modules/register.php diff1 | diff2 | blob | history
modules/register/register.inc.php diff1 | diff2 | blob | history
modules/search.php diff1 | diff2 | blob | history
modules/search/classes.inc.php diff1 | diff2 | blob | history
modules/search/search.inc.php diff1 | diff2 | blob | history
modules/stats.php diff1 | diff2 | blob | history
modules/survey/survey.inc.php diff1 | diff2 | blob | history
modules/xnet.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/xnetgrp/feed.inc.php diff1 | diff2 | blob | history
modules/xnetgrp/mail.inc.php diff1 | diff2 | blob | history
modules/xnetlists.php diff1 | diff2 | blob | history
plugins/function.display_address.php diff1 | diff2 | blob | history
plugins/function.profile.php diff1 | diff2 | blob | history
plugins/function.select_nat.php diff1 | diff2 | blob | history
templates/admin/accounts.tpl diff1 | diff2 | blob | history
templates/admin/dead_but_active.tpl diff1 | diff2 | blob | history
templates/admin/deces_promo.tpl diff1 | diff2 | blob | history
templates/admin/homonymes.tpl diff1 | diff2 | blob | history
templates/admin/index.tpl diff1 | diff2 | blob | history
templates/admin/user.tpl diff1 | diff2 | blob | history
templates/admin/wiki.tpl diff1 | diff2 | blob | history
templates/axletter/admin.tpl diff1 | diff2 | blob | history
templates/axletter/edit.tpl diff1 | diff2 | blob | history
templates/axletter/letter.mail.tpl diff1 | diff2 | blob | history
templates/carnet/index.tpl diff1 | diff2 | blob | history
templates/carnet/mescontacts.tpl diff1 | diff2 | blob | history
templates/carnet/notifs.tpl diff1 | diff2 | blob | history
templates/carnet/panel.tpl diff1 | diff2 | blob | history
templates/carnet/rss.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/redirect.tpl diff1 | diff2 | blob | history
templates/emails/send.tpl diff1 | diff2 | blob | history
templates/events/admin.tpl diff1 | diff2 | blob | history
templates/events/index.tpl diff1 | diff2 | blob | history
templates/fusionax/listFusion.tpl diff1 | | blob | history
templates/gadgets/ig-events.tpl diff1 | diff2 | blob | history
templates/gadgets/ig-minifiche.tpl diff1 | diff2 | blob | history
templates/geoloc/form.address.tpl diff1 | diff2 | blob | history
templates/include/emploi.tpl diff1 | diff2 | blob | history
templates/include/field.promo.tpl diff1 | diff2 | blob | history
templates/include/form.valid.orange.tpl diff1 | diff2 | blob | history
templates/include/minifiche.tpl diff1 | diff2 | blob | history
templates/include/plview.minifiche.tpl diff1 | diff2 | blob | history
templates/include/plview.referent.tpl diff1 | diff2 | blob | history
templates/include/plview.trombi.tpl diff1 | diff2 | blob | history
templates/include/trombi.tpl diff1 | diff2 | blob | history
templates/marketing/private.tpl diff1 | diff2 | blob | history
templates/marketing/promo.tpl diff1 | diff2 | blob | history
templates/marketing/relance.tpl diff1 | diff2 | blob | history
templates/marketing/this_week.tpl diff1 | diff2 | blob | history
templates/marketing/volontaire.tpl diff1 | diff2 | blob | history
templates/newsletter/edit.tpl diff1 | diff2 | blob | history
templates/newsletter/nl.mail.tpl diff1 | diff2 | blob | history
templates/payment/index.tpl diff1 | diff2 | blob | history
templates/payment/xnet.tpl diff1 | diff2 | blob | history
templates/platal/changeLog.tpl diff1 | diff2 | blob | history
templates/platal/filrss.tpl diff1 | diff2 | blob | history
templates/platal/motdepasse.success.tpl diff1 | diff2 | blob | history
templates/platal/preferences.tpl diff1 | diff2 | blob | history
templates/platal/webredirect.tpl diff1 | diff2 | blob | history
templates/profile/adresses.address.tpl diff1 | diff2 | blob | history
templates/profile/adresses.tpl diff1 | diff2 | blob | history
templates/profile/education.js.tpl diff1 | diff2 | blob | history
templates/profile/fiche_referent.tpl diff1 | diff2 | blob | history
templates/profile/general.buildnames.tpl diff1 | diff2 | blob | history
templates/profile/general.networking.tpl diff1 | | blob | history
templates/profile/general.tpl diff1 | diff2 | blob | history
templates/profile/grades.js.tpl diff1 | diff2 | blob | history
templates/profile/groupesx.tpl diff1 | diff2 | blob | history
templates/profile/groups.tpl diff1 | diff2 | blob | history
templates/profile/jobs.job.tpl diff1 | diff2 | blob | history
templates/profile/jobs.sector.tpl diff1 | diff2 | blob | history
templates/profile/jobs.tpl diff1 | diff2 | blob | history
templates/profile/mentor.tpl diff1 | diff2 | blob | history
templates/profile/name_info.tpl diff1 | diff2 | blob | history
templates/profile/orange.tpl diff1 | diff2 | blob | history
templates/profile/phone.tpl diff1 | diff2 | blob | history
templates/profile/profile.tpl diff1 | diff2 | blob | history
templates/profile/referent.tpl diff1 | diff2 | blob | history
templates/profile/skill.skill.tpl diff1 | diff2 | blob | history
templates/profile/skill.tpl diff1 | diff2 | blob | history
templates/search/adv.form.tpl diff1 | diff2 | blob | history
templates/search/adv.grade.form.tpl diff1 | diff2 | blob | history
templates/skin/common.bandeau.tpl diff1 | diff2 | blob | history
templates/skin/common.menu.tpl diff1 | diff2 | blob | history
templates/survey/index.tpl diff1 | diff2 | blob | history
templates/survey/show_root.tpl diff1 | diff2 | blob | history
templates/xnet/skin.tpl diff1 | diff2 | blob | history
templates/xnetevents/admin.tpl diff1 | diff2 | blob | history
templates/xnetevents/calendar.tpl diff1 | diff2 | blob | history
templates/xnetevents/csv.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/announce-admin.tpl diff1 | diff2 | blob | history
templates/xnetgrp/announce-edit.tpl diff1 | diff2 | blob | history
templates/xnetgrp/annuaire-csv.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/form.announce.tpl diff1 | diff2 | blob | history
templates/xnetgrp/forum.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/membres-new-search.tpl diff1 | diff2 | blob | history
templates/xnetgrp/subscribe-valid.tpl diff1 | diff2 | blob | history
templates/xnetgrp/unsubscription-notif.mail.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
templates/xnetlists/sync.tpl diff1 | diff2 | blob | history
plat/al