]> git.openstreetmap.org Git - rails.git/log
rails.git
5 years agoMerge remote-tracking branch 'upstream/pull/2440'
Tom Hughes [Wed, 20 Nov 2019 19:01:13 +0000 (19:01 +0000)]
Merge remote-tracking branch 'upstream/pull/2440'

5 years agoMerge remote-tracking branch 'upstream/pull/2441'
Tom Hughes [Wed, 20 Nov 2019 18:57:50 +0000 (18:57 +0000)]
Merge remote-tracking branch 'upstream/pull/2441'

5 years agoMerge remote-tracking branch 'upstream/pull/2439'
Tom Hughes [Wed, 20 Nov 2019 18:56:42 +0000 (18:56 +0000)]
Merge remote-tracking branch 'upstream/pull/2439'

5 years agoMove user preference XML generation to a view
Andy Allan [Wed, 20 Nov 2019 15:31:46 +0000 (16:31 +0100)]
Move user preference XML generation to a view

5 years agoRename UserPreference controller methods to follow rails conventions more closely
Andy Allan [Wed, 20 Nov 2019 15:09:48 +0000 (16:09 +0100)]
Rename UserPreference controller methods to follow rails conventions more closely

5 years agoMove Relation.to_xml and to_xml_node out of the model and into tests
Andy Allan [Wed, 20 Nov 2019 14:45:28 +0000 (15:45 +0100)]
Move Relation.to_xml and to_xml_node out of the model and into tests

5 years agoMove Way.to_xml and to_xml_node out of the model and into tests
Andy Allan [Wed, 20 Nov 2019 14:31:47 +0000 (15:31 +0100)]
Move Way.to_xml and to_xml_node out of the model and into tests

This code is only used in the tests. Refs #2433

5 years agoRemove the users.nearby column
Andy Allan [Wed, 20 Nov 2019 14:07:42 +0000 (15:07 +0100)]
Remove the users.nearby column

Refs #2417 and #2432

5 years agoUpdate bundle
Tom Hughes [Wed, 20 Nov 2019 00:03:36 +0000 (00:03 +0000)]
Update bundle

Closes #2438

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 18 Nov 2019 17:23:07 +0000 (18:23 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoUpdate bundle
Tom Hughes [Thu, 14 Nov 2019 19:06:50 +0000 (19:06 +0000)]
Update bundle

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 14 Nov 2019 16:28:11 +0000 (17:28 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoMerge remote-tracking branch 'upstream/pull/2433'
Tom Hughes [Thu, 14 Nov 2019 12:24:50 +0000 (12:24 +0000)]
Merge remote-tracking branch 'upstream/pull/2433'

5 years agoMerge remote-tracking branch 'upstream/pull/2432'
Tom Hughes [Thu, 14 Nov 2019 12:20:10 +0000 (12:20 +0000)]
Merge remote-tracking branch 'upstream/pull/2432'

5 years agoMove Node.to_xml and to_xml_node out of model and into tests
Andy Allan [Wed, 13 Nov 2019 16:01:35 +0000 (17:01 +0100)]
Move Node.to_xml and to_xml_node out of model and into tests

This code is only used in the tests for creating 'fixture' payloads,
so it shouldn't be kept in the models.

5 years agoMove the format tests to test the output from the controller
Andy Allan [Wed, 21 Aug 2019 15:10:36 +0000 (17:10 +0200)]
Move the format tests to test the output from the controller

5 years agoIgnore the users.nearby column
Andy Allan [Wed, 13 Nov 2019 13:19:32 +0000 (14:19 +0100)]
Ignore the users.nearby column

This is the first step of removing the column, see #2417. It needs to be
deployed before a migration to remove it, since the columns are
cached in ActiveRecord and things break if objects exist in memory
that expect the column to be there.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 11 Nov 2019 16:06:16 +0000 (17:06 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoMerge remote-tracking branch 'upstream/pull/2429'
Tom Hughes [Sun, 10 Nov 2019 09:50:48 +0000 (09:50 +0000)]
Merge remote-tracking branch 'upstream/pull/2429'

5 years agoMerge remote-tracking branch 'upstream/pull/2428'
Tom Hughes [Sun, 10 Nov 2019 09:50:28 +0000 (09:50 +0000)]
Merge remote-tracking branch 'upstream/pull/2428'

5 years agoUpdate hut icons
Chris Gadd [Sun, 10 Nov 2019 01:53:51 +0000 (14:53 +1300)]
Update hut icons

5 years agofixed typo
Enock Seth Nyamador [Sat, 9 Nov 2019 23:39:58 +0000 (23:39 +0000)]
fixed typo

5 years agoadd SOTM Africa 2019 banner
Enock Seth Nyamador [Sat, 9 Nov 2019 23:37:30 +0000 (23:37 +0000)]
add SOTM Africa 2019 banner

5 years agoMerge remote-tracking branch 'upstream/pull/834'
Tom Hughes [Thu, 7 Nov 2019 19:26:03 +0000 (19:26 +0000)]
Merge remote-tracking branch 'upstream/pull/834'

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 7 Nov 2019 15:22:42 +0000 (16:22 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoUpdate bundle
Tom Hughes [Tue, 5 Nov 2019 18:55:32 +0000 (18:55 +0000)]
Update bundle

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 4 Nov 2019 15:03:09 +0000 (16:03 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoMerge remote-tracking branch 'upstream/pull/2422'
Tom Hughes [Fri, 1 Nov 2019 09:13:39 +0000 (09:13 +0000)]
Merge remote-tracking branch 'upstream/pull/2422'

5 years agoRemove outdated reference to the external gpx importer
Andy Allan [Fri, 1 Nov 2019 08:39:04 +0000 (09:39 +0100)]
Remove outdated reference to the external gpx importer

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 31 Oct 2019 17:46:19 +0000 (18:46 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoMerge remote-tracking branch 'upstream/pull/2412'
Tom Hughes [Wed, 30 Oct 2019 19:20:30 +0000 (19:20 +0000)]
Merge remote-tracking branch 'upstream/pull/2412'

5 years agoMerge remote-tracking branch 'upstream/pull/2418'
Tom Hughes [Wed, 30 Oct 2019 19:20:11 +0000 (19:20 +0000)]
Merge remote-tracking branch 'upstream/pull/2418'

5 years agoMerge remote-tracking branch 'upstream/pull/2416'
Tom Hughes [Wed, 30 Oct 2019 19:20:08 +0000 (19:20 +0000)]
Merge remote-tracking branch 'upstream/pull/2416'

5 years agoUpdate bundle
Tom Hughes [Wed, 30 Oct 2019 19:16:03 +0000 (19:16 +0000)]
Update bundle

5 years agoAdd description of the nominatim key update process
Andy Allan [Wed, 30 Oct 2019 14:44:43 +0000 (15:44 +0100)]
Add description of the nominatim key update process

Fixes #2119

5 years agoRemove unused trace_optionals partial
Andy Allan [Wed, 30 Oct 2019 14:02:35 +0000 (15:02 +0100)]
Remove unused trace_optionals partial

Although the code to render the partial runs, `yield :optionals`
was removed from the site layout in 2013. So the code has been
ineffective since then.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 28 Oct 2019 15:38:58 +0000 (16:38 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoMerge remote-tracking branch 'upstream/pull/2413'
Tom Hughes [Sun, 27 Oct 2019 18:59:35 +0000 (18:59 +0000)]
Merge remote-tracking branch 'upstream/pull/2413'

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 24 Oct 2019 20:14:22 +0000 (22:14 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoUpdate to iD v2.16.0
Bryan Housel [Thu, 24 Oct 2019 03:43:28 +0000 (23:43 -0400)]
Update to iD v2.16.0

5 years agoMerge remote-tracking branch 'upstream/pull/2403'
Tom Hughes [Wed, 23 Oct 2019 17:48:17 +0000 (18:48 +0100)]
Merge remote-tracking branch 'upstream/pull/2403'

5 years agoMerge remote-tracking branch 'upstream/pull/2411'
Tom Hughes [Wed, 23 Oct 2019 09:55:02 +0000 (10:55 +0100)]
Merge remote-tracking branch 'upstream/pull/2411'

5 years agoRemove node/way/relation Search API
Andy Allan [Wed, 23 Oct 2019 09:41:05 +0000 (11:41 +0200)]
Remove node/way/relation Search API

This API clearly shows its age, having never been fully implemented
and simply returning 100 ways (or 2000 relations) at random matching
the provided tags.

It is, as far as I'm aware, completely unused. While it provides a
good amount of humour to anyone who reads the code, the time as come
for it to be retired.

5 years agoConvert various moderator? tests to use cancancan permissions checks
Andy Allan [Wed, 23 Oct 2019 09:26:16 +0000 (11:26 +0200)]
Convert various moderator? tests to use cancancan permissions checks

5 years agoConvert various administator? tests to use cancancan permissions checks
Andy Allan [Wed, 23 Oct 2019 08:52:12 +0000 (10:52 +0200)]
Convert various administator? tests to use cancancan permissions checks

5 years agoRemove references to libpgosm during travis runs
Andy Allan [Wed, 23 Oct 2019 07:33:05 +0000 (09:33 +0200)]
Remove references to libpgosm during travis runs

These were removed from the structure file in 098e73479b466902cf48a07627f050dadd2fd73e

5 years agoExclude node_modules form eslint checks
Tom Hughes [Tue, 22 Oct 2019 19:37:39 +0000 (20:37 +0100)]
Exclude node_modules form eslint checks

5 years agoMerge remote-tracking branch 'upstream/pull/2354'
Tom Hughes [Tue, 22 Oct 2019 19:33:45 +0000 (20:33 +0100)]
Merge remote-tracking branch 'upstream/pull/2354'

5 years agoMerge remote-tracking branch 'upstream/pull/2408'
Tom Hughes [Tue, 22 Oct 2019 19:29:00 +0000 (20:29 +0100)]
Merge remote-tracking branch 'upstream/pull/2408'

5 years agoUpdate to sprockets 4.x
Tom Hughes [Tue, 22 Oct 2019 19:20:30 +0000 (20:20 +0100)]
Update to sprockets 4.x

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 21 Oct 2019 15:12:30 +0000 (17:12 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoOoops, forgot to commit changes to db/structure.sql
Matt Amos [Mon, 21 Oct 2019 14:05:16 +0000 (15:05 +0100)]
Ooops, forgot to commit changes to db/structure.sql

5 years agoAdd pure SQL version of xid_to_int4.
Matt Amos [Mon, 21 Oct 2019 13:47:46 +0000 (14:47 +0100)]
Add pure SQL version of xid_to_int4.

5 years agoMerge remote-tracking branch 'openstreetmap/master' into mac-os-x-install
Matt Amos [Mon, 21 Oct 2019 13:22:59 +0000 (14:22 +0100)]
Merge remote-tracking branch 'openstreetmap/master' into mac-os-x-install

5 years agoAdd section on using rbenv, separate from main installation instructions.
Matt Amos [Mon, 21 Oct 2019 13:18:25 +0000 (14:18 +0100)]
Add section on using rbenv, separate from main installation instructions.

5 years agoMerge remote-tracking branch 'upstream/pull/2400'
Tom Hughes [Mon, 21 Oct 2019 09:31:06 +0000 (10:31 +0100)]
Merge remote-tracking branch 'upstream/pull/2400'

5 years agoRephrase note on vagrant providers, now that we support multiple providers
Andy Allan [Wed, 16 Oct 2019 14:43:51 +0000 (16:43 +0200)]
Rephrase note on vagrant providers, now that we support multiple providers

5 years agoSuppress new rubocop warning
Tom Hughes [Sun, 20 Oct 2019 18:48:36 +0000 (19:48 +0100)]
Suppress new rubocop warning

5 years agoUpdate bundle
Tom Hughes [Sun, 20 Oct 2019 18:44:28 +0000 (19:44 +0100)]
Update bundle

5 years agoDrop postgres 9.6 specific setting from structure.sql
Tom Hughes [Sun, 20 Oct 2019 18:22:23 +0000 (19:22 +0100)]
Drop postgres 9.6 specific setting from structure.sql

Closes #2404

5 years agoTidy up C database function support in travis
Tom Hughes [Sun, 20 Oct 2019 18:15:11 +0000 (19:15 +0100)]
Tidy up C database function support in travis

5 years agoMerge remote-tracking branch 'upstream/pull/2383'
Tom Hughes [Sun, 20 Oct 2019 18:13:30 +0000 (19:13 +0100)]
Merge remote-tracking branch 'upstream/pull/2383'

5 years agoUpdate rubocop todo
Manfred Stock [Wed, 4 Sep 2019 20:49:18 +0000 (22:49 +0200)]
Update rubocop todo

The addition of the wikimedia_commons hyperlinking feature seems to trigger
the Metrics/ModuleLength check.

5 years agoTurn wikimedia_commons values into links
Manfred Stock [Wed, 12 Nov 2014 20:36:19 +0000 (21:36 +0100)]
Turn wikimedia_commons values into links

This turns the value of the 'wikimedia_commons' tag into a link to the
respective page on commons.wikimedia.org (if it is a 'File:' or 'Category:'
item) by enhancing the browse tags helper. See [1] for the tag description.

[1] http://wiki.openstreetmap.org/wiki/Key:wikimedia_commons

5 years agoFix installation instructions for Mac OS X
Matt Amos [Fri, 18 Oct 2019 15:25:30 +0000 (16:25 +0100)]
Fix installation instructions for Mac OS X

The installation of `libxml-ruby` was broken because it was picking up the system version of the libxml2 library. By setting a `bundler` config item, it's possible to point it to the right place.

Also updated the instructions for `phantomjs`, which Homebrew has moved to a cask (and is now not officially supported), and added some of the extra command line tools that are used (`pngcrush`, `optipng`, etc...)

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 17 Oct 2019 18:10:51 +0000 (20:10 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoAllow administrators to see deleted diary comments
Tom Hughes [Thu, 17 Oct 2019 11:16:28 +0000 (12:16 +0100)]
Allow administrators to see deleted diary comments

5 years agoMerge remote-tracking branch 'upstream/pull/2398'
Tom Hughes [Wed, 16 Oct 2019 13:20:44 +0000 (14:20 +0100)]
Merge remote-tracking branch 'upstream/pull/2398'

5 years agoRemove unused banner images
Tom Hughes [Wed, 16 Oct 2019 12:59:02 +0000 (13:59 +0100)]
Remove unused banner images

5 years agoRephrase changeset comment notifications to clarify the time is for the comment
Andy Allan [Wed, 16 Oct 2019 12:48:45 +0000 (14:48 +0200)]
Rephrase changeset comment notifications to clarify the time is for the comment

Refs https://trac.openstreetmap.org/ticket/5307

There's still an unfortunate double use of "comment" to mean both the
ChangesetComment and also the changeset's `comment` tag, but I can't see a
simple way to fix that.

5 years agoadd sotm_asia_2019.png for StoM Asia 2019 banner image
Fazle Rabbi [Wed, 16 Oct 2019 11:04:55 +0000 (17:04 +0600)]
add sotm_asia_2019.png for StoM Asia 2019 banner image

5 years agomodify banners.yml to add SotM Asia 2019
Fazle Rabbi [Wed, 16 Oct 2019 11:01:57 +0000 (17:01 +0600)]
modify banners.yml to add SotM Asia 2019

5 years agoDMCA page is now available over https
Andy Allan [Wed, 16 Oct 2019 09:25:16 +0000 (11:25 +0200)]
DMCA page is now available over https

5 years agoMerge pull request #2374 from tordans/patch-1
Andy Allan [Wed, 16 Oct 2019 08:32:17 +0000 (10:32 +0200)]
Merge pull request #2374 from tordans/patch-1

Add reference to settings.local.yml-file in installation.md

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 14 Oct 2019 15:39:42 +0000 (17:39 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoGive factory created traces a size
Tom Hughes [Sun, 13 Oct 2019 11:18:57 +0000 (12:18 +0100)]
Give factory created traces a size

Traces which are marked as inserted are expected to have a size.

5 years agoMake trace.trace.count_points a plural string
Tom Hughes [Sun, 13 Oct 2019 09:54:13 +0000 (10:54 +0100)]
Make trace.trace.count_points a plural string

5 years agoDon't try and commas to the trace size
Tom Hughes [Sun, 13 Oct 2019 09:53:08 +0000 (10:53 +0100)]
Don't try and commas to the trace size

It breaks pluralisation lookups in the locale and in any case
adding a comma every three digits is locale specific.

Fixes #2388

5 years agoAdded landuse icons and fixed some mistakes in browse.scss
hikemaniac [Wed, 9 Oct 2019 15:53:37 +0000 (17:53 +0200)]
Added landuse icons and fixed some mistakes in browse.scss

Closes #2385

5 years agoClarify that there is no pure SQL version of xid_to_int4 for diff replication.
Matt Amos [Wed, 9 Oct 2019 14:18:05 +0000 (15:18 +0100)]
Clarify that there is no pure SQL version of xid_to_int4 for diff replication.

5 years agoMake documentation clearer and shorter by deferring complicated shared-library SQL...
Matt Amos [Wed, 9 Oct 2019 11:13:27 +0000 (12:13 +0100)]
Make documentation clearer and shorter by deferring complicated shared-library SQL explanations to 'advanced' documentation. Also mention in the CONFIGURING.md.

5 years agoSwitch to use v4.0 of the Facebook API for authentication
Tom Hughes [Tue, 8 Oct 2019 17:36:27 +0000 (18:36 +0100)]
Switch to use v4.0 of the Facebook API for authentication

5 years agoUpdate rubocop todo
Tom Hughes [Mon, 7 Oct 2019 19:38:03 +0000 (20:38 +0100)]
Update rubocop todo

5 years agoUpdate bundle
Tom Hughes [Mon, 7 Oct 2019 19:29:35 +0000 (20:29 +0100)]
Update bundle

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 7 Oct 2019 17:56:25 +0000 (19:56 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoReverting part of the db/structure.sql change which had been unintentionally committe...
Matt Amos [Fri, 4 Oct 2019 14:38:42 +0000 (15:38 +0100)]
Reverting part of the db/structure.sql change which had been unintentionally committed. (perhaps PG version difference?)

5 years agoRemove shared lib PG functions from committed DB structure.
Matt Amos [Fri, 4 Oct 2019 12:40:27 +0000 (13:40 +0100)]
Remove shared lib PG functions from committed DB structure.

5 years agoRemove need for shared library PostgreSQL functions
Matt Amos [Fri, 4 Oct 2019 12:09:32 +0000 (13:09 +0100)]
Remove need for shared library PostgreSQL functions

This repo contains code for three functions to be loaded into PostgreSQL as a shared library:

1. `maptile_for_point`, which is used only by the `/changes` API call. This API call is little-used and IMHO should be deprecated and removed. However, even now it's hardly on the hot path for most development activities.
2. `tile_for_point`, which is used only in migrations. At this point, it seems unlikely that anyone will be doing a migration on existing data which would call this function (most developers will be running migrations on an empty database, to set it up).
3. `xid_to_int4`, which is only used for replication using Osmosis and isn't used in the Rails code at all. Hopefully this will be replaced Real Soon Now, but until then it's a quite advanced feature that most developers won't need.

Therefore, this patch proposes to replace the above three shared library functions with SQL implementations of the first two. These are _much_ slower - by a factor of about 30x, however this makes no difference when they're run on a completely empty database. In return, we're able to drop a dependency on the PostgreSQL server development package, and clean a few lines out of the installation instructions.

It's still possible to make and install the shared library functions, and I've included instructions about how to do that - although it shouldn't be necessary for the vast majority of `openstreetmap-website` developers.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 3 Oct 2019 17:47:17 +0000 (19:47 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Tue, 1 Oct 2019 14:41:10 +0000 (16:41 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 26 Sep 2019 18:38:09 +0000 (20:38 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 23 Sep 2019 16:02:20 +0000 (18:02 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoAdd reference to settings-file in installation.md
Tobias [Mon, 23 Sep 2019 14:45:25 +0000 (16:45 +0200)]
Add reference to settings-file in installation.md

This way new developers will not have to look up this error themselves.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 19 Sep 2019 12:41:09 +0000 (14:41 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 16 Sep 2019 17:04:07 +0000 (19:04 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 12 Sep 2019 14:10:59 +0000 (16:10 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 9 Sep 2019 17:26:49 +0000 (19:26 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Fri, 6 Sep 2019 05:09:19 +0000 (07:09 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoWhen overriding setup make sure to call the superclass
Tom Hughes [Thu, 5 Sep 2019 19:30:34 +0000 (20:30 +0100)]
When overriding setup make sure to call the superclass

5 years agoMerge pull request #1779 from stefanb/tag-colour-preview
Andy Allan [Wed, 4 Sep 2019 13:15:06 +0000 (15:15 +0200)]
Merge pull request #1779 from stefanb/tag-colour-preview

Added color preview box in tag browser sidebar