platal.git
15 years agoMerge commit 'origin/master' into fusionax
Florent Bruneau [Sun, 21 Dec 2008 17:28:53 +0000 (18:28 +0100)]
Merge commit 'origin/master' into fusionax

15 years agoMerge commit 'origin/platal-0.10.0'
Florent Bruneau [Sun, 21 Dec 2008 17:28:09 +0000 (18:28 +0100)]
Merge commit 'origin/platal-0.10.0'

15 years agoUpdated text on the password/smtp page
Raphaël Barrois [Mon, 17 Nov 2008 10:22:27 +0000 (11:22 +0100)]
Updated text on the password/smtp page

It was unclear whether it was possible or not to use the same
password as for the connexion.

15 years agoMerge commit 'origin/platal-0.10.0'
Florent Bruneau [Sun, 21 Dec 2008 14:50:51 +0000 (15:50 +0100)]
Merge commit 'origin/platal-0.10.0'

Conflicts:

core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoSecurity fix: don't rely on sql queries forged by a service we don't
Florent Bruneau [Sun, 21 Dec 2008 14:42:13 +0000 (15:42 +0100)]
Security fix: don't rely on sql queries forged by a service we don't
control.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoBacktrace calls to geoloc.org.
Florent Bruneau [Sun, 21 Dec 2008 14:19:46 +0000 (15:19 +0100)]
Backtrace calls to geoloc.org.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoSwitch plat/al to restricted mode by default, and enables the per-uri robots.txt...
Vincent Zanotti [Sun, 21 Dec 2008 14:14:03 +0000 (15:14 +0100)]
Switch plat/al to restricted mode by default, and enables the per-uri robots.txt-based disallowing.

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
15 years agoMerge commit 'origin/platal-0.10.0'
Florent Bruneau [Sun, 21 Dec 2008 14:03:16 +0000 (15:03 +0100)]
Merge commit 'origin/platal-0.10.0'

15 years agoShould avoid 'empty' countries in geoloc.
Florent Bruneau [Sun, 21 Dec 2008 13:55:54 +0000 (14:55 +0100)]
Should avoid 'empty' countries in geoloc.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoUpdated text on the password/smtp page
Raphaël Barrois [Mon, 17 Nov 2008 10:22:27 +0000 (11:22 +0100)]
Updated text on the password/smtp page

It was unclear whether it was possible or not to use the same
password as for the connexion.

15 years agoMerge commit 'origin/platal-0.10.0'
Florent Bruneau [Sat, 20 Dec 2008 17:13:10 +0000 (18:13 +0100)]
Merge commit 'origin/platal-0.10.0'

Conflicts:

core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoUse last core (SQL error logger).
Florent Bruneau [Sat, 20 Dec 2008 17:06:46 +0000 (18:06 +0100)]
Use last core (SQL error logger).

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFixes event creation when there are X that are not in Xorg in the group.
Stéphane Jacob [Sat, 20 Dec 2008 15:54:57 +0000 (16:54 +0100)]
Fixes event creation when there are X that are not in Xorg in the group.

15 years agoMerge commit 'origin/platal-0.10.0'
Florent Bruneau [Thu, 18 Dec 2008 22:32:12 +0000 (23:32 +0100)]
Merge commit 'origin/platal-0.10.0'

Conflicts:

core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoUse last version of core (fix critical bug in wiki permissions).
Florent Bruneau [Thu, 18 Dec 2008 22:28:29 +0000 (23:28 +0100)]
Use last version of core (fix critical bug in wiki permissions).

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoAnother notice.
Florent Bruneau [Thu, 18 Dec 2008 20:55:33 +0000 (21:55 +0100)]
Another notice.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFix notices.
Florent Bruneau [Thu, 18 Dec 2008 20:50:51 +0000 (21:50 +0100)]
Fix notices.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFix list creation.
Florent Bruneau [Thu, 18 Dec 2008 07:42:38 +0000 (08:42 +0100)]
Fix list creation.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFix some logging issues again.
Florent Bruneau [Wed, 17 Dec 2008 20:51:27 +0000 (21:51 +0100)]
Fix some logging issues again.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoAnother syntax error.
Florent Bruneau [Wed, 17 Dec 2008 11:25:11 +0000 (12:25 +0100)]
Another syntax error.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFix syntax error.
Florent Bruneau [Wed, 17 Dec 2008 09:53:11 +0000 (10:53 +0100)]
Fix syntax error.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoMerge commit 'origin/platal-0.10.0'
Stéphane Jacob [Thu, 18 Dec 2008 14:00:42 +0000 (15:00 +0100)]
Merge commit 'origin/platal-0.10.0'

15 years agoFix list creation.
Florent Bruneau [Thu, 18 Dec 2008 07:42:38 +0000 (08:42 +0100)]
Fix list creation.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFix some logging issues again.
Florent Bruneau [Wed, 17 Dec 2008 20:51:27 +0000 (21:51 +0100)]
Fix some logging issues again.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoAnother syntax error.
Florent Bruneau [Wed, 17 Dec 2008 11:25:11 +0000 (12:25 +0100)]
Another syntax error.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFix syntax error.
Florent Bruneau [Wed, 17 Dec 2008 09:53:11 +0000 (10:53 +0100)]
Fix syntax error.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoPuts name management in its own box in the profile edition and puts the code for...
Stéphane Jacob [Tue, 16 Dec 2008 23:16:23 +0000 (00:16 +0100)]
Puts name management in its own box in the profile edition and puts the code for it in a separate file.

15 years agoMerge commit 'origin/master' into fusionax
Stéphane Jacob [Tue, 16 Dec 2008 15:45:40 +0000 (16:45 +0100)]
Merge commit 'origin/master' into fusionax

15 years agoUpdate ChangeLog
Florent Bruneau [Tue, 16 Dec 2008 15:11:38 +0000 (16:11 +0100)]
Update ChangeLog

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoMerge commit 'origin/platal-0.10.0'
Florent Bruneau [Tue, 16 Dec 2008 15:02:24 +0000 (16:02 +0100)]
Merge commit 'origin/platal-0.10.0'

15 years agoFix invalid query.
Florent Bruneau [Tue, 16 Dec 2008 14:50:04 +0000 (15:50 +0100)]
Fix invalid query.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFixes aliases creation.
Stéphane Jacob [Mon, 15 Dec 2008 21:57:46 +0000 (22:57 +0100)]
Fixes aliases creation.

15 years agoPlLogger should be replaced by S::logger() (shorter version).
Stéphane Jacob [Mon, 15 Dec 2008 19:38:07 +0000 (20:38 +0100)]
PlLogger should be replaced by S::logger() (shorter version).

15 years agoPlLogger should be replaced by S::logger().
Stéphane Jacob [Mon, 15 Dec 2008 19:10:14 +0000 (20:10 +0100)]
PlLogger should be replaced by S::logger().

15 years agoAllows users to add more than one entreprise at the same time (better version).
Stéphane Jacob [Sun, 14 Dec 2008 17:49:32 +0000 (18:49 +0100)]
Allows users to add more than one entreprise at the same time (better version).

15 years agoSymlinks instead of copy.
Florent Bruneau [Sun, 14 Dec 2008 19:53:32 +0000 (20:53 +0100)]
Symlinks instead of copy.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoAllows users to add more than one entreprise at the same time (Ooops).
Stéphane Jacob [Sun, 14 Dec 2008 17:35:42 +0000 (18:35 +0100)]
Allows users to add more than one entreprise at the same time (Ooops).

15 years agoAllows users to add more than one entreprise at the same time.
Stéphane Jacob [Sun, 14 Dec 2008 17:25:42 +0000 (18:25 +0100)]
Allows users to add more than one entreprise at the same time.

15 years agoAdds name suggestions for entreprises in validation interface.
Stéphane Jacob [Sun, 14 Dec 2008 17:23:17 +0000 (18:23 +0100)]
Adds name suggestions for entreprises in validation interface.

15 years agoGets rid of attachEvent.
Stéphane Jacob [Sat, 13 Dec 2008 18:11:55 +0000 (19:11 +0100)]
Gets rid of attachEvent.

15 years agoMerge commit 'origin/master' into fusionax
Stéphane Jacob [Sat, 13 Dec 2008 17:24:35 +0000 (18:24 +0100)]
Merge commit 'origin/master' into fusionax

15 years agoMerge commit 'origin/platal-0.10.0'
Stéphane Jacob [Sat, 13 Dec 2008 17:22:45 +0000 (18:22 +0100)]
Merge commit 'origin/platal-0.10.0'

15 years agoFixes addition of activity sectors in mentor interface.
Stéphane Jacob [Sat, 13 Dec 2008 17:21:29 +0000 (18:21 +0100)]
Fixes addition of activity sectors in mentor interface.

15 years agoMerge commit 'origin/master' into fusionax
Stéphane Jacob [Sat, 13 Dec 2008 17:03:01 +0000 (18:03 +0100)]
Merge commit 'origin/master' into fusionax

15 years agoLogin is more explicit than user_id.
Florent Bruneau [Sat, 13 Dec 2008 12:42:56 +0000 (13:42 +0100)]
Login is more explicit than user_id.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFix double popup.
Florent Bruneau [Sat, 13 Dec 2008 11:47:33 +0000 (12:47 +0100)]
Fix double popup.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFix mass_subscribe.
Florent Bruneau [Sat, 13 Dec 2008 11:30:39 +0000 (12:30 +0100)]
Fix mass_subscribe.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoMerge commit 'origin/platal-0.10.0'
Florent Bruneau [Fri, 12 Dec 2008 13:55:04 +0000 (14:55 +0100)]
Merge commit 'origin/platal-0.10.0'

15 years agoFix SU on skin Sharky.
Florent Bruneau [Fri, 12 Dec 2008 13:52:09 +0000 (14:52 +0100)]
Fix SU on skin Sharky.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFixes the display of aliases on the admin/user/ page.
Vincent Zanotti [Fri, 12 Dec 2008 13:26:40 +0000 (14:26 +0100)]
Fixes the display of aliases on the admin/user/ page.

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
15 years agoFix instantiation of the Platal object in both listes_redirect
Florent Bruneau [Fri, 12 Dec 2008 08:54:30 +0000 (09:54 +0100)]
Fix instantiation of the Platal object in both listes_redirect
(listes.p.org) and webredirect (carva.org).

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFix calls to is_subscription_pending. (Closes:#942).
Florent Bruneau [Fri, 12 Dec 2008 08:52:24 +0000 (09:52 +0100)]
Fix calls to is_subscription_pending. (Closes:#942).

Also add a bit of logging... useful for debugging.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoUse last core.
Florent Bruneau [Thu, 11 Dec 2008 22:09:09 +0000 (23:09 +0100)]
Use last core.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoMerge commit 'origin/platal-0.10.0'
Florent Bruneau [Thu, 11 Dec 2008 22:08:52 +0000 (23:08 +0100)]
Merge commit 'origin/platal-0.10.0'

15 years agoUpdate core (wiki cache fix).
Florent Bruneau [Thu, 11 Dec 2008 22:04:41 +0000 (23:04 +0100)]
Update core (wiki cache fix).

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoTiny fix.
Stéphane Jacob [Thu, 11 Dec 2008 21:52:41 +0000 (22:52 +0100)]
Tiny fix.

15 years agoMerge commit 'origin/platal-0.10.0'
Florent Bruneau [Thu, 11 Dec 2008 21:35:28 +0000 (22:35 +0100)]
Merge commit 'origin/platal-0.10.0'

15 years agoFix hruid update script.
Florent Bruneau [Thu, 11 Dec 2008 21:33:33 +0000 (22:33 +0100)]
Fix hruid update script.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFix URL for rewrite.
Florent Bruneau [Thu, 11 Dec 2008 21:21:39 +0000 (22:21 +0100)]
Fix URL for rewrite.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoPrepare ChangeLog for next version.
Florent Bruneau [Thu, 11 Dec 2008 19:44:01 +0000 (20:44 +0100)]
Prepare ChangeLog for next version.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoPlat/al 0.10.0. xorg/0.10.0
Florent Bruneau [Thu, 11 Dec 2008 19:40:40 +0000 (20:40 +0100)]
Plat/al 0.10.0.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoAdapts advance search for the new job interface.
Stéphane Jacob [Thu, 11 Dec 2008 00:24:20 +0000 (01:24 +0100)]
Adapts advance search for the new job interface.

15 years agoImproves display the job edition interface.
Stéphane Jacob [Wed, 10 Dec 2008 21:56:57 +0000 (22:56 +0100)]
Improves display the job edition interface.

15 years agoDisplay new jobs in the profile.
Stéphane Jacob [Wed, 10 Dec 2008 21:53:29 +0000 (22:53 +0100)]
Display new jobs in the profile.

15 years agoPromo_display small bugfix.
Stéphane Jacob [Wed, 10 Dec 2008 18:25:18 +0000 (19:25 +0100)]
Promo_display small bugfix.

15 years agoAdapts mentoring to the new sectors.
Stéphane Jacob [Wed, 10 Dec 2008 18:23:44 +0000 (19:23 +0100)]
Adapts mentoring to the new sectors.

15 years agoAdapts mentoring to the new sectors.
Stéphane Jacob [Tue, 9 Dec 2008 17:07:54 +0000 (18:07 +0100)]
Adapts mentoring to the new sectors.

15 years agoAllows users to add a new entreprise.
Stéphane Jacob [Mon, 10 Nov 2008 00:37:54 +0000 (01:37 +0100)]
Allows users to add a new entreprise.

15 years agoFixes the email combobox when a new job is added.
Stéphane Jacob [Mon, 8 Dec 2008 00:10:53 +0000 (01:10 +0100)]
Fixes the email combobox when a new job is added.

15 years agoFixes sector and function's display in the profile edition interface.
Stéphane Jacob [Sat, 6 Dec 2008 22:52:50 +0000 (23:52 +0100)]
Fixes sector and function's display in the profile edition interface.

15 years agoFix last session.
Florent Bruneau [Mon, 1 Dec 2008 22:04:52 +0000 (23:04 +0100)]
Fix last session.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoErases a few trailing whitespaces.
Stéphane Jacob [Sun, 16 Nov 2008 09:45:46 +0000 (10:45 +0100)]
Erases a few trailing whitespaces.

15 years agoSplits jobs interface between user and entreprise data, polishes user related part...
Stéphane Jacob [Wed, 5 Nov 2008 23:43:51 +0000 (00:43 +0100)]
Splits jobs interface between user and entreprise data, polishes user related part, updates business sectors, adapts search (Closes #16, Closes #528).

15 years agoMoves phone fetch request into ProfilePhones
Guillaume Bandet [Mon, 8 Dec 2008 13:21:45 +0000 (14:21 +0100)]
Moves phone fetch request into ProfilePhones

Signed-off-by: Guillaume Bandet <guillaume.bandet@polytechnique.org>
15 years agoMore readable administration portal.
Florent Bruneau [Sun, 7 Dec 2008 20:45:15 +0000 (21:45 +0100)]
More readable administration portal.
Add admin/accounts page with a list of all administrators and all disabled
accounts.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoOptimizes the nickname synchronization for GoogleApps by not sending data for disable...
Vincent Zanotti [Sun, 7 Dec 2008 17:33:19 +0000 (18:33 +0100)]
Optimizes the nickname synchronization for GoogleApps by not sending data for disabled accounts.

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
15 years agoTrash dead code.
Florent Bruneau [Sun, 7 Dec 2008 17:32:44 +0000 (18:32 +0100)]
Trash dead code.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoHandle one more special case
Aymeric Augustin [Sun, 7 Dec 2008 17:09:39 +0000 (18:09 +0100)]
Handle one more special case
Extra checks

15 years agoMerge commit 'origin/master' into fusionax
Florent Bruneau [Sun, 7 Dec 2008 15:19:52 +0000 (16:19 +0100)]
Merge commit 'origin/master' into fusionax

Conflicts:

modules/profile/jobs.inc.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFixes sector and function's display in the profile edition interface (Ooops).
Stéphane Jacob [Sun, 7 Dec 2008 15:10:48 +0000 (16:10 +0100)]
Fixes sector and function's display in the profile edition interface (Ooops).

15 years agoFix SUID authentication:
Florent Bruneau [Sun, 7 Dec 2008 11:20:39 +0000 (12:20 +0100)]
Fix SUID authentication:
 * default auth level is AUTH_MDP
 * requested password (if needed) is the password of the administrator

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFixes sector and function's display in the profile edition interface.
Stéphane Jacob [Sat, 6 Dec 2008 22:52:50 +0000 (23:52 +0100)]
Fixes sector and function's display in the profile edition interface.

15 years agoTrim regexps to avoid the 'baldelx' effect.
Florent Bruneau [Tue, 2 Dec 2008 18:07:56 +0000 (19:07 +0100)]
Trim regexps to avoid the 'baldelx' effect.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFix last session.
Florent Bruneau [Mon, 1 Dec 2008 22:04:52 +0000 (23:04 +0100)]
Fix last session.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoDeletes ambiguous explaination text about medals' publicity.
Stéphane Jacob [Fri, 28 Nov 2008 12:19:40 +0000 (13:19 +0100)]
Deletes ambiguous explaination text about medals' publicity.

15 years agoAdds a pop-up when the subject is not filled on the group email interface and sets...
Stéphane Jacob [Thu, 27 Nov 2008 12:33:34 +0000 (13:33 +0100)]
Adds a pop-up when the subject is not filled on the group email interface and sets the default subject to null.

15 years agoMerge commit 'origin/master' into fusionax
Florent Bruneau [Sun, 23 Nov 2008 14:45:04 +0000 (15:45 +0100)]
Merge commit 'origin/master' into fusionax

15 years agoReviewing and slighlty clarifying template for sender address rewriting
Aymeric Augustin [Sat, 22 Nov 2008 13:54:51 +0000 (14:54 +0100)]
Reviewing and slighlty clarifying template for sender address rewriting

15 years agoMerge commit 'origin/master' into fusionax
Florent Bruneau [Sun, 16 Nov 2008 20:54:21 +0000 (21:54 +0100)]
Merge commit 'origin/master' into fusionax

15 years agoImplementation of the logger here.
Florent Bruneau [Sun, 16 Nov 2008 20:46:38 +0000 (21:46 +0100)]
Implementation of the logger here.

WARNING: This breaks compatibility with sessions created by previous
versions of plat/al.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoCosmetics.
Florent Bruneau [Sun, 16 Nov 2008 20:12:08 +0000 (21:12 +0100)]
Cosmetics.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoShould fix the calculation of the number of pages on X.net events admin page (Closes...
Florent Bruneau [Sun, 16 Nov 2008 19:45:55 +0000 (20:45 +0100)]
Should fix the calculation of the number of pages on X.net events admin page (Closes #751)

Grumpf, obfuscated code! (not sure this fix all cases, please test if possible).

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoAdd a message when a user valid his subscription to an event.
Florent Bruneau [Sun, 16 Nov 2008 14:21:26 +0000 (15:21 +0100)]
Add a message when a user valid his subscription to an event.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoOn X.net, sitename is 'Polytechnique.net'.
Florent Bruneau [Sun, 16 Nov 2008 13:04:32 +0000 (14:04 +0100)]
On X.net, sitename is 'Polytechnique.net'.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoConfirming to editorial rules: 'courriel' => 'email'
Florent Bruneau [Sat, 15 Nov 2008 20:11:09 +0000 (21:11 +0100)]
Confirming to editorial rules: 'courriel' => 'email'

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoHop hop hop!!!
Florent Bruneau [Sat, 15 Nov 2008 20:09:33 +0000 (21:09 +0100)]
Hop hop hop!!!

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFix performance issue at session creation.
Florent Bruneau [Sat, 15 Nov 2008 20:00:57 +0000 (21:00 +0100)]
Fix performance issue at session creation.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
15 years agoFixes openweb.css and keynote.css bugs introduced in fd9a8382.
Stéphane Jacob [Sat, 15 Nov 2008 16:51:04 +0000 (17:51 +0100)]
Fixes openweb.css and keynote.css bugs introduced in fd9a8382.

15 years agoAdds picture for the order of St Charles.
Stéphane Jacob [Sat, 15 Nov 2008 16:36:16 +0000 (17:36 +0100)]
Adds picture for the order of St Charles.

15 years agoMerge commit 'origin/master' into fusionax
Florent Bruneau [Sat, 15 Nov 2008 16:12:58 +0000 (17:12 +0100)]
Merge commit 'origin/master' into fusionax

Conflicts:

core

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