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

author	Florent Bruneau <florent.bruneau@polytechnique.org>
	Mon, 27 Aug 2007 21:19:38 +0000 (23:19 +0200)
committer	Florent Bruneau <florent.bruneau@polytechnique.org>
	Mon, 27 Aug 2007 21:25:08 +0000 (23:25 +0200)
commit	787bb3d745141f2f85bd947ad7dd775d2c63f908
tree	8f801d3b7276d0a5fb0f6c67dd813a3ad6f013a8	tree \| snapshot
parent	7568a515d7e3c4c992dd98b784165aa36b575ff9	commit \| diff

Merge branch 'master' of /home/git/platal into profile_edit

Conflicts:

htdocs/css/keynote.css
modules/profile/get_general.inc.php
modules/profile/verif_general.inc.php

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

130 files changed:

bin/cron/banana.feedgen.php	[changed from symlink to file mode: 0755]	diff \| blob \| blame \| history
bin/cron/checkdb.php		diff \| blob \| blame \| history
bin/cron/connect.db.inc.php	[changed from symlink to file mode: 0644]	diff \| blob \| blame \| history
bin/cron/cron_validations.php		diff \| blob \| blame \| history
bin/cron/emails.check.php		diff \| blob \| blame \| history
bin/cron/homonymes.php		diff \| blob \| blame \| history
bin/cron/notifs.send.php		diff \| blob \| blame \| history
bin/csv2sql.php		diff \| blob \| blame \| history
bin/devel/xhtml.classes.pl		diff \| blob \| blame \| history
bin/lists.mhonarc_by_month.pl		diff \| blob \| blame \| history
bin/lists.rpc.py		diff \| blob \| blame \| history
classes/corelogger.php		diff \| blob \| blame \| history
classes/csvimporter.php		diff \| blob \| blame \| history
classes/env.php		diff \| blob \| blame \| history
classes/flagset.php		diff \| blob \| blame \| history
classes/miniwiki.php		diff \| blob \| blame \| history
classes/mmlist.php		diff \| blob \| blame \| history
classes/platal.php		diff \| blob \| blame \| history
classes/platalpage.php		diff \| blob \| blame \| history
classes/plmailer.php		diff \| blob \| blame \| history
classes/plset.php		diff \| blob \| blame \| history
classes/pltableeditor.php		diff \| blob \| blame \| history
classes/plupload.php		diff \| blob \| blame \| history
classes/session.php		diff \| blob \| blame \| history
classes/xnet.php		diff \| blob \| blame \| history
htdocs/css/ax.css		diff \| blob \| blame \| history
htdocs/css/default.css		diff \| blob \| blame \| history
htdocs/css/espace.css		diff \| blob \| blame \| history
htdocs/css/humlinux.css		diff \| blob \| blame \| history
htdocs/css/keynote.css		diff \| blob \| blame \| history
htdocs/css/linux.css		diff \| blob \| blame \| history
htdocs/css/nbviolet.css		diff \| blob \| blame \| history
htdocs/css/openweb.css		diff \| blob \| blame \| history
htdocs/css/spectral.css		diff \| blob \| blame \| history
htdocs/css/trapped.css		diff \| blob \| blame \| history
htdocs/css/wiki.css		diff \| blob \| blame \| history
htdocs/listes_redirect.php		diff \| blob \| blame \| history
htdocs/webredirect.php		diff \| blob \| blame \| history
include/applis.func.inc.php		diff \| blob \| blame \| history
include/banana/forum.inc.php		diff \| blob \| blame \| history
include/banana/hooks.inc.php		diff \| blob \| blame \| history
include/banana/ml.inc.php		diff \| blob \| blame \| history
include/banana/moderate.inc.php		diff \| blob \| blame \| history
include/emails.inc.php		diff \| blob \| blame \| history
include/geoloc.inc.php		diff \| blob \| blame \| history
include/homonymes.inc.php		diff \| blob \| blame \| history
include/marketing.inc.php		diff \| blob \| blame \| history
include/massmailer.inc.php		diff \| blob \| blame \| history
include/newsletter.inc.php		diff \| blob \| blame \| history
include/notifs.inc.php		diff \| blob \| blame \| history
include/platal.inc.php		diff \| blob \| blame \| history
include/profil.func.inc.php		diff \| blob \| blame \| history
include/rss.inc.php		diff \| blob \| blame \| history
include/secure_hash.inc.php		diff \| blob \| blame \| history
include/synchro_ax.inc.php		diff \| blob \| blame \| history
include/user.func.inc.php		diff \| blob \| blame \| history
include/userset.inc.php		diff \| blob \| blame \| history
include/validations.inc.php		diff \| blob \| blame \| history
include/validations/aliases.inc.php		diff \| blob \| blame \| history
include/validations/broken.inc.php		diff \| blob \| blame \| history
include/validations/evts.inc.php		diff \| blob \| blame \| history
include/validations/homonymes.inc.php		diff \| blob \| blame \| history
include/validations/listes.inc.php		diff \| blob \| blame \| history
include/validations/marketing.inc.php		diff \| blob \| blame \| history
include/validations/medals.inc.php		diff \| blob \| blame \| history
include/validations/nl.inc.php		diff \| blob \| blame \| history
include/validations/nomusage.inc.php		diff \| blob \| blame \| history
include/validations/orange.inc.php		diff \| blob \| blame \| history
include/validations/paiements.inc.php		diff \| blob \| blame \| history
include/validations/photos.inc.php		diff \| blob \| blame \| history
include/validations/surveys.inc.php		diff \| blob \| blame \| history
include/vcard.inc.php		diff \| blob \| blame \| history
include/webservices/manageurs.server.inc.php		diff \| blob \| blame \| history
include/wiki.inc.php		diff \| blob \| blame \| history
include/wiki/engine.php		diff \| blob \| blame \| history
include/wiki/farmconfig.php		diff \| blob \| blame \| history
include/xnet/page.inc.php		diff \| blob \| blame \| history
include/xnet/session.inc.php		diff \| blob \| blame \| history
include/xorg.misc.inc.php		diff \| blob \| blame \| history
include/xorg/session.inc.php		diff \| blob \| blame \| history
modules/admin.php		diff \| blob \| blame \| history
modules/auth.php		diff \| blob \| blame \| history
modules/auth/auth.inc.php		diff \| blob \| blame \| history
modules/axletter.php		diff \| blob \| blame \| history
modules/axletter/axletter.inc.php		diff \| blob \| blame \| history
modules/banana.php		diff \| blob \| blame \| history
modules/bandeau.php		diff \| blob \| blame \| history
modules/core.php		diff \| blob \| blame \| history
modules/email.php		diff \| blob \| blame \| history
modules/events.php		diff \| blob \| blame \| history
modules/geoloc.php		diff \| blob \| blame \| history
modules/lists.php		diff \| blob \| blame \| history
modules/marketing.php		diff \| blob \| blame \| history
modules/newsletter.php		diff \| blob \| blame \| history
modules/payment.php		diff \| blob \| blame \| history
modules/payment/money.inc.php		diff \| blob \| blame \| history
modules/payment/money/cyberpaiement.inc.php		diff \| blob \| blame \| history
modules/payment/money/paypal.inc.php		diff \| blob \| blame \| history
modules/platal.php		diff \| blob \| blame \| history
modules/profile/assign_adresses.inc.php		diff \| blob \| blame \| history
modules/profile/assign_poly.inc.php		diff \| blob \| blame \| history
modules/profile/get_adresses.inc.php		diff \| blob \| blame \| history
modules/profile/get_deco.inc.php		diff \| blob \| blame \| history
modules/profile/get_mentor.inc.php		diff \| blob \| blame \| history
modules/profile/update_adresses.inc.php		diff \| blob \| blame \| history
modules/profile/verif_adresses.inc.php		diff \| blob \| blame \| history
modules/register.php		diff \| blob \| blame \| history
modules/register/register.inc.php		diff \| blob \| blame \| history
modules/search.php		diff \| blob \| blame \| history
modules/search/classes.inc.php		diff \| blob \| blame \| history
modules/search/search.inc.php		diff \| blob \| blame \| history
modules/stats.php		diff \| blob \| blame \| history
modules/survey.php		diff \| blob \| blame \| history
modules/xnet.php		diff \| blob \| blame \| history
modules/xnetevents/xnetevents.inc.php		diff \| blob \| blame \| history
modules/xnetgrp.php		diff \| blob \| blame \| history
modules/xnetgrp/mail.inc.php		diff \| blob \| blame \| history
plugins/block.tidy.php		diff \| blob \| blame \| history
plugins/function.display_address.php		diff \| blob \| blame \| history
plugins/function.select_db_table.php		diff \| blob \| blame \| history
plugins/insert.getNbIns.php		diff \| blob \| blame \| history
plugins/insert.getNbNotifs.php		diff \| blob \| blame \| history
plugins/insert.getUserName.php		diff \| blob \| blame \| history
plugins/insert.mkStats.php		diff \| blob \| blame \| history
upgrade/0.0.0_to_0.9.0/new_newsletter.sh		diff \| blob \| blame \| history
upgrade/0.0.0_to_0.9.0/to_mailman.py		diff \| blob \| blame \| history
upgrade/0.9.14/connect.db.inc.php	[changed from symlink to file mode: 0644]	diff \| blob \| blame \| history
upgrade/0.9.2/update.sh		diff \| blob \| blame \| history
upgrade/0.9.3/update.sh		diff \| blob \| blame \| history
upgrade/0.9.4/update.sh		diff \| blob \| blame \| history

plat/al

RSS Atom