platal.git
13 years agoMerge remote branch 'origin/platal-1.0.1'
Florent Bruneau [Fri, 5 Nov 2010 22:15:23 +0000 (23:15 +0100)]
Merge remote branch 'origin/platal-1.0.1'

13 years agoUpdate following core@7da01959a.
Florent Bruneau [Fri, 5 Nov 2010 22:14:14 +0000 (23:14 +0100)]
Update following core@7da01959a.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoStub of the new surveys.
Florent Bruneau [Sat, 30 Oct 2010 21:03:45 +0000 (23:03 +0200)]
Stub of the new surveys.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoMinimum hacking to have a working site.
Florent Bruneau [Fri, 5 Nov 2010 21:08:37 +0000 (22:08 +0100)]
Minimum hacking to have a working site.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoFixes advanced form js in IE7. Closes #1313.
Pascal Corpet [Fri, 5 Nov 2010 20:58:28 +0000 (21:58 +0100)]
Fixes advanced form js in IE7. Closes #1313.

13 years agoAdd support for 'numeric' lists names (e.g 2009@faerix.p.org)
Raphaël Barrois [Fri, 5 Nov 2010 20:14:38 +0000 (21:14 +0100)]
Add support for 'numeric' lists names (e.g 2009@faerix.p.org)

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoIncreases allowed email size up to the new size in the new table (Closes #1201).
Stéphane Jacob [Thu, 4 Nov 2010 15:51:32 +0000 (16:51 +0100)]
Increases allowed email size up to the new size in the new table (Closes #1201).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoUpdates core.
Stéphane Jacob [Thu, 4 Nov 2010 11:34:49 +0000 (12:34 +0100)]
Updates core.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoCorrect fix for register emails
Raphaël Barrois [Thu, 4 Nov 2010 10:28:43 +0000 (11:28 +0100)]
Correct fix for register emails

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoFix send/to for "register success" emails.
Raphaël Barrois [Thu, 4 Nov 2010 10:16:22 +0000 (11:16 +0100)]
Fix send/to for "register success" emails.

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoAdds missing array declaration.
Stéphane Jacob [Thu, 4 Nov 2010 09:34:31 +0000 (10:34 +0100)]
Adds missing array declaration.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoCleaner queries while sending NL
Raphaël Barrois [Wed, 3 Nov 2010 22:13:48 +0000 (23:13 +0100)]
Cleaner queries while sending NL

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoMerge remote branch 'origin/platal-1.0.1'
Stéphane Jacob [Tue, 2 Nov 2010 21:46:27 +0000 (22:46 +0100)]
Merge remote branch 'origin/platal-1.0.1'

13 years agoShows progress after every geocoding.
Stéphane Jacob [Tue, 2 Nov 2010 19:08:09 +0000 (20:08 +0100)]
Shows progress after every geocoding.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoProperly reorganises merge issues related scripts.
Stéphane Jacob [Tue, 2 Nov 2010 18:18:58 +0000 (19:18 +0100)]
Properly reorganises merge issues related scripts.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoImproves a bit more the script about merge issues linked to phone.
Stéphane Jacob [Tue, 2 Nov 2010 17:41:21 +0000 (18:41 +0100)]
Improves a bit more the script about merge issues linked to phone.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoImproves and fixes script about merge issues linked to addresses.
Stéphane Jacob [Tue, 2 Nov 2010 17:40:54 +0000 (18:40 +0100)]
Improves and fixes script about merge issues linked to addresses.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoImproves and fixes script about merge issues linked to phone.
Stéphane Jacob [Tue, 2 Nov 2010 11:01:38 +0000 (12:01 +0100)]
Improves and fixes script about merge issues linked to phone.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoFix promo inscription
Raphaël Barrois [Tue, 2 Nov 2010 15:42:46 +0000 (16:42 +0100)]
Fix promo inscription

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoDisplays degree on profile edition even if university is missing.
Stéphane Jacob [Mon, 1 Nov 2010 22:17:05 +0000 (23:17 +0100)]
Displays degree on profile edition even if university is missing.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoPrevents empty education inclusions.
Stéphane Jacob [Mon, 1 Nov 2010 21:52:01 +0000 (22:52 +0100)]
Prevents empty education inclusions.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoIncludes AX couple (university, degree), fixes issue with duplicated Stuttgart Uniersity.
Stéphane Jacob [Mon, 1 Nov 2010 20:42:01 +0000 (21:42 +0100)]
Includes AX couple (university, degree), fixes issue with duplicated Stuttgart Uniersity.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoA few fixes in ax table creation (forces charset, increases text size, updates univer...
Stéphane Jacob [Mon, 1 Nov 2010 20:40:52 +0000 (21:40 +0100)]
A few fixes in ax table creation (forces charset, increases text size, updates universities name).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoAdds education verifications before merge.
Stéphane Jacob [Mon, 1 Nov 2010 20:39:18 +0000 (21:39 +0100)]
Adds education verifications before merge.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoNew script for formatting AX education.
Stéphane Jacob [Mon, 1 Nov 2010 16:30:08 +0000 (17:30 +0100)]
New script for formatting AX education.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoReorganize new_mail sql files.
Florent Bruneau [Sun, 31 Oct 2010 08:21:08 +0000 (09:21 +0100)]
Reorganize new_mail sql files.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoNew action "imap_and_bounce" to simplify e-mail routing logic.
Bernardo Freitas Paulo da Costa [Sat, 30 Oct 2010 23:12:31 +0000 (01:12 +0200)]
New action "imap_and_bounce" to simplify e-mail routing logic.

Any modifications that would result in a situation like the one here
searched for (that is, one user whose only active redirection is
"imap") must have the action of his imap redirection changed to
"imap_and_bounce".

modified:   01_new_mail.sql
new file:   02_imap_and_bounce.sql

13 years agoCorrect errors noticed on importing table
João Pedro Athayde Marcondes de André (JP) [Sat, 30 Oct 2010 22:58:54 +0000 (00:58 +0200)]
Correct errors noticed on importing table

13 years agoSpacing
João Pedro Athayde Marcondes de André (JP) [Sat, 30 Oct 2010 21:52:58 +0000 (23:52 +0200)]
Spacing

13 years agoSeparate email_redirect table in two parts : account and others. This should allow...
João Pedro Athayde Marcondes de André (JP) [Sat, 30 Oct 2010 21:52:32 +0000 (23:52 +0200)]
Separate email_redirect table in two parts : account and others. This should allow us to add some FKs

13 years agoChange table names
João Pedro Athayde Marcondes de André (JP) [Sat, 30 Oct 2010 21:16:06 +0000 (23:16 +0200)]
Change table names
email_account_emails -> email_source_account
email_nonaccount_emails -> email_source_other

13 years agopfix_hruid->hrmid
João Pedro Athayde Marcondes de André (JP) [Sat, 30 Oct 2010 21:01:25 +0000 (23:01 +0200)]
pfix_hruid->hrmid

13 years agoAs the email fields from the other tables are called email I am changing the email_vi...
João Pedro Athayde Marcondes de André (JP) [Sat, 30 Oct 2010 19:57:16 +0000 (21:57 +0200)]
As the email fields from the other tables are called email I am changing the email_virtual field name from alias to email

13 years agoAdd drop tables
João Pedro Athayde Marcondes de André (JP) [Sat, 30 Oct 2010 19:51:00 +0000 (21:51 +0200)]
Add drop tables

13 years agoChange names to english
João Pedro Athayde Marcondes de André (JP) [Sat, 30 Oct 2010 19:50:44 +0000 (21:50 +0200)]
Change names to english

13 years agoChange position of email_virtual_domains following organization from previous commit
João Pedro Athayde Marcondes de André (JP) [Sat, 30 Oct 2010 19:50:03 +0000 (21:50 +0200)]
Change position of email_virtual_domains following organization from previous commit

13 years agoMinor enhancements to new_mail script.
Florent Bruneau [Sat, 30 Oct 2010 16:54:00 +0000 (18:54 +0200)]
Minor enhancements to new_mail script.

Only cosmetics here.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoUpgrade jquery for next release.
Florent Bruneau [Sat, 30 Oct 2010 14:11:45 +0000 (16:11 +0200)]
Upgrade jquery for next release.

jQuery from 1.4.2 to 1.4.3
jQuery UI: from 1.6 to 1.8.5 (minified)

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoMerge remote branch 'origin/platal-1.0.1'
Florent Bruneau [Sat, 30 Oct 2010 13:16:30 +0000 (15:16 +0200)]
Merge remote branch 'origin/platal-1.0.1'

13 years agoAvoid double transaction.
Florent Bruneau [Sat, 30 Oct 2010 07:27:37 +0000 (09:27 +0200)]
Avoid double transaction.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoTypo in cron for profile modifications
Bernardo Freitas Paulo da Costa [Fri, 29 Oct 2010 21:28:26 +0000 (23:28 +0200)]
Typo in cron for profile modifications

13 years agoMerge remote branch 'origin/platal-1.0.1'
Florent Bruneau [Thu, 28 Oct 2010 21:13:39 +0000 (23:13 +0200)]
Merge remote branch 'origin/platal-1.0.1'

13 years agoUpdate core
Florent Bruneau [Thu, 28 Oct 2010 21:13:23 +0000 (23:13 +0200)]
Update core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoUpdate core
Florent Bruneau [Thu, 28 Oct 2010 21:05:12 +0000 (23:05 +0200)]
Update core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoMerge remote branch 'origin/platal-1.0.1'
Florent Bruneau [Thu, 28 Oct 2010 20:49:07 +0000 (22:49 +0200)]
Merge remote branch 'origin/platal-1.0.1'

13 years agoReal id for the security fix.
Florent Bruneau [Thu, 28 Oct 2010 20:47:54 +0000 (22:47 +0200)]
Real id for the security fix.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoRegistration allowed reactivation and resetting password of disabled
Florent Bruneau [Thu, 28 Oct 2010 20:44:25 +0000 (22:44 +0200)]
Registration allowed reactivation and resetting password of disabled
accounts.

Registration didn't correctly check that the account was in 'pending'
state allowing a user to complete the first steps of the procedure before
falling on a SQL error on register/end. But, before the error,
register/end had time to update the state of the accounts table setting:
 - the new password (the one defined during the registration procedure)
 - the state to 'active'
 - the registration state

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoOnly gives number of occurencies in profile_merge_issues when database check is verbo...
Stéphane Jacob [Thu, 28 Oct 2010 14:09:30 +0000 (16:09 +0200)]
Only gives number of occurencies in profile_merge_issues when database check is verbose and when it is not empty.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoOnly sends profile modification notification emails if there are some modifications.
Stéphane Jacob [Thu, 28 Oct 2010 07:06:26 +0000 (09:06 +0200)]
Only sends profile modification notification emails if there are some modifications.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoFixes NL article insertion.
Stéphane Jacob [Wed, 27 Oct 2010 12:38:21 +0000 (14:38 +0200)]
Fixes NL article insertion.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoEnables access to profile edition pages without providing hrpid, or providing hrpid...
Stéphane Jacob [Wed, 27 Oct 2010 12:23:20 +0000 (14:23 +0200)]
Enables access to profile edition pages without providing hrpid, or providing hrpid and page name in the wrong order.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoDistinguish the postfix hruid fields from the site hruid fields
João Pedro Athayde Marcondes de André (JP) [Sun, 24 Oct 2010 19:45:55 +0000 (21:45 +0200)]
Distinguish the postfix hruid fields from the site hruid fields

13 years agoFixes vcard export (Closes #1296).
Stéphane Jacob [Wed, 27 Oct 2010 11:47:17 +0000 (13:47 +0200)]
Fixes vcard export (Closes #1296).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoFixes jobs addresses.
Stéphane Jacob [Wed, 27 Oct 2010 08:50:52 +0000 (10:50 +0200)]
Fixes jobs addresses.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoFixes wrong foreach use.
Stéphane Jacob [Wed, 27 Oct 2010 08:27:14 +0000 (10:27 +0200)]
Fixes wrong foreach use.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoRemoves misplaced t() (Closes #1294).
Stéphane Jacob [Wed, 27 Oct 2010 07:58:30 +0000 (09:58 +0200)]
Removes misplaced t() (Closes #1294).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoImprove fixes on admin/logger page; remove smarty warnings.
Raphaël Barrois [Tue, 26 Oct 2010 22:18:24 +0000 (00:18 +0200)]
Improve fixes on admin/logger page; remove smarty warnings.

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoFix MySQL query on payment (uid became ambiguous)
Raphaël Barrois [Tue, 26 Oct 2010 22:07:31 +0000 (00:07 +0200)]
Fix MySQL query on payment (uid became ambiguous)

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoFix admin/logger page when no user has been selected.
Raphaël Barrois [Tue, 26 Oct 2010 21:56:29 +0000 (23:56 +0200)]
Fix admin/logger page when no user has been selected.

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoFix smarty escaping problem in common skin
Raphaël Barrois [Tue, 26 Oct 2010 21:51:34 +0000 (23:51 +0200)]
Fix smarty escaping problem in common skin

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoSet memory_limit to 64M and disable debug (and backtraces) in CLI scripts.
Florent Bruneau [Tue, 26 Oct 2010 20:14:59 +0000 (22:14 +0200)]
Set memory_limit to 64M and disable debug (and backtraces) in CLI scripts.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoMerge remote branch 'origin/platal-1.0.1'
Florent Bruneau [Tue, 26 Oct 2010 20:11:00 +0000 (22:11 +0200)]
Merge remote branch 'origin/platal-1.0.1'

Conflicts:
ChangeLog
core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoRelease platal 1.0.1. xorg/1.0.1
Florent Bruneau [Tue, 26 Oct 2010 17:42:57 +0000 (19:42 +0200)]
Release platal 1.0.1.

Notable changes:
 - prepare merge of the directories from X.org and the AX
 - interface has been tweaked in order to allow access for non-X
 - *lot* of bug fixes in profile and search

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoUpdate core
Florent Bruneau [Tue, 26 Oct 2010 17:42:28 +0000 (19:42 +0200)]
Update core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoReminder for merge issues.
Florent Bruneau [Tue, 26 Oct 2010 13:17:00 +0000 (15:17 +0200)]
Reminder for merge issues.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoFixes nationalities merge.
Stéphane Jacob [Tue, 26 Oct 2010 09:14:33 +0000 (11:14 +0200)]
Fixes nationalities merge.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoFixes empty moderator name in validation email (Closes #1293).
Stéphane Jacob [Tue, 26 Oct 2010 08:56:16 +0000 (10:56 +0200)]
Fixes empty moderator name in validation email (Closes #1293).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agojobterms fix: JsON validation
Pascal Corpet [Tue, 26 Oct 2010 07:17:04 +0000 (09:17 +0200)]
jobterms fix: JsON validation

13 years agoFixes merge conflict pages.
Stéphane Jacob [Mon, 25 Oct 2010 22:39:38 +0000 (00:39 +0200)]
Fixes merge conflict pages.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoFixes some PHP notice (debug & 4 != 0)
Pascal Corpet [Mon, 25 Oct 2010 22:35:45 +0000 (00:35 +0200)]
Fixes some PHP notice (debug & 4 != 0)

13 years agoSplit merge_issues.php into two to fix merges faster.
Stéphane Jacob [Mon, 25 Oct 2010 21:55:59 +0000 (23:55 +0200)]
Split merge_issues.php into two to fix merges faster.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoCloses #1283 : restricts second operation on promo search
Pascal Corpet [Mon, 25 Oct 2010 20:55:45 +0000 (22:55 +0200)]
Closes #1283 : restricts second operation on promo search

13 years agoAdds partial tree for jobterms if autocompletion is not enough. Only in profile editing.
Pascal Corpet [Fri, 22 Oct 2010 20:35:35 +0000 (22:35 +0200)]
Adds partial tree for jobterms if autocompletion is not enough. Only in profile editing.

13 years agoFixes typo (== instead of =)
Pascal Corpet [Mon, 25 Oct 2010 18:36:36 +0000 (20:36 +0200)]
Fixes typo (== instead of =)

13 years agoFix HTML
Pascal Corpet [Fri, 22 Oct 2010 20:54:29 +0000 (22:54 +0200)]
Fix HTML

13 years agoPrevents joins in merge.php.
Stéphane Jacob [Mon, 25 Oct 2010 13:27:17 +0000 (15:27 +0200)]
Prevents joins in merge.php.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoFixes after merge cleanup script.
Stéphane Jacob [Mon, 25 Oct 2010 12:21:55 +0000 (14:21 +0200)]
Fixes after merge cleanup script.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoMerge remote branch 'origin/platal-1.0.0' into platal-1.0.1
Florent Bruneau [Mon, 25 Oct 2010 12:17:55 +0000 (14:17 +0200)]
Merge remote branch 'origin/platal-1.0.0' into platal-1.0.1

13 years agoFixes merge.php (it now works properly in a reasonable time).
Stéphane Jacob [Mon, 25 Oct 2010 12:10:25 +0000 (14:10 +0200)]
Fixes merge.php (it now works properly in a reasonable time).

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoFixes a typo bug (== instead of =) in contacts/csv/birthday
Pascal Corpet [Mon, 25 Oct 2010 08:54:39 +0000 (10:54 +0200)]
Fixes a typo bug (== instead of =) in contacts/csv/birthday

13 years agoA few fixes on how to deal with AX export.
Stéphane Jacob [Sun, 24 Oct 2010 14:46:29 +0000 (16:46 +0200)]
A few fixes on how to deal with AX export.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoUpdate ChangeLog
Florent Bruneau [Sun, 24 Oct 2010 13:59:37 +0000 (15:59 +0200)]
Update ChangeLog

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoAlways allow the creator of the survey to view the results (Closes #1282)
Florent Bruneau [Sun, 24 Oct 2010 13:57:42 +0000 (15:57 +0200)]
Always allow the creator of the survey to view the results (Closes #1282)

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoSwitches all tables to InnoDB.
Stéphane Jacob [Sat, 23 Oct 2010 15:18:07 +0000 (17:18 +0200)]
Switches all tables to InnoDB.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoTry to detect real, current location of users in minifiche.
Raphaël Barrois [Thu, 21 Oct 2010 19:52:29 +0000 (21:52 +0200)]
Try to detect real, current location of users in minifiche.

Previous behaviour for 'getMainAddress' was to fetch the first among all
current/home addresses, even if that address was a secondary / temporary
address.

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoA few fixes on upgrade scripts.
Stéphane Jacob [Thu, 21 Oct 2010 12:08:48 +0000 (14:08 +0200)]
A few fixes on upgrade scripts.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoUncomment foreign keys.
Stéphane Jacob [Thu, 21 Oct 2010 07:50:52 +0000 (09:50 +0200)]
Uncomment foreign keys.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoAdds script to switch sql engine to InnoDB.
Stéphane Jacob [Thu, 21 Oct 2010 07:50:04 +0000 (09:50 +0200)]
Adds script to switch sql engine to InnoDB.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoAdds script for phones and addresses formatting after the merge.
Stéphane Jacob [Wed, 20 Oct 2010 12:50:48 +0000 (14:50 +0200)]
Adds script for phones and addresses formatting after the merge.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoAdds delete method for phone and address classes.
Stéphane Jacob [Wed, 20 Oct 2010 12:50:06 +0000 (14:50 +0200)]
Adds delete method for phone and address classes.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoUpdates merge script: direct use of MySQL is much faster than php.
Stéphane Jacob [Wed, 20 Oct 2010 11:36:03 +0000 (13:36 +0200)]
Updates merge script: direct use of MySQL is much faster than php.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoUpdates merge module.
Stéphane Jacob [Wed, 20 Oct 2010 11:35:29 +0000 (13:35 +0200)]
Updates merge module.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
13 years agoPrevents choosing first level job terms (too generic). Prevents opening last level...
Pascal Corpet [Wed, 20 Oct 2010 11:19:57 +0000 (13:19 +0200)]
Prevents choosing first level job terms (too generic). Prevents opening last level job terms (no child).

13 years agoFix jobterm edition in profile.
Raphaël Barrois [Wed, 20 Oct 2010 09:59:20 +0000 (11:59 +0200)]
Fix jobterm edition in profile.

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoRemove hint for using '*' as a wildcard in advanced search.
Raphaël Barrois [Tue, 19 Oct 2010 21:29:38 +0000 (23:29 +0200)]
Remove hint for using '*' as a wildcard in advanced search.

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoSwitch to latest core.
Raphaël Barrois [Tue, 19 Oct 2010 21:20:07 +0000 (23:20 +0200)]
Switch to latest core.

This should fix profile edition issue wrt 'binets' list.

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoFix jobterms ajax when smarty debug is enabled.
Raphaël Barrois [Tue, 19 Oct 2010 21:19:27 +0000 (23:19 +0200)]
Fix jobterms ajax when smarty debug is enabled.

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
13 years agoFix list of users who paid for the event but didn't register themselves.
Florent Bruneau [Tue, 19 Oct 2010 18:39:27 +0000 (20:39 +0200)]
Fix list of users who paid for the event but didn't register themselves.
(Closes #1281)

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
13 years agoMerge remote branch 'origin/platal-1.0.1'
Florent Bruneau [Mon, 18 Oct 2010 21:19:29 +0000 (23:19 +0200)]
Merge remote branch 'origin/platal-1.0.1'

13 years agoAvoid overflow of the 'Change Permission' drop-down.
Florent Bruneau [Mon, 18 Oct 2010 21:14:23 +0000 (23:14 +0200)]
Avoid overflow of the 'Change Permission' drop-down.

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