Florent Bruneau [Sat, 27 Nov 2010 21:18:19 +0000 (22:18 +0100)]
Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
Conflicts:
ChangeLog
core
modules/payment.php
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sat, 27 Nov 2010 21:12:16 +0000 (22:12 +0100)]
Prepare ChangeLog.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sat, 27 Nov 2010 21:11:05 +0000 (22:11 +0100)]
Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master
Florent Bruneau [Sat, 27 Nov 2010 21:00:38 +0000 (22:00 +0100)]
Add Last-Modified date for photos.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sat, 27 Nov 2010 15:26:06 +0000 (16:26 +0100)]
List RPC: log information in case of authentication failure.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sat, 27 Nov 2010 15:19:24 +0000 (16:19 +0100)]
Lists RPC: print the name of method to execute and fix annoying warning about
int not being subscriptable.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Stéphane Jacob [Fri, 26 Nov 2010 22:28:38 +0000 (23:28 +0100)]
Fixes smarty error and warnings in payment page.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sun, 21 Nov 2010 14:31:01 +0000 (15:31 +0100)]
Fixes list display.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sun, 21 Nov 2010 17:52:01 +0000 (18:52 +0100)]
Prevents sql error.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sun, 21 Nov 2010 00:20:40 +0000 (01:20 +0100)]
Ooops
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sat, 20 Nov 2010 23:01:23 +0000 (00:01 +0100)]
Fixes erroneous queries.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sat, 20 Nov 2010 17:25:58 +0000 (18:25 +0100)]
Fixes retrieval of deceased from AX database.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sat, 20 Nov 2010 17:22:13 +0000 (18:22 +0100)]
Fixes retrieval of deceased from AX database.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Florent Bruneau [Sat, 20 Nov 2010 17:19:52 +0000 (18:19 +0100)]
Since user can have their profile filled with data from the AX, show a
link to the profile in not registered user's minifiches.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Stéphane Jacob [Sat, 20 Nov 2010 14:29:04 +0000 (15:29 +0100)]
Removes double X.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sat, 20 Nov 2010 14:26:58 +0000 (15:26 +0100)]
As 'yourself' is not modified when the editor is not the the profile owner, do not say it is in this case.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sat, 20 Nov 2010 14:20:11 +0000 (15:20 +0100)]
If there is no photo, default publicity is 'private'.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Sat, 20 Nov 2010 14:13:44 +0000 (15:13 +0100)]
As 'yourself' does not appear when the editor is not the the profile owner, do not save it in this case.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Fri, 19 Nov 2010 12:33:07 +0000 (13:33 +0100)]
REPLACE INTO should only be used if the data deletion is wanted.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Pascal Corpet [Fri, 19 Nov 2010 16:28:44 +0000 (17:28 +0100)]
Accelerates jobterms tree browsing and fixes some leaf problems
Stéphane Jacob [Wed, 17 Nov 2010 22:46:53 +0000 (23:46 +0100)]
Fixes events updates (Closes #1343, #1350, #1349, #1348).
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Wed, 17 Nov 2010 14:01:25 +0000 (15:01 +0100)]
Checks profile tables for empty fields.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Wed, 17 Nov 2010 14:14:26 +0000 (15:14 +0100)]
Tiny merge related updates.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Wed, 17 Nov 2010 12:17:39 +0000 (13:17 +0100)]
HTML validation on xnet payment page.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Wed, 17 Nov 2010 12:15:34 +0000 (13:15 +0100)]
Goes to the payment that was sorted.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Wed, 17 Nov 2010 10:54:51 +0000 (11:54 +0100)]
Allows sorting on payment lists in X.net.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Tue, 16 Nov 2010 20:51:00 +0000 (21:51 +0100)]
NIT
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Raphaël Barrois [Tue, 16 Nov 2010 11:18:09 +0000 (12:18 +0100)]
Finally fix "has paid" lists (Closes #1314)
Page used for "return" from cyberpaiement does not asso_id...
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Mon, 15 Nov 2010 22:44:08 +0000 (23:44 +0100)]
Humpf. It seems amount (as 15.00 EUR) is require in payments...
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Mon, 15 Nov 2010 22:23:17 +0000 (23:23 +0100)]
Fix payment-related lists (Closes #1291, #1295, 1314)
Also fixes a minor bug with the "<comment>" tag in sent emails.
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Florent Bruneau [Sun, 7 Nov 2010 21:54:18 +0000 (22:54 +0100)]
More stuff for the new surveys.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sat, 13 Nov 2010 21:06:14 +0000 (22:06 +0100)]
Update core
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Stéphane Jacob [Fri, 12 Nov 2010 20:00:28 +0000 (21:00 +0100)]
Fixes job administration.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Wed, 10 Nov 2010 20:51:27 +0000 (21:51 +0100)]
Fixes sex comparison in marketing success email.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Stéphane Jacob [Wed, 10 Nov 2010 15:53:25 +0000 (16:53 +0100)]
Fixes links to profiles in mailing list administration.
Signed-off-by: Stéphane Jacob <sj@m4x.org>
Raphaël Barrois [Mon, 8 Nov 2010 17:19:55 +0000 (18:19 +0100)]
Add link to account types from account creation page.
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Raphaël Barrois [Mon, 8 Nov 2010 16:49:06 +0000 (17:49 +0100)]
Fixed "search my contacts"
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Florent Bruneau [Sun, 7 Nov 2010 19:22:41 +0000 (20:22 +0100)]
emails_bounces_re is obsolete.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 7 Nov 2010 16:36:46 +0000 (17:36 +0100)]
Javascript cleanup again.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sun, 7 Nov 2010 15:48:17 +0000 (16:48 +0100)]
Improves jQuery extension in xorg.js.
This provides the following Ajax-based API:
$.xget(url, data, onSuccess, onError, type);
$.xgetJSON(url, data, onSuccess, onError);
$.xgetScript(url, onSuccess, onError);
$.xpost(url, data, onSuccess, onError, type);
These functions support does the same as the jQuery's default ajax
function (without 'x' prefix) but distinguish the case of http success and
the case of http error (500, 40x). By default onSuccess is null, while
onError display an alert.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sat, 6 Nov 2010 22:44:51 +0000 (23:44 +0100)]
Remove ajax.js.
A large part of ajax.js has been integrated as an extension of jQuery
($([selector]).updateHtml(), ...).
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sat, 6 Nov 2010 20:27:29 +0000 (21:27 +0100)]
Move header javascript to xorg.js.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sat, 6 Nov 2010 07:52:46 +0000 (08:52 +0100)]
Implements export() and fromExport() for UF and some UFCs.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Sat, 6 Nov 2010 07:52:46 +0000 (08:52 +0100)]
Implements export() and fromExport() on UFOs.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Fri, 5 Nov 2010 22:23:37 +0000 (23:23 +0100)]
Split userfilter.php
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Fri, 5 Nov 2010 22:15:23 +0000 (23:15 +0100)]
Merge remote branch 'origin/platal-1.0.1'
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>
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>
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>
Pascal Corpet [Fri, 5 Nov 2010 20:58:28 +0000 (21:58 +0100)]
Fixes advanced form js in IE7. Closes #1313.
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>
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>
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>
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>
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>
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>
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>
Stéphane Jacob [Tue, 2 Nov 2010 21:46:27 +0000 (22:46 +0100)]
Merge remote branch 'origin/platal-1.0.1'
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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
João Pedro Athayde Marcondes de André (JP) [Sat, 30 Oct 2010 21:52:58 +0000 (23:52 +0200)]
Spacing
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
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
João Pedro Athayde Marcondes de André (JP) [Sat, 30 Oct 2010 21:01:25 +0000 (23:01 +0200)]
pfix_hruid->hrmid
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
João Pedro Athayde Marcondes de André (JP) [Sat, 30 Oct 2010 19:51:00 +0000 (21:51 +0200)]
Add drop tables
João Pedro Athayde Marcondes de André (JP) [Sat, 30 Oct 2010 19:50:44 +0000 (21:50 +0200)]
Change names to english
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
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>
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>
Florent Bruneau [Sat, 30 Oct 2010 13:16:30 +0000 (15:16 +0200)]
Merge remote branch 'origin/platal-1.0.1'
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>
Bernardo Freitas Paulo da Costa [Fri, 29 Oct 2010 21:28:26 +0000 (23:28 +0200)]
Typo in cron for profile modifications
Florent Bruneau [Thu, 28 Oct 2010 21:13:39 +0000 (23:13 +0200)]
Merge remote branch 'origin/platal-1.0.1'
Florent Bruneau [Thu, 28 Oct 2010 21:13:23 +0000 (23:13 +0200)]
Update core
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Thu, 28 Oct 2010 21:05:12 +0000 (23:05 +0200)]
Update core
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
Florent Bruneau [Thu, 28 Oct 2010 20:49:07 +0000 (22:49 +0200)]
Merge remote branch 'origin/platal-1.0.1'
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>
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>
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>
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>
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>
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>
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
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>
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>
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>
projects / platal.git / log