platal.git
13 years agoMerge css files.
Florent Bruneau [Thu, 20 Jan 2011 21:18:34 +0000 (22:18 +0100)]
Merge css files.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoUpdate core
Florent Bruneau [Thu, 20 Jan 2011 20:50:12 +0000 (21:50 +0100)]
Update core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoFix download URL for openid.
Florent Bruneau [Wed, 19 Jan 2011 09:53:52 +0000 (10:53 +0100)]
Fix download URL for openid.

Note: PHP-OpenId 2.1.3 is not available anymore. We need to test openid
authentication using the new version of openid.

Note2: Packaging from github suxx: it contains both a version number (in
the URL) and a commit-id (in the package content). This is just
unmaintainable and will break again and again in the future.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoCan add answers to a multiple-choices question.
Florent Bruneau [Tue, 18 Jan 2011 20:48:11 +0000 (21:48 +0100)]
Can add answers to a multiple-choices question.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoBind JS to reloaded questions.
Florent Bruneau [Mon, 17 Jan 2011 20:41:49 +0000 (21:41 +0100)]
Bind JS to reloaded questions.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoIdentation for new mail scheme update script.
Stéphane Jacob [Mon, 17 Jan 2011 18:54:15 +0000 (19:54 +0100)]
Identation for new mail scheme update script.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoIndent, adds keys, fixes new email tables.
Stéphane Jacob [Mon, 10 Jan 2011 23:08:47 +0000 (00:08 +0100)]
Indent, adds keys, fixes new email tables.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoMerge branch 'xorg/1.0.2/master' into xorg/master
Florent Bruneau [Sun, 16 Jan 2011 16:45:48 +0000 (17:45 +0100)]
Merge branch 'xorg/1.0.2/master' into xorg/master

13 years agoMerge branch 'xorg/maint' into xorg/1.0.2/master
Florent Bruneau [Sun, 16 Jan 2011 16:45:30 +0000 (17:45 +0100)]
Merge branch 'xorg/maint' into xorg/1.0.2/master

13 years agoEnsure autocommit is always activated.
Florent Bruneau [Sun, 16 Jan 2011 15:58:52 +0000 (16:58 +0100)]
Ensure autocommit is always activated.

This should have two major consequences:
* the rpc should have a view of the db consistent with the view of the
website
* this should reduce the overall memory footprint of the mysql database
since there is no "in progress transaction" and thus no need to keep old
data in the db.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoI need tracing to debug that one.
Florent Bruneau [Sun, 16 Jan 2011 15:27:15 +0000 (16:27 +0100)]
I need tracing to debug that one.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoStart working on multiple choice questions.
Florent Bruneau [Tue, 11 Jan 2011 22:06:05 +0000 (23:06 +0100)]
Start working on multiple choice questions.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoImproves index page.
Florent Bruneau [Tue, 11 Jan 2011 20:35:04 +0000 (21:35 +0100)]
Improves index page.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoAdd flag inactive that is different from disabled. On the previous DB inactive corres...
João Pedro Athayde Marcondes de André (JP) [Tue, 11 Jan 2011 15:56:31 +0000 (16:56 +0100)]
Add flag inactive that is different from disabled. On the previous DB inactive corresponds to the '' option that is when the user has unmarked the redirection, while disabled is when the administrators have disabled the redirection/mail.

13 years agoOops. I had inversed alias/redirection here...
JP [Tue, 11 Jan 2011 11:29:59 +0000 (12:29 +0100)]
Oops. I had inversed alias/redirection here...

13 years agoSmall typo that caused headaches...
Florent Bruneau [Mon, 10 Jan 2011 21:09:14 +0000 (22:09 +0100)]
Small typo that caused headaches...

Because of this typo, edition of an existing survey was not possible.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoUpdates ChangeLog.
Stéphane Jacob [Mon, 10 Jan 2011 14:31:30 +0000 (15:31 +0100)]
Updates ChangeLog.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoFixes contact pdf export with pictures (Closes #1139).
Stéphane Jacob [Mon, 10 Jan 2011 20:07:47 +0000 (21:07 +0100)]
Fixes contact pdf export with pictures (Closes #1139).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoUpdates Core.
Stéphane Jacob [Mon, 10 Jan 2011 20:07:10 +0000 (21:07 +0100)]
Updates Core.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoAdapts default picture to main education - picture by Kithyane (Closes #1270).
Stéphane Jacob [Mon, 10 Jan 2011 09:46:00 +0000 (10:46 +0100)]
Adapts default picture to main education - picture by Kithyane (Closes #1270).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoAlso merges masters and doctorates info; XXX: to be removed if we don't get the M...
Stéphane Jacob [Sun, 9 Jan 2011 15:33:35 +0000 (16:33 +0100)]
Also merges masters and doctorates info; XXX: to be removed if we don't get the M/D list before the merge.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoFixes csv downloading with IE8 (Closes #1325)
Stéphane Jacob [Sun, 9 Jan 2011 13:53:22 +0000 (14:53 +0100)]
Fixes csv downloading with IE8 (Closes #1325)

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoCan save a new survey \o/
Florent Bruneau [Sun, 9 Jan 2011 21:55:43 +0000 (22:55 +0100)]
Can save a new survey \o/

Still some bugs, but, hey, you can propose a survey and vote.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoAdd labels.
Florent Bruneau [Sun, 9 Jan 2011 19:51:05 +0000 (20:51 +0100)]
Add labels.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoLot of improvements of the survey edition form.
Florent Bruneau [Sun, 9 Jan 2011 18:54:50 +0000 (19:54 +0100)]
Lot of improvements of the survey edition form.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoBases of survey edition interface.
Florent Bruneau [Sun, 9 Jan 2011 16:00:31 +0000 (17:00 +0100)]
Bases of survey edition interface.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoDatepicker translation, minor theming improvements.
Florent Bruneau [Sun, 9 Jan 2011 12:26:32 +0000 (13:26 +0100)]
Datepicker translation, minor theming improvements.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoUses Post dedicated trim function when possible.
Stéphane Jacob [Sun, 9 Jan 2011 01:21:46 +0000 (02:21 +0100)]
Uses Post dedicated trim function when possible.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoAllows email edition before mailing list validation (Closes #1371).
Stéphane Jacob [Sun, 9 Jan 2011 01:16:33 +0000 (02:16 +0100)]
Allows email edition before mailing list validation (Closes #1371).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoAdd survey edition form (lost a lot of time theming datepicker).
Florent Bruneau [Sat, 8 Jan 2011 22:19:55 +0000 (23:19 +0100)]
Add survey edition form (lost a lot of time theming datepicker).

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoCleanup gitignore.
Florent Bruneau [Sat, 8 Jan 2011 20:21:48 +0000 (21:21 +0100)]
Cleanup gitignore.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoCleanup javascript again.
Florent Bruneau [Sat, 8 Jan 2011 20:06:46 +0000 (21:06 +0100)]
Cleanup javascript again.

* include core.js
* fix line encoding of sha1.js/secure_hash.js and merge the files
* update code to use $.dynPost() instead of dynpost and dynpostkv

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoSmall improvements.
Florent Bruneau [Sat, 8 Jan 2011 19:01:50 +0000 (20:01 +0100)]
Small improvements.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoRewrite form generation.
Florent Bruneau [Sat, 8 Jan 2011 15:18:11 +0000 (16:18 +0100)]
Rewrite form generation.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoMerge close_on_esc.js into xorg.js.
Florent Bruneau [Sat, 8 Jan 2011 11:46:12 +0000 (12:46 +0100)]
Merge close_on_esc.js into xorg.js.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoRemoves duplicated city and postal code in vcard addresses (Closes #1322).
Stéphane Jacob [Fri, 7 Jan 2011 23:26:45 +0000 (00:26 +0100)]
Removes duplicated city and postal code in vcard addresses (Closes #1322).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoDisplays email aliases in vcards when public (Closes #1323).
Stéphane Jacob [Fri, 7 Jan 2011 23:06:01 +0000 (00:06 +0100)]
Displays email aliases in vcards when public (Closes #1323).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoFixes display of payments on xnet (Closes #1290).
Stéphane Jacob [Fri, 7 Jan 2011 20:18:23 +0000 (21:18 +0100)]
Fixes display of payments on xnet (Closes #1290).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoSimplify js.
Florent Bruneau [Fri, 7 Jan 2011 20:14:06 +0000 (21:14 +0100)]
Simplify js.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoUpdate core
Florent Bruneau [Fri, 7 Jan 2011 20:14:01 +0000 (21:14 +0100)]
Update core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoFixes menu when changing rights in Xnet (Closes #1347).
Stéphane Jacob [Fri, 7 Jan 2011 15:31:30 +0000 (16:31 +0100)]
Fixes menu when changing rights in Xnet (Closes #1347).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoUpdates core.
Stéphane Jacob [Fri, 7 Jan 2011 14:44:27 +0000 (15:44 +0100)]
Updates core.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoAdds explaination about job keywords in profile edition (Closes #1288).
Stéphane Jacob [Fri, 7 Jan 2011 14:31:37 +0000 (15:31 +0100)]
Adds explaination about job keywords in profile edition (Closes #1288).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoHTML validation.
Stéphane Jacob [Fri, 7 Jan 2011 14:13:25 +0000 (15:13 +0100)]
HTML validation.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoMerge branch 'xorg/1.0.2/master' into xorg/master
Stéphane Jacob [Fri, 7 Jan 2011 14:05:56 +0000 (15:05 +0100)]
Merge branch 'xorg/1.0.2/master' into xorg/master

13 years agoRemoves erroneous field addition.
Stéphane Jacob [Fri, 7 Jan 2011 14:05:17 +0000 (15:05 +0100)]
Removes erroneous field addition.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoMerge branch 'xorg/1.0.2/master' into xorg/master
Stéphane Jacob [Fri, 7 Jan 2011 14:02:04 +0000 (15:02 +0100)]
Merge branch 'xorg/1.0.2/master' into xorg/master

13 years agoOops.
Stéphane Jacob [Fri, 7 Jan 2011 10:31:57 +0000 (11:31 +0100)]
Oops.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoAdministrations pages for country and language edition (Closes #1320).
Stéphane Jacob [Fri, 7 Jan 2011 06:36:18 +0000 (07:36 +0100)]
Administrations pages for country and language edition (Closes #1320).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoAdds connect.db.inc.php to upgrade/1.1.0.
Stéphane Jacob [Wed, 5 Jan 2011 17:54:17 +0000 (18:54 +0100)]
Adds connect.db.inc.php to upgrade/1.1.0.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoUpdates language table for better compatibility with iso codes.
Stéphane Jacob [Wed, 5 Jan 2011 17:17:46 +0000 (18:17 +0100)]
Updates language table for better compatibility with iso codes.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoDisplays and compares our country and language lists with iso lists.
Stéphane Jacob [Wed, 5 Jan 2011 15:13:36 +0000 (16:13 +0100)]
Displays and compares our country and language lists with iso lists.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoAdds error, warning, valid cells for (tiny)bicol tables.
Stéphane Jacob [Wed, 5 Jan 2011 15:11:38 +0000 (16:11 +0100)]
Adds error, warning, valid cells for (tiny)bicol tables.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoRemoves useless getters from Phone class.
Stéphane Jacob [Mon, 3 Jan 2011 23:55:18 +0000 (00:55 +0100)]
Removes useless getters from Phone class.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoHappy New Year!
Florent Bruneau [Tue, 4 Jan 2011 20:51:37 +0000 (21:51 +0100)]
Happy New Year!

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoImplements the first API handler (/api/1/user/<user>/isRegistered). It
Vincent Zanotti [Mon, 3 Jan 2011 20:10:37 +0000 (21:10 +0100)]
Implements the first API handler (/api/1/user/<user>/isRegistered). It
is associated with a new permission, which can only be set as an
additonal permission for existing users (accounts.user_perms).

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
13 years agoImplements PlSession::apiAuth. The authentication is based on a HMAC
Vincent Zanotti [Mon, 3 Jan 2011 20:08:48 +0000 (21:08 +0100)]
Implements PlSession::apiAuth. The authentication is based on a HMAC
signature, which takes into account the resource, the payload, and the
current timestamp.

It effectively blocks any replay beyond "the same method, within 10
seconds", which is deemed an acceptable risk, as long as API methods are
idempotent.

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
13 years agoFixes section display in vcard.
Stéphane Jacob [Mon, 3 Jan 2011 21:59:13 +0000 (22:59 +0100)]
Fixes section display in vcard.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoFixes group display in vcard.
Stéphane Jacob [Mon, 3 Jan 2011 21:58:55 +0000 (22:58 +0100)]
Fixes group display in vcard.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoAdds custom welcome message for group subscription (Closes #1230).
Stéphane Jacob [Mon, 3 Jan 2011 20:17:04 +0000 (21:17 +0100)]
Adds custom welcome message for group subscription (Closes #1230).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoGives choice for event subscribtion notification: event creator, group animators...
Stéphane Jacob [Mon, 3 Jan 2011 18:28:46 +0000 (19:28 +0100)]
Gives choice for event subscribtion notification: event creator, group animators, both or nobody (Closes #1233).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoNotifies group admins and event creator when someone subscribes to it.
Stéphane Jacob [Mon, 3 Jan 2011 18:05:19 +0000 (19:05 +0100)]
Notifies group admins and event creator when someone subscribes to it.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoReverting the update of core, I was fooled by git-commit -as.
Vincent Zanotti [Mon, 3 Jan 2011 14:50:52 +0000 (15:50 +0100)]
Reverting the update of core, I was fooled by git-commit -as.

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
13 years agoChanges the permissions for the GoogleApps handler to 'mail', since it
Vincent Zanotti [Mon, 3 Jan 2011 14:48:59 +0000 (15:48 +0100)]
Changes the permissions for the GoogleApps handler to 'mail', since it
doesn't work yet for masters/PhDs.

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
13 years agoUpdates the hooks in module/carnet.php to use the new PlTokenHook.
Vincent Zanotti [Sat, 1 Jan 2011 23:20:58 +0000 (00:20 +0100)]
Updates the hooks in module/carnet.php to use the new PlTokenHook.

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
13 years agoTranslates comments in BPLCCyberPlus class.
Stéphane Jacob [Mon, 3 Jan 2011 13:50:30 +0000 (14:50 +0100)]
Translates comments in BPLCCyberPlus class.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoPrevents warning in PayPal payments for user without profiles.
Stéphane Jacob [Mon, 3 Jan 2011 13:20:46 +0000 (14:20 +0100)]
Prevents warning in PayPal payments for user without profiles.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoMerge branch 'xorg/1.0.2/master' into xorg/master
Stéphane Jacob [Mon, 3 Jan 2011 12:30:33 +0000 (13:30 +0100)]
Merge branch 'xorg/1.0.2/master' into xorg/master

13 years agoFixes indent in BPLCCyberPlus class.
Stéphane Jacob [Mon, 3 Jan 2011 12:29:07 +0000 (13:29 +0100)]
Fixes indent in BPLCCyberPlus class.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoFixes HTML validation and user's sex retrieval in payment.
Stéphane Jacob [Mon, 3 Jan 2011 12:23:15 +0000 (13:23 +0100)]
Fixes HTML validation and user's sex retrieval in payment.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoFixes PHP errors in PayPal payments (Closes #1318).
Stéphane Jacob [Mon, 3 Jan 2011 12:22:12 +0000 (13:22 +0100)]
Fixes PHP errors in PayPal payments (Closes #1318).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoImproves Geocoder::getFirstLines to prevent warnings and unwanted \r.
Stéphane Jacob [Mon, 3 Jan 2011 12:20:22 +0000 (13:20 +0100)]
Improves Geocoder::getFirstLines to prevent warnings and unwanted \r.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoFixes errors in geocoder.
Stéphane Jacob [Mon, 3 Jan 2011 11:49:07 +0000 (12:49 +0100)]
Fixes errors in geocoder.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoMerge remote branch 'origin/xorg/1.0.2/master' into xorg/master
Florent Bruneau [Sun, 2 Jan 2011 20:08:54 +0000 (21:08 +0100)]
Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master

13 years agoMerge remote branch 'origin/xorg/maint' into xorg/1.0.2/master
Florent Bruneau [Sun, 2 Jan 2011 20:07:59 +0000 (21:07 +0100)]
Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master

13 years agoFix error in RPC.
Florent Bruneau [Sun, 2 Jan 2011 17:07:22 +0000 (18:07 +0100)]
Fix error in RPC.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoML-List errors during registration are non-fatal (but still logged).
Florent Bruneau [Sun, 2 Jan 2011 17:02:46 +0000 (18:02 +0100)]
ML-List errors during registration are non-fatal (but still logged).

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoDisplays group positions on group's main page.
Stéphane Jacob [Sat, 1 Jan 2011 12:48:05 +0000 (13:48 +0100)]
Displays group positions on group's main page.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoNotifies group position modification success.
Stéphane Jacob [Fri, 31 Dec 2010 18:44:14 +0000 (19:44 +0100)]
Notifies group position modification success.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoAdds positions for group members.
Stéphane Jacob [Fri, 31 Dec 2010 17:39:48 +0000 (18:39 +0100)]
Adds positions for group members.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoFixes comment display in payment email (Closes #1375).
Stéphane Jacob [Fri, 31 Dec 2010 11:57:03 +0000 (12:57 +0100)]
Fixes comment display in payment email (Closes #1375).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoAdds AX approval date to groups.
Stéphane Jacob [Thu, 30 Dec 2010 22:45:09 +0000 (23:45 +0100)]
Adds AX approval date to groups.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoEnables email services for masters and doctorates.
Stéphane Jacob [Thu, 30 Dec 2010 18:22:26 +0000 (19:22 +0100)]
Enables email services for masters and doctorates.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoMerge branch 'xorg/1.0.2/master' into xorg/master
Stéphane Jacob [Thu, 30 Dec 2010 18:15:38 +0000 (19:15 +0100)]
Merge branch 'xorg/1.0.2/master' into xorg/master

13 years agoUpdates ChangeLog.
Stéphane Jacob [Thu, 30 Dec 2010 17:16:48 +0000 (18:16 +0100)]
Updates ChangeLog.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoDo not show or propose email services to masters and doctorants for now (Closes ...
Stéphane Jacob [Thu, 30 Dec 2010 14:06:10 +0000 (15:06 +0100)]
Do not show or propose email services to masters and doctorants for now (Closes #1374, XXX: to be removed once they get access to these services).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoMerge branch 'xorg/1.0.2/master' into xorg/master
Raphaël Barrois [Wed, 29 Dec 2010 23:10:59 +0000 (00:10 +0100)]
Merge branch 'xorg/1.0.2/master' into xorg/master

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoAdds 'by AX id' advanced search for admins (Closes #1366)
Raphaël Barrois [Tue, 28 Dec 2010 16:05:09 +0000 (17:05 +0100)]
Adds 'by AX id' advanced search for admins (Closes #1366)

This field is only available for X.org admins and AX secretaries.

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoSplit the SearchSet into QuickSet and AdvancedSet
Raphaël Barrois [Tue, 28 Dec 2010 15:37:17 +0000 (16:37 +0100)]
Split the SearchSet into QuickSet and AdvancedSet

Also move the 'not registered' field for quicksearch into the UFB_Quick.

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoUpdate UFC_SchoolId arguments
Raphaël Barrois [Tue, 28 Dec 2010 15:19:18 +0000 (16:19 +0100)]
Update UFC_SchoolId arguments

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoMerge branch 'xorg/1.0.2/master'
Stéphane Jacob [Wed, 29 Dec 2010 01:40:59 +0000 (02:40 +0100)]
Merge branch 'xorg/1.0.2/master'

13 years agoAdds search on subadministrativearea (Closes #1312).
Stéphane Jacob [Wed, 29 Dec 2010 01:07:27 +0000 (02:07 +0100)]
Adds search on subadministrativearea (Closes #1312).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoAdds adminarea to geoloac_subadministrativearea.
Stéphane Jacob [Wed, 29 Dec 2010 01:28:00 +0000 (02:28 +0100)]
Adds adminarea to geoloac_subadministrativearea.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoMerge remote branch 'origin/xorg/1.0.2/master' into xorg/master
Florent Bruneau [Tue, 28 Dec 2010 21:21:30 +0000 (22:21 +0100)]
Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master

Conflicts:
templates/skin/common.title.header.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoMerge remote branch 'origin/xorg/maint' into xorg/1.0.2/master
Florent Bruneau [Tue, 28 Dec 2010 21:20:06 +0000 (22:20 +0100)]
Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master

13 years agoFix error case.
Florent Bruneau [Tue, 28 Dec 2010 21:13:41 +0000 (22:13 +0100)]
Fix error case.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoFix double html-encoding.
Florent Bruneau [Tue, 28 Dec 2010 21:09:33 +0000 (22:09 +0100)]
Fix double html-encoding.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoFix subscription to promotion list during registration.
Florent Bruneau [Tue, 28 Dec 2010 20:57:51 +0000 (21:57 +0100)]
Fix subscription to promotion list during registration.

The actual bug seems to be a synchronisation issue while querying the db
from the RPC: the registration of the user does not seem to be seen by the
RPC. The fix add an explicit transaction around some queries. It also
fixes the name of the list...

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoPrint more informations.
Florent Bruneau [Tue, 28 Dec 2010 20:57:37 +0000 (21:57 +0100)]
Print more informations.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoFix user unsubscription.
Florent Bruneau [Tue, 28 Dec 2010 20:57:04 +0000 (21:57 +0100)]
Fix user unsubscription.

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