]> git.openstreetmap.org Git - rails.git/log
rails.git
8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 15 Aug 2016 06:35:31 +0000 (08:35 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoReorder auth_success handlers
Tom Hughes [Sun, 14 Aug 2016 17:30:13 +0000 (18:30 +0100)]
Reorder auth_success handlers

Only treat auth_success as a possible login attempt if we're not
in the middle of validating a new user, or a change to a user.

Also validate the uniqueness of external auth credentials at the
rails level rather than just at the database level, and make sure
any errors are properly reported.

Fixes #1265

8 years agoBlacklist all Google imagery with one regex
Paul Norman [Sat, 13 Aug 2016 20:56:20 +0000 (13:56 -0700)]
Blacklist all Google imagery with one regex

This expression catches 100% of Google imagery seen in imagery_used
tags with no false positives.

It won't stop someone who tries to load "https://www.google.com/maps" as
imagery, but that will fail to get imagery anyway.

8 years agoINSTALL.md: Added inline code markdown.
Bilkow [Sat, 13 Aug 2016 05:36:53 +0000 (02:36 -0300)]
INSTALL.md: Added inline code markdown.

Added inline code markdown in MacOSX install instructions, making it look like command line code.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 11 Aug 2016 07:20:25 +0000 (09:20 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 8 Aug 2016 06:36:24 +0000 (08:36 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoCorrect icon mappings for non OSRM routers
Tom Hughes [Fri, 5 Aug 2016 17:35:27 +0000 (18:35 +0100)]
Correct icon mappings for non OSRM routers

8 years agoAdd support for OSRM 5.0 API and new instruction types
Patrick Niklaus [Sun, 12 Jun 2016 22:23:41 +0000 (00:23 +0200)]
Add support for OSRM 5.0 API and new instruction types

Add support for the new API in OSRM 5.x including new icon sprites
for the new instruction types.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 4 Aug 2016 06:24:26 +0000 (08:24 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 1 Aug 2016 06:36:35 +0000 (08:36 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoAdd State of the Map Asia 2016
Eugene Alvin Villar [Sun, 31 Jul 2016 09:08:30 +0000 (10:08 +0100)]
Add State of the Map Asia 2016

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 28 Jul 2016 06:25:59 +0000 (08:25 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLink all objects into libpgosm.so
Tom Hughes [Wed, 27 Jul 2016 19:51:32 +0000 (20:51 +0100)]
Link all objects into libpgosm.so

8 years agoAllow multiple versions of DB functions to be built
Tom Hughes [Wed, 27 Jul 2016 19:44:16 +0000 (20:44 +0100)]
Allow multiple versions of DB functions to be built

Allows the pg_config location to be configured, along with
the target directory for the built code.

8 years agoRevert "Don't pass the locale to the Mapzen routing engine"
Tom Hughes [Tue, 26 Jul 2016 17:36:56 +0000 (18:36 +0100)]
Revert "Don't pass the locale to the Mapzen routing engine"

This reverts commit 38180c56c9be9d99406c9088b60f5912c2648a04.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 25 Jul 2016 06:22:25 +0000 (08:22 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 21 Jul 2016 06:24:12 +0000 (08:24 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 18 Jul 2016 07:14:04 +0000 (09:14 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoUpdate to iD v1.9.7
Bryan Housel [Sat, 16 Jul 2016 20:02:22 +0000 (16:02 -0400)]
Update to iD v1.9.7

8 years agoAdd support for GitHub authentication
Tom Hughes [Mon, 8 Jun 2015 16:11:24 +0000 (17:11 +0100)]
Add support for GitHub authentication

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 14 Jul 2016 06:19:00 +0000 (08:19 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoFix rubocop warnings
Tom Hughes [Wed, 13 Jul 2016 08:50:23 +0000 (09:50 +0100)]
Fix rubocop warnings

8 years agoModernise migrations
Tom Hughes [Wed, 13 Jul 2016 08:38:32 +0000 (09:38 +0100)]
Modernise migrations

8 years agoUpdate to rails 4.2.7
Tom Hughes [Wed, 13 Jul 2016 08:09:44 +0000 (09:09 +0100)]
Update to rails 4.2.7

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 11 Jul 2016 07:10:51 +0000 (09:10 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 7 Jul 2016 06:21:25 +0000 (08:21 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoRemove banner for small screens
Bryan Housel [Mon, 4 Jul 2016 03:53:21 +0000 (23:53 -0400)]
Remove banner for small screens
(closes #1247)

8 years agoSwitch travis to test on ruby 2.3.1
Tom Hughes [Fri, 1 Jul 2016 12:40:09 +0000 (13:40 +0100)]
Switch travis to test on ruby 2.3.1

8 years agoSwitch travis to test on ruby 2.3
Tom Hughes [Fri, 1 Jul 2016 11:30:38 +0000 (12:30 +0100)]
Switch travis to test on ruby 2.3

8 years agoAdd banner for FOSSGIS 2016 conference
Peter Barth [Thu, 23 Jun 2016 20:39:45 +0000 (22:39 +0200)]
Add banner for FOSSGIS 2016 conference

8 years agoRename cookie_id to banner_cookie
Tom Hughes [Thu, 23 Jun 2016 08:04:07 +0000 (09:04 +0100)]
Rename cookie_id to banner_cookie

8 years agoMerge remote-tracking branch 'openstreetmap/pull/1240'
Tom Hughes [Thu, 23 Jun 2016 07:59:58 +0000 (08:59 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1240'

8 years agoDon't show banner unless content classed with overlay-sidebar
Bryan Housel [Thu, 23 Jun 2016 04:52:45 +0000 (00:52 -0400)]
Don't show banner unless content classed with overlay-sidebar

8 years agoPacify rubocop
Bryan Housel [Wed, 22 Jun 2016 18:05:13 +0000 (14:05 -0400)]
Pacify rubocop

8 years agoLoad banner config from config/banners.yml
Bryan Housel [Wed, 22 Jun 2016 17:37:57 +0000 (13:37 -0400)]
Load banner config from config/banners.yml

8 years agoAdd end dates to banners
Bryan Housel [Wed, 22 Jun 2016 17:08:27 +0000 (13:08 -0400)]
Add end dates to banners

8 years agoRefactor banner logic into BannerHelper module
Bryan Housel [Wed, 22 Jun 2016 12:19:13 +0000 (08:19 -0400)]
Refactor banner logic into BannerHelper module

8 years agoSet max queuePos high to ensure a banner is shown
Bryan Housel [Tue, 21 Jun 2016 10:45:22 +0000 (06:45 -0400)]
Set max queuePos high to ensure a banner is shown

Previously it was possible for no banners to fall below max queuePos,
in the situation where several banners get removed from active rotation.

8 years agoremove debug statement
Bryan Housel [Mon, 20 Jun 2016 23:19:20 +0000 (19:19 -0400)]
remove debug statement

8 years agoAdd support for rotating banners, add banners for SOTM, SOTMUS
Bryan Housel [Mon, 20 Jun 2016 22:09:55 +0000 (18:09 -0400)]
Add support for rotating banners, add banners for SOTM, SOTMUS

8 years agoUpdate bundle
Tom Hughes [Mon, 20 Jun 2016 08:00:23 +0000 (09:00 +0100)]
Update bundle

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 20 Jun 2016 06:16:22 +0000 (08:16 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 16 Jun 2016 06:35:36 +0000 (08:35 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoRemove more traces of MapQuest Open layer
Tom Hughes [Wed, 15 Jun 2016 19:38:52 +0000 (20:38 +0100)]
Remove more traces of MapQuest Open layer

8 years agoDrop the MapQuest Open layer
Tom Hughes [Wed, 15 Jun 2016 19:21:01 +0000 (20:21 +0100)]
Drop the MapQuest Open layer

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 13 Jun 2016 05:55:45 +0000 (07:55 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoReflect sucessful trademark registration of State of the Map
Simon Poole [Fri, 10 Jun 2016 07:45:00 +0000 (09:45 +0200)]
Reflect sucessful trademark  registration of State of the Map

8 years agoFix rubocop warnings
Tom Hughes [Thu, 9 Jun 2016 21:18:28 +0000 (22:18 +0100)]
Fix rubocop warnings

8 years agoUpdate bundle
Tom Hughes [Thu, 9 Jun 2016 20:22:11 +0000 (21:22 +0100)]
Update bundle

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 9 Jun 2016 05:57:48 +0000 (07:57 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoUpdate to iD v1.9.6
Bryan Housel [Tue, 7 Jun 2016 20:19:48 +0000 (16:19 -0400)]
Update to iD v1.9.6

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 6 Jun 2016 06:20:39 +0000 (08:20 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 2 Jun 2016 06:16:21 +0000 (08:16 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 30 May 2016 08:49:49 +0000 (10:49 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 26 May 2016 05:43:03 +0000 (07:43 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoUpdate to iD v1.9.5
Bryan Housel [Wed, 25 May 2016 00:56:38 +0000 (20:56 -0400)]
Update to iD v1.9.5

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 23 May 2016 06:13:13 +0000 (08:13 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 19 May 2016 07:36:02 +0000 (09:36 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 16 May 2016 05:37:05 +0000 (07:37 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 12 May 2016 07:30:43 +0000 (09:30 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoSupport passing imagery offset parameter to iD
Bryan Housel [Wed, 4 May 2016 05:27:44 +0000 (01:27 -0400)]
Support passing imagery offset parameter to iD

8 years agoUpdate to iD v1.9.4
Bryan Housel [Wed, 4 May 2016 03:26:53 +0000 (23:26 -0400)]
Update to iD v1.9.4

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 2 May 2016 05:35:13 +0000 (07:35 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoUpdate to iD v1.9.3
Bryan Housel [Mon, 25 Apr 2016 16:34:49 +0000 (12:34 -0400)]
Update to iD v1.9.3

8 years agoFix broken link to Vagrant downloads page
Matt Heard [Sun, 3 Apr 2016 22:56:35 +0000 (10:56 +1200)]
Fix broken link to Vagrant downloads page

8 years agoMerge remote-tracking branch 'openstreetmap/pull/1208'
Tom Hughes [Sun, 24 Apr 2016 17:42:47 +0000 (18:42 +0100)]
Merge remote-tracking branch 'openstreetmap/pull/1208'

8 years agoRemove database readme
Andy Allan [Fri, 22 Apr 2016 16:24:32 +0000 (17:24 +0100)]
Remove database readme

This duplicates parts of INSTALL.md but with outdated information.

8 years agoRemove 9 year old warning
Andy Allan [Fri, 22 Apr 2016 16:24:17 +0000 (17:24 +0100)]
Remove 9 year old warning

8 years agoRemove old config files.
Andy Allan [Fri, 22 Apr 2016 15:44:09 +0000 (16:44 +0100)]
Remove old config files.

We use passenger (configured via chef) and these old files will just
cause confusion.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 21 Apr 2016 05:12:10 +0000 (07:12 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 18 Apr 2016 05:15:21 +0000 (07:15 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 14 Apr 2016 06:09:57 +0000 (08:09 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 11 Apr 2016 05:17:47 +0000 (07:17 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 7 Apr 2016 06:09:32 +0000 (08:09 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 4 Apr 2016 05:25:08 +0000 (07:25 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 31 Mar 2016 06:01:22 +0000 (08:01 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoMake vagrant provision script stop on error
Tom Hughes [Mon, 28 Mar 2016 21:45:20 +0000 (22:45 +0100)]
Make vagrant provision script stop on error

8 years agoUpdate bundle
Tom Hughes [Mon, 28 Mar 2016 21:32:24 +0000 (22:32 +0100)]
Update bundle

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 28 Mar 2016 08:19:23 +0000 (10:19 +0200)]
Localisation updates from https://translatewiki.net.

8 years agoAllow redcarpet to add nofollow to links
Tom Hughes [Thu, 24 Mar 2016 08:36:32 +0000 (08:36 +0000)]
Allow redcarpet to add nofollow to links

This, using a new feature in redcarpet, allows us to avoid having
to subclass the renderer and implement links ourselves, which in
turn means that redcarpet's link sanitisation works.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 24 Mar 2016 06:25:57 +0000 (07:25 +0100)]
Localisation updates from https://translatewiki.net.

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Mon, 21 Mar 2016 06:18:44 +0000 (07:18 +0100)]
Localisation updates from https://translatewiki.net.

8 years agoIncrease overpass API timeout
Tom Hughes [Sun, 20 Mar 2016 19:41:15 +0000 (19:41 +0000)]
Increase overpass API timeout

8 years agoHandle overpass errors reported as remarks
Tom Hughes [Sun, 20 Mar 2016 19:29:50 +0000 (19:29 +0000)]
Handle overpass errors reported as remarks

Not all overpass errors are reported as HTTP errors - some are
reported as HTTP success with a remark in the response.

Fixes #1178

8 years agoUpdate bundle
Tom Hughes [Sun, 20 Mar 2016 19:01:12 +0000 (19:01 +0000)]
Update bundle

8 years agoMake support email address configurable
Tom Hughes [Sun, 20 Mar 2016 18:58:50 +0000 (18:58 +0000)]
Make support email address configurable

8 years agoMerge remote-tracking branch 'openstreetmap/pull/954'
Tom Hughes [Sun, 20 Mar 2016 18:47:35 +0000 (18:47 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/954'

8 years agoMake list items highligh colour darker
Alexander Meshcheryakov [Sat, 21 Nov 2015 13:23:54 +0000 (16:23 +0300)]
Make list items highligh colour darker

The list highlight colour is currently very subtle and can be
had to spot so make it a little darker.

Closes #1090

8 years agoUpdate to iD v1.9.2
Bryan Housel [Fri, 18 Mar 2016 19:41:09 +0000 (15:41 -0400)]
Update to iD v1.9.2

8 years agoCorrectly sort the Copyright item in the compact menu
Markus Heidelberg [Thu, 17 Mar 2016 08:29:07 +0000 (09:29 +0100)]
Correctly sort the Copyright item in the compact menu

In the default menu it had been moved left by commit bfd11bf79 but
the compact drop-down menu had not been adapted accordingly.

Closes #1185

8 years agoLocalisation updates from https://translatewiki.net.
Niklas Laxström [Thu, 17 Mar 2016 07:56:43 +0000 (08:56 +0100)]
Localisation updates from https://translatewiki.net.

8 years agoDon't pass the locale to the Mapzen routing engine
Tom Hughes [Tue, 15 Mar 2016 10:03:18 +0000 (10:03 +0000)]
Don't pass the locale to the Mapzen routing engine

It only supports en-US currently, and passing anything else now
makes it error instead of falling back to en-US.

8 years agoMerge remote-tracking branch 'openstreetmap/pull/954'
Tom Hughes [Mon, 14 Mar 2016 22:11:23 +0000 (22:11 +0000)]
Merge remote-tracking branch 'openstreetmap/pull/954'

8 years agoNotes: show first comment as marker tooltip
Simon Legner [Tue, 14 Apr 2015 21:32:58 +0000 (23:32 +0200)]
Notes: show first comment as marker tooltip

8 years agoWrap user name in `bdi` to provide a separate RTL context
Simon Legner [Mon, 14 Mar 2016 21:16:36 +0000 (22:16 +0100)]
Wrap user name in `bdi` to provide a separate RTL context

Fixes #1179
Closes #1183

8 years agoTest titles in changeset feed
Tom Hughes [Mon, 14 Mar 2016 21:18:26 +0000 (21:18 +0000)]
Test titles in changeset feed

8 years agoAdd title to changeset feeds
Simon Legner [Sun, 13 Mar 2016 20:22:42 +0000 (21:22 +0100)]
Add title to changeset feeds

Fixes #1051
Closes #1180

8 years agoOnly the standard layer can be exported
Simon Legner [Mon, 14 Mar 2016 20:42:40 +0000 (21:42 +0100)]
Only the standard layer can be exported

Fixes #1141
Closes #1182

8 years agoWe require PostgreSQL 9.1 for CREATE EXTENSION
Tom Hughes [Mon, 14 Mar 2016 20:57:41 +0000 (20:57 +0000)]
We require PostgreSQL 9.1 for CREATE EXTENSION

8 years agoFix error and inconsistencies INSTALL.md
Simon Legner [Mon, 14 Mar 2016 17:27:29 +0000 (18:27 +0100)]
Fix error and inconsistencies INSTALL.md