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

author	Florent Bruneau <florent.bruneau@polytechnique.org>
	Mon, 12 Jan 2009 10:55:01 +0000 (11:55 +0100)
committer	Florent Bruneau <florent.bruneau@polytechnique.org>
	Mon, 12 Jan 2009 10:55:01 +0000 (11:55 +0100)
commit	9891bd15f772caef0c199a98f036e976bf4ab94a
tree	d02dba2febd2486aca200193bddcc5c5c0ce2d8f	tree \| snapshot
parent	70c65f3afd13138f80bcda7b2fdb5f4e4b3efd22	commit \| diff
parent	8d84c630f353ef0534e02325507ed35cc2f0d28f	commit \| diff

Merge commit 'origin/master' into fusionax

Conflicts:

include/applis.func.inc.php

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

82 files changed:

bin/cron/checkdb.php	diff1 \|	diff2 \|	blob \| history
bin/cron/clean.php	diff1 \|	diff2 \|	blob \| history
classes/user.php	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/xorg.php	diff1 \|	diff2 \|	blob \| history
include/education.func.inc.php	diff1 \|	\|	blob \| history
include/emails.combobox.inc.php	diff1 \|	\|	blob \| history
include/name.func.inc.php	diff1 \|	\|	blob \| history
include/notifs.inc.php	diff1 \|	diff2 \|	blob \| history
include/profil.func.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/entreprises.inc.php	diff1 \|	\|	blob \| history
include/validations/orange.inc.php	diff1 \|	diff2 \|	blob \| history
modules/admin.php	diff1 \|	diff2 \|	blob \| history
modules/email.php	diff1 \|	diff2 \|	blob \| history
modules/events.php	diff1 \|	diff2 \|	blob \| history
modules/fusionax.php	diff1 \|	\|	blob \| history
modules/geoloc.php	diff1 \|	diff2 \|	blob \| history
modules/payment/money/paypal.inc.php	diff1 \|	diff2 \|	blob \| history
modules/profile.php	diff1 \|	diff2 \|	blob \| history
modules/profile/addresses.inc.php	diff1 \|	diff2 \|	blob \| history
modules/profile/general.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/search.php	diff1 \|	diff2 \|	blob \| history
modules/search/classes.inc.php	diff1 \|	diff2 \|	blob \| history
modules/search/search.inc.php	diff1 \|	diff2 \|	blob \| history
plugins/function.display_address.php	diff1 \|	diff2 \|	blob \| history
plugins/function.display_phones.php	diff1 \|	\|	blob \| history
plugins/function.select_nat.php	diff1 \|	diff2 \|	blob \| history
templates/admin/index.tpl	diff1 \|	diff2 \|	blob \| history
templates/core/vcard.tpl	diff1 \|	\|	blob \| history
templates/emails/redirect.tpl	diff1 \|	diff2 \|	blob \| history
templates/events/index.tpl	diff1 \|	diff2 \|	blob \| history
templates/fusionax/deceased.tpl	diff1 \|	\|	blob \| history
templates/fusionax/ids.tpl	diff1 \|	\|	blob \| history
templates/fusionax/idsMissingInAx.tpl	diff1 \|	\|	blob \| history
templates/fusionax/idsMissingInXorg.tpl	diff1 \|	\|	blob \| history
templates/fusionax/idswrongInXorg.tpl	diff1 \|	\|	blob \| history
templates/fusionax/import.tpl	diff1 \|	\|	blob \| history
templates/fusionax/index.tpl	diff1 \|	\|	blob \| history
templates/fusionax/listFusion.tpl	diff1 \|	\|	blob \| history
templates/fusionax/promo.tpl	diff1 \|	\|	blob \| history
templates/fusionax/view.tpl	diff1 \|	\|	blob \| history
templates/gadgets/ig-minifiche.tpl	diff1 \|	diff2 \|	blob \| history
templates/include/emails.combobox.tpl	diff1 \|	\|	blob \| history
templates/include/emploi.tpl	diff1 \|	diff2 \|	blob \| history
templates/include/field.promo.tpl	diff1 \|	diff2 \|	blob \| history
templates/include/form.valid.edit-entreprises.tpl	diff1 \|	\|	blob \| history
templates/include/form.valid.entreprises.tpl	diff1 \|	\|	blob \| history
templates/include/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/profile/adresses.address.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.edu.tpl	diff1 \|	\|	blob \| history
templates/profile/general.networking.tpl	diff1 \|	\|	blob \| history
templates/profile/general.searchname.tpl	diff1 \|	\|	blob \| history
templates/profile/general.tpl	diff1 \|	diff2 \|	blob \| history
templates/profile/jobs.job.tpl	diff1 \|	diff2 \|	blob \| history
templates/profile/jobs.secteur.tpl	diff1 \|	diff2 \|	blob \| history
templates/profile/jobs.soussecteur.tpl	diff1 \|	\|	blob \| history
templates/profile/jobs.tpl	diff1 \|	diff2 \|	blob \| history
templates/profile/name_info.tpl	diff1 \|	\|	blob \| history
templates/profile/orange.tpl	diff1 \|	diff2 \|	blob \| history
templates/profile/phone.tpl	diff1 \|	\|	blob \| history
templates/profile/profile.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/survey/index.tpl	diff1 \|	diff2 \|	blob \| history
templates/survey/show_root.tpl	diff1 \|	diff2 \|	blob \| history
upgrade/0.9.14/connect.db.inc.php	diff1 \|	diff2 \|	blob \| history

plat/al

RSS Atom

bin/cron/checkdb.php	diff1 \|	diff2 \|	blob \| history
bin/cron/clean.php	diff1 \|	diff2 \|	blob \| history
classes/user.php	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/xorg.php	diff1 \|	diff2 \|	blob \| history
include/education.func.inc.php	diff1 \|	\|	blob \| history
include/emails.combobox.inc.php	diff1 \|	\|	blob \| history
include/name.func.inc.php	diff1 \|	\|	blob \| history
include/notifs.inc.php	diff1 \|	diff2 \|	blob \| history
include/profil.func.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/entreprises.inc.php	diff1 \|	\|	blob \| history
include/validations/orange.inc.php	diff1 \|	diff2 \|	blob \| history
modules/admin.php	diff1 \|	diff2 \|	blob \| history
modules/email.php	diff1 \|	diff2 \|	blob \| history
modules/events.php	diff1 \|	diff2 \|	blob \| history
modules/fusionax.php	diff1 \|	\|	blob \| history
modules/geoloc.php	diff1 \|	diff2 \|	blob \| history
modules/payment/money/paypal.inc.php	diff1 \|	diff2 \|	blob \| history
modules/profile.php	diff1 \|	diff2 \|	blob \| history
modules/profile/addresses.inc.php	diff1 \|	diff2 \|	blob \| history
modules/profile/general.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/search.php	diff1 \|	diff2 \|	blob \| history
modules/search/classes.inc.php	diff1 \|	diff2 \|	blob \| history
modules/search/search.inc.php	diff1 \|	diff2 \|	blob \| history
plugins/function.display_address.php	diff1 \|	diff2 \|	blob \| history
plugins/function.display_phones.php	diff1 \|	\|	blob \| history
plugins/function.select_nat.php	diff1 \|	diff2 \|	blob \| history
templates/admin/index.tpl	diff1 \|	diff2 \|	blob \| history
templates/core/vcard.tpl	diff1 \|	\|	blob \| history
templates/emails/redirect.tpl	diff1 \|	diff2 \|	blob \| history
templates/events/index.tpl	diff1 \|	diff2 \|	blob \| history
templates/fusionax/deceased.tpl	diff1 \|	\|	blob \| history
templates/fusionax/ids.tpl	diff1 \|	\|	blob \| history
templates/fusionax/idsMissingInAx.tpl	diff1 \|	\|	blob \| history
templates/fusionax/idsMissingInXorg.tpl	diff1 \|	\|	blob \| history
templates/fusionax/idswrongInXorg.tpl	diff1 \|	\|	blob \| history
templates/fusionax/import.tpl	diff1 \|	\|	blob \| history
templates/fusionax/index.tpl	diff1 \|	\|	blob \| history
templates/fusionax/listFusion.tpl	diff1 \|	\|	blob \| history
templates/fusionax/promo.tpl	diff1 \|	\|	blob \| history
templates/fusionax/view.tpl	diff1 \|	\|	blob \| history
templates/gadgets/ig-minifiche.tpl	diff1 \|	diff2 \|	blob \| history
templates/include/emails.combobox.tpl	diff1 \|	\|	blob \| history
templates/include/emploi.tpl	diff1 \|	diff2 \|	blob \| history
templates/include/field.promo.tpl	diff1 \|	diff2 \|	blob \| history
templates/include/form.valid.edit-entreprises.tpl	diff1 \|	\|	blob \| history
templates/include/form.valid.entreprises.tpl	diff1 \|	\|	blob \| history
templates/include/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/profile/adresses.address.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.edu.tpl	diff1 \|	\|	blob \| history
templates/profile/general.networking.tpl	diff1 \|	\|	blob \| history
templates/profile/general.searchname.tpl	diff1 \|	\|	blob \| history
templates/profile/general.tpl	diff1 \|	diff2 \|	blob \| history
templates/profile/jobs.job.tpl	diff1 \|	diff2 \|	blob \| history
templates/profile/jobs.secteur.tpl	diff1 \|	diff2 \|	blob \| history
templates/profile/jobs.soussecteur.tpl	diff1 \|	\|	blob \| history
templates/profile/jobs.tpl	diff1 \|	diff2 \|	blob \| history
templates/profile/name_info.tpl	diff1 \|	\|	blob \| history
templates/profile/orange.tpl	diff1 \|	diff2 \|	blob \| history
templates/profile/phone.tpl	diff1 \|	\|	blob \| history
templates/profile/profile.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/survey/index.tpl	diff1 \|	diff2 \|	blob \| history
templates/survey/show_root.tpl	diff1 \|	diff2 \|	blob \| history
upgrade/0.9.14/connect.db.inc.php	diff1 \|	diff2 \|	blob \| history