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

Florent Bruneau [Fri, 21 Mar 2008 22:18:21 +0000 (23:18 +0100)]

Really fix dangerous email check on subscription.

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

Florent Bruneau [Fri, 21 Mar 2008 22:04:39 +0000 (23:04 +0100)]

Ban dangerous on subscription

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

Florent Bruneau [Thu, 6 Mar 2008 14:23:09 +0000 (15:23 +0100)]

While waiting for next release lets use a faster query for ipwatch admin
page.

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

commit | commitdiff | tree

Florent Bruneau [Wed, 27 Feb 2008 10:48:02 +0000 (11:48 +0100)]

Do not reuse the mailer to notify new payment.

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

commit | commitdiff | tree

Florent Bruneau [Fri, 22 Feb 2008 19:41:35 +0000 (20:41 +0100)]

Send admin notifications to hotliners

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

commit | commitdiff | tree

Florent Bruneau [Fri, 18 Jan 2008 13:11:54 +0000 (14:11 +0100)]

No accent in from

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

commit | commitdiff | tree

Florent Bruneau [Wed, 16 Jan 2008 13:23:06 +0000 (14:23 +0100)]

Update school library database location (Yeah! they only added 1 character!)

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

commit | commitdiff | tree

Florent Bruneau [Tue, 1 Jan 2008 14:01:17 +0000 (15:01 +0100)]

Much faster listing of alias members.

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

commit | commitdiff | tree

Florent Bruneau [Mon, 31 Dec 2007 09:56:48 +0000 (10:56 +0100)]

Extends time limit to 120seconds for group mailer (Fru)

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

commit | commitdiff | tree

Florent Bruneau [Thu, 29 Nov 2007 21:03:50 +0000 (22:03 +0100)]

Fix another payment count issue.

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

commit | commitdiff | tree

Florent Bruneau [Tue, 27 Nov 2007 19:19:33 +0000 (20:19 +0100)]

Fix payment count in some specific cases.

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

commit | commitdiff | tree

Florent Bruneau [Wed, 21 Nov 2007 14:22:15 +0000 (15:22 +0100)]

Allow HTTP for manageurs and e-confiance.

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

commit | commitdiff | tree

Florent Bruneau [Thu, 15 Nov 2007 12:18:21 +0000 (13:18 +0100)]

Another payment computation bug.

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

commit | commitdiff | tree

Florent Bruneau [Thu, 15 Nov 2007 12:03:26 +0000 (13:03 +0100)]

Do not store payments on multiple SQL entry.

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

commit | commitdiff | tree

Florent Bruneau [Sun, 28 Oct 2007 23:12:19 +0000 (00:12 +0100)]

Do not add text in verbose checkdb message.
The verbose state is already indicated in the mail subject, so there's no
need of a reminder two lines below. This avoid void mail to be sent when no
db check failed in verbose mode.

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

commit | commitdiff | tree

Florent Bruneau [Sat, 10 Nov 2007 17:54:43 +0000 (18:54 +0100)]

Fix session init when the user have no last connection.

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

commit | commitdiff | tree

Florent Bruneau [Sun, 28 Oct 2007 09:47:17 +0000 (10:47 +0100)]

Remove BDD warning for region in entreprise addresses
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Thu, 25 Oct 2007 20:08:03 +0000 (22:08 +0200)]

Update ML feed on demand.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Wed, 24 Oct 2007 20:31:40 +0000 (22:31 +0200)]

Fix a missing urlencode in group auth that leads to some encoding failures
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Tue, 23 Oct 2007 19:14:31 +0000 (21:14 +0200)]

Fix double html_entities in event admin form
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Tue, 23 Oct 2007 19:24:52 +0000 (21:24 +0200)]

Fix wiki text in RSS
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Mon, 22 Oct 2007 18:25:18 +0000 (20:25 +0200)]

Fix edition of non well geolocalized jobs
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Mon, 22 Oct 2007 18:16:42 +0000 (20:16 +0200)]

Fix the edition of event subscription for non member
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Olivier Le Floch [Sun, 21 Oct 2007 00:16:34 +0000 (02:16 +0200)]

Do not escape address fields for Macs since that introduces '\'s when importing VCards in Address Book. Keep old behaviour for Windows, pending reports that the same bug exists for Windows.

commit | commitdiff | tree

Florent Bruneau [Mon, 22 Oct 2007 16:58:04 +0000 (18:58 +0200)]

Fix the link to update status of non-comers
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Stéphane Jacob [Sat, 20 Oct 2007 12:11:04 +0000 (14:11 +0200)]

bundesverdienstkreuz

commit | commitdiff | tree

Florent Bruneau [Thu, 18 Oct 2007 09:42:05 +0000 (11:42 +0200)]

Fix emails on payment return
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Thu, 18 Oct 2007 08:42:15 +0000 (10:42 +0200)]

Fix issues with geoloc
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Tue, 16 Oct 2007 20:46:07 +0000 (22:46 +0200)]

Fix page kill notification
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Tue, 16 Oct 2007 20:32:08 +0000 (22:32 +0200)]

Fix count of non subscribers
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Tue, 16 Oct 2007 19:30:51 +0000 (21:30 +0200)]

Revert "Don't show warning mx on the front page if the user has another valid"

This reverts commit 8f11b29f7600dfcc825065ce9e89e3c7866de5c6.

commit | commitdiff | tree

Florent Bruneau [Tue, 16 Oct 2007 19:30:23 +0000 (21:30 +0200)]

Revert "Prepare the future..."

This reverts commit 9b7cd991211a8ca172cc7bbe91873bccfcbe889e.

commit | commitdiff | tree

Raphael Marichez [Tue, 16 Oct 2007 13:43:46 +0000 (15:43 +0200)]

Merge commit 'origin' into platal-0.9.15

commit | commitdiff | tree

Florent Bruneau [Mon, 15 Oct 2007 20:31:28 +0000 (22:31 +0200)]

Fix validation comment emails
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Mon, 15 Oct 2007 20:31:28 +0000 (22:31 +0200)]

Fix validation comment emails
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Mon, 15 Oct 2007 09:01:47 +0000 (11:01 +0200)]

Don't generate feed for ML
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sat, 13 Oct 2007 10:15:58 +0000 (12:15 +0200)]

Don't show warning mx on the front page if the user has another valid
redirection
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sat, 13 Oct 2007 07:02:06 +0000 (09:02 +0200)]

Fix group subscription query link update
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sat, 13 Oct 2007 07:02:06 +0000 (09:02 +0200)]

Fix group subscription query link update
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sat, 13 Oct 2007 06:53:49 +0000 (08:53 +0200)]

Fix Notification sender (I don't understand how it has been broken...)
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sat, 13 Oct 2007 06:53:49 +0000 (08:53 +0200)]

Fix Notification sender (I don't understand how it has been broken...)
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Wed, 10 Oct 2007 20:16:27 +0000 (22:16 +0200)]

Do allow to have all redirection disable on the web interface

commit | commitdiff | tree

Florent Bruneau [Wed, 10 Oct 2007 20:04:05 +0000 (22:04 +0200)]

commit | commitdiff | tree

Florent Bruneau [Wed, 10 Oct 2007 20:02:12 +0000 (22:02 +0200)]

Fix payment comment decoder

commit | commitdiff | tree

Florent Bruneau [Wed, 10 Oct 2007 20:16:27 +0000 (22:16 +0200)]

Do allow to have all redirection disable on the web interface
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Wed, 10 Oct 2007 20:04:05 +0000 (22:04 +0200)]

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

commit | commitdiff | tree

Stéphane Jacob [Wed, 10 Oct 2007 13:10:31 +0000 (15:10 +0200)]

nbsp for better display in konqueror

commit | commitdiff | tree

Florent Bruneau [Wed, 10 Oct 2007 20:02:12 +0000 (22:02 +0200)]

Fix payment comment decoder
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Wed, 10 Oct 2007 18:50:13 +0000 (20:50 +0200)]

No geoloc on advanced search. This leads to DOS on MySQL.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Stéphane Jacob [Wed, 10 Oct 2007 13:10:31 +0000 (15:10 +0200)]

nbsp for better display in konqueror

commit | commitdiff | tree

Florent Bruneau [Tue, 9 Oct 2007 14:41:23 +0000 (16:41 +0200)]

Remove autologin on xnet. It leads to a white page
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Tue, 9 Oct 2007 14:41:23 +0000 (16:41 +0200)]

Remove autologin on xnet. It leads to a white page
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Tue, 9 Oct 2007 14:07:58 +0000 (16:07 +0200)]

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

commit | commitdiff | tree

Florent Bruneau [Tue, 9 Oct 2007 14:07:58 +0000 (16:07 +0200)]

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

commit | commitdiff | tree

Florent Bruneau [Tue, 9 Oct 2007 07:57:48 +0000 (09:57 +0200)]

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

commit | commitdiff | tree

Florent Bruneau [Tue, 9 Oct 2007 07:57:48 +0000 (09:57 +0200)]

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

commit | commitdiff | tree

Pascal Corpet [Mon, 8 Oct 2007 21:57:06 +0000 (23:57 +0200)]

Fix geodesix link for init file

commit | commitdiff | tree

Pascal Corpet [Mon, 8 Oct 2007 21:57:06 +0000 (23:57 +0200)]

Fix geodesix link for init file

commit | commitdiff | tree

Florent Bruneau [Mon, 8 Oct 2007 20:36:23 +0000 (22:36 +0200)]

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

commit | commitdiff | tree

Florent Bruneau [Mon, 8 Oct 2007 20:15:37 +0000 (22:15 +0200)]

Fix listes.p.o/
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Mon, 8 Oct 2007 20:15:37 +0000 (22:15 +0200)]

Fix listes.p.o/
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Mon, 8 Oct 2007 18:59:18 +0000 (20:59 +0200)]

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

commit | commitdiff | tree

Florent Bruneau [Mon, 8 Oct 2007 18:25:32 +0000 (20:25 +0200)]

Hope this will fix a bug
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sun, 7 Oct 2007 16:07:27 +0000 (18:07 +0200)]

User organization in banana depends on the location (xnet or not)/rights of the user
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Stéphane Jacob [Sun, 7 Oct 2007 15:53:37 +0000 (17:53 +0200)]

commit | commitdiff | tree

Florent Bruneau [Sun, 7 Oct 2007 15:43:37 +0000 (17:43 +0200)]

Improves text of profile/edit/deco
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sun, 7 Oct 2007 15:13:20 +0000 (17:13 +0200)]

Same as 7eb43a1dbfc4e582f53fd03ad6f039b8bfd04bdd
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sun, 7 Oct 2007 13:55:41 +0000 (15:55 +0200)]

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

commit | commitdiff | tree

Florent Bruneau [Sun, 7 Oct 2007 12:06:16 +0000 (14:06 +0200)]

Fix detection of changes in the job tab of profile/edit
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sun, 7 Oct 2007 10:05:55 +0000 (12:05 +0200)]

Fix path to geoloc initialization file
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sun, 7 Oct 2007 10:05:28 +0000 (12:05 +0200)]

Fix number of parameters for autocompletion query
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sun, 7 Oct 2007 08:32:38 +0000 (10:32 +0200)]

Should avoid addresses with (0.0000,0.0000) coordinates
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sun, 7 Oct 2007 07:04:17 +0000 (09:04 +0200)]

Update the preview of the skin "Keynote"
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sat, 6 Oct 2007 20:52:39 +0000 (22:52 +0200)]

Revert "Lighter query to get the number of events displaid on every single
page of the site". It introduced a bug in event count.

This reverts commit e15dcc03aed9dceb1f5c0fbf2d73a2a3aa8945c9, and partially
revert b4ee37a403aa5970304b447b31a747e47f9efb18

Conflicts:

include/notifs.inc.php

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

commit | commitdiff | tree

Florent Bruneau [Sat, 6 Oct 2007 20:38:59 +0000 (22:38 +0200)]

Fix many small issues with the "carnet"
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sat, 6 Oct 2007 16:48:10 +0000 (18:48 +0200)]

Fix accent sensitivity in autocompletion
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sat, 6 Oct 2007 14:48:19 +0000 (16:48 +0200)]

Change title for email check mail
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sat, 6 Oct 2007 13:54:55 +0000 (15:54 +0200)]

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

commit | commitdiff | tree

Florent Bruneau [Sat, 6 Oct 2007 09:06:58 +0000 (11:06 +0200)]

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

commit | commitdiff | tree

Florent Bruneau [Fri, 5 Oct 2007 21:24:55 +0000 (23:24 +0200)]

Send ascii to payment sites in order to avoid annoying encoding issues
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Fri, 5 Oct 2007 20:56:38 +0000 (22:56 +0200)]

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

commit | commitdiff | tree

Florent Bruneau [Thu, 4 Oct 2007 22:07:23 +0000 (00:07 +0200)]

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

commit | commitdiff | tree

Florent Bruneau [Thu, 4 Oct 2007 22:02:45 +0000 (00:02 +0200)]

Fix photos on banana in xnet
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Thu, 4 Oct 2007 20:38:21 +0000 (22:38 +0200)]

Should avoid php errors when auth fails on xnet
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Wed, 3 Oct 2007 22:22:04 +0000 (00:22 +0200)]

Because CSS sucks, I've been forced to hard code the flags for
public/private/ax states in profile. So, it looks great on all browsers, but
it is not anymore a skin specific skinning.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Wed, 3 Oct 2007 19:57:36 +0000 (21:57 +0200)]

Seems to fix issues on some dummy browsers
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Wed, 3 Oct 2007 19:46:20 +0000 (21:46 +0200)]

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

commit | commitdiff | tree

Florent Bruneau [Wed, 3 Oct 2007 18:59:45 +0000 (20:59 +0200)]

URL decode payment comments
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Wed, 3 Oct 2007 18:50:54 +0000 (20:50 +0200)]

Fix paiement association to event in prompt just before being redirected to
the bank site.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Pascal Corpet [Tue, 2 Oct 2007 20:41:52 +0000 (22:41 +0200)]

Revert "use geoloc/ link instead of geoloc/geoloc"

There was a good reason (to make search/geoloc work)

Update translation for geodesix plugin. Update insertion of flash object.

This reverts commit d10b21d2d45330b3684e41d03c77d10bc6c91b55.

Conflicts:

commit | commitdiff | tree

Pascal Corpet [Sun, 30 Sep 2007 21:12:00 +0000 (23:12 +0200)]

use geoloc/ link instead of geoloc/geoloc

commit | commitdiff | tree

Florent Bruneau [Tue, 2 Oct 2007 19:42:12 +0000 (21:42 +0200)]

Fix details of X who are not member of the group in event admin page
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Tue, 2 Oct 2007 19:13:04 +0000 (21:13 +0200)]

Fix auth level required for email testing.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Mon, 1 Oct 2007 22:01:36 +0000 (00:01 +0200)]

Remove an ugly hack in google maps link generation as current version of google maps seems to
behave properly.
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Mon, 1 Oct 2007 20:46:46 +0000 (22:46 +0200)]

Rewrite shortcuts to run a quick search if a uniq result can't be found

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

commit | commitdiff | tree

Florent Bruneau [Mon, 1 Oct 2007 08:50:12 +0000 (10:50 +0200)]

Less confusing default text for payment email

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

commit | commitdiff | tree

Stéphane Jacob [Mon, 1 Oct 2007 08:15:08 +0000 (10:15 +0200)]

commit | commitdiff | tree

Florent Bruneau [Sun, 30 Sep 2007 17:41:20 +0000 (19:41 +0200)]

Some layout improvements

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

commit | commitdiff | tree

Florent Bruneau [Sun, 30 Sep 2007 13:27:31 +0000 (15:27 +0200)]

Fix encoding issue in contact pdf
Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

commit | commitdiff | tree

Florent Bruneau [Sun, 30 Sep 2007 13:14:05 +0000 (15:14 +0200)]

Don't lookup for both city and cityid

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