rails.git
5 years agoLook for locale specific names
Tom Hughes [Fri, 7 Nov 2014 15:19:30 +0000 (15:19 +0000)]
Look for locale specific names

5 years agoDon't do the admin boundary special case unless admin_level is set
Tom Hughes [Fri, 7 Nov 2014 15:00:22 +0000 (15:00 +0000)]
Don't do the admin boundary special case unless admin_level is set

5 years agoMerge branch 'overpass'
Tom Hughes [Fri, 7 Nov 2014 08:40:18 +0000 (08:40 +0000)]
Merge branch 'overpass'

5 years agoRecommend PostgreSQL 9.1+ in database.yml
Paul Norman [Fri, 7 Nov 2014 05:41:15 +0000 (21:41 -0800)]
Recommend PostgreSQL 9.1+ in database.yml

Postgres 8.3 is EOL and the minimum version supported by PostgreSQL
is 9.0. The production servers run 9.1, and the extension setup is
easier with it too.

5 years agoLink to Phusion Passenger docs for production
Paul Norman [Fri, 7 Nov 2014 05:17:30 +0000 (21:17 -0800)]
Link to Phusion Passenger docs for production

Phusion Passenger has documentation for common web servers, so we can
link to them, as most users will be using one of them in production.

5 years agoAdd KSJ2 tags to uninteresting list
Paul Norman [Thu, 6 Nov 2014 21:02:17 +0000 (13:02 -0800)]
Add KSJ2 tags to uninteresting list

The KSJ2 tags often appear on nodes with no interesting tags
as import cruft.

5 years agoDon't enable query mode when loading a query URL
Tom Hughes [Wed, 5 Nov 2014 20:19:21 +0000 (20:19 +0000)]
Don't enable query mode when loading a query URL

5 years agoAdd comments_feed action to various filters
Tom Hughes [Wed, 5 Nov 2014 20:34:45 +0000 (20:34 +0000)]
Add comments_feed action to various filters

Fixes #825

5 years agoAllow query mode to be disabled when the sidebar is open
Tom Hughes [Wed, 5 Nov 2014 13:57:52 +0000 (13:57 +0000)]
Allow query mode to be disabled when the sidebar is open

5 years agoLeave overpass result links coloured blue
Dan Stowell [Mon, 13 Oct 2014 20:17:12 +0000 (21:17 +0100)]
Leave overpass result links coloured blue

Closes #47.

5 years agoSort enclosing features by size
Tom Hughes [Tue, 4 Nov 2014 09:55:26 +0000 (09:55 +0000)]
Sort enclosing features by size

5 years agoAdd some missing browse icons
Dan Karran [Tue, 28 Oct 2014 20:15:40 +0000 (20:15 +0000)]
Add some missing browse icons

Icons for highway=tertiary, highway=track, highway=path and barrier=wall.

5 years agoMerge pull request #24 from zerebubuth/routing-merge
Richard Fairhurst [Mon, 3 Nov 2014 11:33:08 +0000 (11:33 +0000)]
Merge pull request #24 from zerebubuth/routing-merge

Routing merge

5 years agoMerge remote-tracking branch 'upstream/master' into routing
Matt Amos [Mon, 3 Nov 2014 11:08:13 +0000 (11:08 +0000)]
Merge remote-tracking branch 'upstream/master' into routing

Conflicts:
app/assets/javascripts/index.js
app/assets/javascripts/leaflet.map.js.erb
config/environments/production.rb
config/locales/de.yml

5 years agoDon't centre on load if the location is already in view
Tom Hughes [Sat, 1 Nov 2014 17:20:26 +0000 (17:20 +0000)]
Don't centre on load if the location is already in view

5 years agoUse new overpass geometry output support to get geometeries
Tom Hughes [Sat, 1 Nov 2014 16:11:12 +0000 (16:11 +0000)]
Use new overpass geometry output support to get geometeries

5 years agoMerge branch 'master' into overpass
Tom Hughes [Sat, 1 Nov 2014 12:46:42 +0000 (12:46 +0000)]
Merge branch 'master' into overpass

5 years agoMerge branch 'comments'
Tom Hughes [Sat, 1 Nov 2014 11:43:21 +0000 (11:43 +0000)]
Merge branch 'comments'

5 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 27 Oct 2014 17:58:16 +0000 (18:58 +0100)]
Localisation updates from https://translatewiki.net.

5 years agoFixes for offline mode
Tom Hughes [Sun, 26 Oct 2014 11:39:00 +0000 (11:39 +0000)]
Fixes for offline mode

5 years agoUpdate to iD v1.6.2
John Firebaugh [Fri, 24 Oct 2014 16:26:09 +0000 (09:26 -0700)]
Update to iD v1.6.2

5 years agoUpdate to iD v1.6.1
John Firebaugh [Thu, 23 Oct 2014 22:29:26 +0000 (15:29 -0700)]
Update to iD v1.6.1

5 years agoMove changeset comment feeds out of the API namespace
Tom Hughes [Thu, 23 Oct 2014 20:40:13 +0000 (21:40 +0100)]
Move changeset comment feeds out of the API namespace

5 years agoTidy up changeset comment tests and beef them up a bit
Tom Hughes [Sun, 19 Oct 2014 20:34:50 +0000 (21:34 +0100)]
Tidy up changeset comment tests and beef them up a bit

5 years agoTidy up changeset comment code
Tom Hughes [Sun, 19 Oct 2014 20:31:23 +0000 (21:31 +0100)]
Tidy up changeset comment code

5 years agoChangeset discussions
Łukasz Gurdek [Sun, 7 Sep 2014 13:25:56 +0000 (14:25 +0100)]
Changeset discussions

Add support for commenting on changesets with RSS feeds and email
notification of comments to other commenters and people that have
chosen to subscribe to a changeset.

5 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Thu, 23 Oct 2014 19:37:57 +0000 (21:37 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 20 Oct 2014 17:07:29 +0000 (19:07 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoUpdate Potlatch 2 to 2.3-648-g9cab056 build
Tom Hughes [Mon, 20 Oct 2014 08:04:15 +0000 (09:04 +0100)]
Update Potlatch 2 to 2.3-648-g9cab056 build

5 years agoMerge remote-tracking branch 'osmlab/iD-1.6.0'
Tom Hughes [Fri, 17 Oct 2014 16:21:37 +0000 (17:21 +0100)]
Merge remote-tracking branch 'osmlab/iD-1.6.0'

5 years agoAdd some more model tests for notes and note comments
Tom Hughes [Thu, 16 Oct 2014 19:36:40 +0000 (20:36 +0100)]
Add some more model tests for notes and note comments

5 years agoValidate note comments for control characters
Tom Hughes [Wed, 15 Oct 2014 23:59:34 +0000 (00:59 +0100)]
Validate note comments for control characters

5 years agoAdd missing event types to note comment fixtures
Tom Hughes [Wed, 15 Oct 2014 23:59:24 +0000 (00:59 +0100)]
Add missing event types to note comment fixtures

5 years agoUpdate Potlatch 2 to 2.3-645-g81e8bcb build
Tom Hughes [Tue, 14 Oct 2014 10:10:06 +0000 (11:10 +0100)]
Update Potlatch 2 to 2.3-645-g81e8bcb build

5 years agoDon't pass the hash when routing an empty search query
Tom Hughes [Mon, 13 Oct 2014 13:04:19 +0000 (14:04 +0100)]
Don't pass the hash when routing an empty search query

Fixes #793

5 years agoUpdate to CPK 7.0.11 and drop monkey patch
Tom Hughes [Fri, 10 Oct 2014 11:31:42 +0000 (12:31 +0100)]
Update to CPK 7.0.11 and drop monkey patch

5 years agoUpdate to iD v1.6.0
John Firebaugh [Mon, 6 Oct 2014 21:58:08 +0000 (14:58 -0700)]
Update to iD v1.6.0

5 years agoForward the `comment` hash parameter to iD
John Firebaugh [Mon, 6 Oct 2014 21:47:36 +0000 (14:47 -0700)]
Forward the `comment` hash parameter to iD

See https://github.com/openstreetmap/iD/commit/21da76cf8060832e36d341d9bd41dd1142810b08

5 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 6 Oct 2014 10:11:58 +0000 (12:11 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoTest that reserved usernames are not allowed
Tom Hughes [Thu, 2 Oct 2014 18:54:26 +0000 (19:54 +0100)]
Test that reserved usernames are not allowed

5 years agoUpdate to rails 4.1.6
Tom Hughes [Thu, 11 Sep 2014 19:03:43 +0000 (20:03 +0100)]
Update to rails 4.1.6

5 years agoBan usernames which match special URLs
Tom Hughes [Thu, 2 Oct 2014 12:36:46 +0000 (13:36 +0100)]
Ban usernames which match special URLs

Trac #5236

5 years agoExplain how to load data for testing
Paul Norman [Tue, 9 Sep 2014 00:12:10 +0000 (17:12 -0700)]
Explain how to load data for testing

This is a fairly common query, and not too complicated where the data only needs to be loaded.

Loading data then editing it is more complex, and not covered here.

5 years agoMove noscript message clear of the sidebar
Tom Hughes [Sun, 7 Sep 2014 12:48:28 +0000 (13:48 +0100)]
Move noscript message clear of the sidebar

Fixes #808

5 years agoAdd SOTM advert
Tom Hughes [Thu, 4 Sep 2014 14:25:56 +0000 (15:25 +0100)]
Add SOTM advert

5 years agoAdd an imagery blacklist to capabilities
Paul Norman [Sat, 30 Aug 2014 08:32:35 +0000 (01:32 -0700)]
Add an imagery blacklist to capabilities

This blacklist is for imagery which is of an incompatible license or ToS
but is incorrectly used with some frequency.

This adds a <policy> element to the capabilities XML which contains the
blacklist information within it

5 years agoMove ICO favion into an IE conditional comment
Tom Hughes [Tue, 19 Aug 2014 09:55:01 +0000 (10:55 +0100)]
Move ICO favion into an IE conditional comment

5 years agoUpdate to rails 4.1.5
Tom Hughes [Tue, 19 Aug 2014 08:26:34 +0000 (09:26 +0100)]
Update to rails 4.1.5

5 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Sun, 10 Aug 2014 09:46:50 +0000 (11:46 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoAddd some missing quotes
Tom Hughes [Sun, 10 Aug 2014 07:55:06 +0000 (08:55 +0100)]
Addd some missing quotes

5 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Sat, 9 Aug 2014 14:21:12 +0000 (16:21 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoadding detail to configure.md
Martijn van Exel [Thu, 7 Aug 2014 21:38:32 +0000 (15:38 -0600)]
adding detail to configure.md

5 years agoRevert "Localisation updates from https://translatewiki.net."
Tom Hughes [Wed, 6 Aug 2014 15:04:13 +0000 (16:04 +0100)]
Revert "Localisation updates from https://translatewiki.net."

This reverts commit e25fbfa13af4b5b2ffa0b998b45d8706d38b2c88.

5 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Wed, 6 Aug 2014 14:50:27 +0000 (16:50 +0200)]
Localisation updates from https://translatewiki.net.

5 years agoPrecompile expressInstall.swf
Tom Hughes [Wed, 6 Aug 2014 07:58:47 +0000 (08:58 +0100)]
Precompile expressInstall.swf

5 years agoUpdate Potlatch 2 to 2.3-632-g1a1f24a build
Tom Hughes [Wed, 6 Aug 2014 07:53:03 +0000 (08:53 +0100)]
Update Potlatch 2 to 2.3-632-g1a1f24a build

5 years agoRestore original limits for user lists in statistics
Tom Hughes [Tue, 5 Aug 2014 08:24:20 +0000 (09:24 +0100)]
Restore original limits for user lists in statistics

5 years agoUpdate to iD v1.5.4
John Firebaugh [Tue, 29 Jul 2014 18:13:03 +0000 (11:13 -0700)]
Update to iD v1.5.4

5 years agoDon't preload the nodes as it seems to break the ordering
Tom Hughes [Tue, 29 Jul 2014 09:14:08 +0000 (10:14 +0100)]
Don't preload the nodes as it seems to break the ordering

Fixes #795

5 years agoRevert "Fix off-by-one error in user notes list"
Tom Hughes [Sat, 26 Jul 2014 09:34:57 +0000 (10:34 +0100)]
Revert "Fix off-by-one error in user notes list"

This reverts commit 706454ae35b644c619b9cd332b3c97133054a397.

5 years agoUse autoprefixer to generate CSS prefixes
Tom Hughes [Fri, 25 Jul 2014 18:38:03 +0000 (19:38 +0100)]
Use autoprefixer to generate CSS prefixes

5 years agoPrecompile iD locales
Tom Hughes [Fri, 25 Jul 2014 17:44:57 +0000 (18:44 +0100)]
Precompile iD locales

5 years agoUpdate to iD v1.5.3
John Firebaugh [Fri, 25 Jul 2014 17:07:14 +0000 (10:07 -0700)]
Update to iD v1.5.3

5 years agoMore modernisations for the statistics script
Tom Hughes [Fri, 25 Jul 2014 15:49:40 +0000 (16:49 +0100)]
More modernisations for the statistics script

5 years agoModernise statistics script to work with rails 4.1
Tom Hughes [Fri, 25 Jul 2014 15:40:53 +0000 (16:40 +0100)]
Modernise statistics script to work with rails 4.1

5 years agoFix off-by-one error in user notes list
Toby Murray [Thu, 24 Jul 2014 07:21:00 +0000 (02:21 -0500)]
Fix off-by-one error in user notes list

5 years agoLet test_note_event pass in timezones other than +00:00
Florian M. Schäfer [Thu, 24 Jul 2014 21:09:27 +0000 (23:09 +0200)]
Let test_note_event pass in timezones other than +00:00

5 years agoRemove myopenid from openid providers
Sunah Suh [Fri, 18 Jul 2014 04:27:15 +0000 (23:27 -0500)]
Remove myopenid from openid providers

5 years agoFix error resolving relation parents
Tom Hughes [Wed, 23 Jul 2014 23:23:45 +0000 (00:23 +0100)]
Fix error resolving relation parents

It's not entirely clear why specifying the foreign key explicitly
fixes this - the value given is what it should default to - but
without this it finds the child relation instead when looking at
the parents of a relation.

Fixes #789

5 years agoForce the path to be treated as UTF-8
Tom Hughes [Tue, 22 Jul 2014 14:13:36 +0000 (15:13 +0100)]
Force the path to be treated as UTF-8

5 years agoUpdate bundle
Tom Hughes [Mon, 21 Jul 2014 07:57:15 +0000 (08:57 +0100)]
Update bundle

5 years agoMerge branch 'rails41'
Tom Hughes [Mon, 21 Jul 2014 07:53:44 +0000 (08:53 +0100)]
Merge branch 'rails41'

5 years agoAdded tests for wikidata links in the browse helper
Florian M. Schäfer [Sun, 20 Jul 2014 05:35:36 +0000 (07:35 +0200)]
Added tests for wikidata links in the browse helper

5 years agoAdded wikidata links to the browse helper
Florian M. Schäfer [Sun, 20 Jul 2014 05:33:59 +0000 (07:33 +0200)]
Added wikidata links to the browse helper

Analogous to wikipedia tags this links any wikidata tag with its item
page on wikidata.

For now it's restricted to the plain wikidata=* tag (namespaces like
operator:wikidata=* and similar are not yet supported) and only accepts
the values with the format Q<number>.

5 years agoUpdate to iD v1.5.2
John Firebaugh [Tue, 15 Jul 2014 23:53:21 +0000 (16:53 -0700)]
Update to iD v1.5.2

5 years agoThe rubygem is called bundler not bundle
Shaun McDonald [Mon, 14 Jul 2014 11:49:48 +0000 (12:49 +0100)]
The rubygem is called bundler not bundle

Also I'm that needs to be installed with sudo as gems won't normally install into the home user directory without more setup

5 years agoUpdate "Metro Extracts" link
Tom Hughes [Fri, 11 Jul 2014 19:00:52 +0000 (20:00 +0100)]
Update "Metro Extracts" link

Fixes #780

5 years agoUpdate to iD v1.5.1
John Firebaugh [Thu, 10 Jul 2014 17:13:01 +0000 (10:13 -0700)]
Update to iD v1.5.1

5 years agoUpdate to iD v1.5.0
Aaron Lidman [Wed, 9 Jul 2014 00:07:33 +0000 (20:07 -0400)]
Update to iD v1.5.0

5 years agoRemove debug statement
Tom Hughes [Fri, 4 Jul 2014 18:58:03 +0000 (19:58 +0100)]
Remove debug statement

5 years agoUpdate to rails 4.1.4
Tom Hughes [Thu, 26 Jun 2014 20:16:31 +0000 (21:16 +0100)]
Update to rails 4.1.4

5 years agoDon't assume we know what ID the new block will have
Tom Hughes [Wed, 28 May 2014 08:55:34 +0000 (09:55 +0100)]
Don't assume we know what ID the new block will have

5 years agoUpdate for API change in CPK 7.x
Tom Hughes [Tue, 27 May 2014 23:44:26 +0000 (00:44 +0100)]
Update for API change in CPK 7.x

5 years agoMake sure all environment can see asset precompilation rules
Tom Hughes [Sat, 24 May 2014 23:24:41 +0000 (00:24 +0100)]
Make sure all environment can see asset precompilation rules

5 years agoMake sure we restore I18n.locale when tests complete
Tom Hughes [Tue, 13 May 2014 18:25:06 +0000 (19:25 +0100)]
Make sure we restore I18n.locale when tests complete

5 years agoSort tags alphabetically for consistent results
Tom Hughes [Tue, 13 May 2014 18:21:01 +0000 (19:21 +0100)]
Sort tags alphabetically for consistent results

5 years agoUpdate postgres connection adaptor patches
Tom Hughes [Thu, 24 Apr 2014 23:43:24 +0000 (00:43 +0100)]
Update postgres connection adaptor patches

5 years agoRename Trace#public to Trace#visible_to_all
Tom Hughes [Thu, 24 Apr 2014 23:20:05 +0000 (00:20 +0100)]
Rename Trace#public to Trace#visible_to_all

5 years agoRename User#public to User#identifiable
Tom Hughes [Thu, 24 Apr 2014 23:16:35 +0000 (00:16 +0100)]
Rename User#public to User#identifiable

5 years agoUpdate to rails 4.1.1
Tom Hughes [Thu, 24 Apr 2014 21:58:30 +0000 (22:58 +0100)]
Update to rails 4.1.1

5 years agoImprove testing of emails
Tom Hughes [Wed, 28 May 2014 08:55:13 +0000 (09:55 +0100)]
Improve testing of emails

Make sure we test that everything which should send email does
and that we clear the pending emails afterwards.

5 years agoFix database offline mode
Tom Hughes [Wed, 2 Jul 2014 10:07:27 +0000 (11:07 +0100)]
Fix database offline mode

5 years agoFix attribution links for Thunderforest layers
Tom Hughes [Thu, 26 Jun 2014 09:42:16 +0000 (10:42 +0100)]
Fix attribution links for Thunderforest layers

5 years agoUpdate to latest leaflet-osm plugin
Tom Hughes [Wed, 25 Jun 2014 17:54:12 +0000 (18:54 +0100)]
Update to latest leaflet-osm plugin

5 years agoLocalisation updates from https://translatewiki.net.
Siebrand Mazeland [Mon, 23 Jun 2014 12:44:35 +0000 (12:44 +0000)]
Localisation updates from https://translatewiki.net.

5 years agoFix line height for buttons in Firefox 30
Tom Hughes [Sun, 22 Jun 2014 09:25:08 +0000 (10:25 +0100)]
Fix line height for buttons in Firefox 30

This is pretty ugly, but it's the best solution I have at the
current time. Seems to fix Firefox 30 without breaking Chrome
or Opera and doesn't make IE8 any worse.

Fixes #756

5 years agoRemove ancient documentation.
Andy Allan [Thu, 19 Jun 2014 13:59:13 +0000 (14:59 +0100)]
Remove ancient documentation.

5 years agoImprove blocking of characters not allowed in XML
Tom Hughes [Wed, 18 Jun 2014 23:25:18 +0000 (00:25 +0100)]
Improve blocking of characters not allowed in XML

5 years agoStyle trace edit form to match trace creation form
Tom Hughes [Wed, 18 Jun 2014 21:48:23 +0000 (22:48 +0100)]
Style trace edit form to match trace creation form

5 years agoIncrease field widths on trace upload form
Tom Hughes [Wed, 18 Jun 2014 21:38:22 +0000 (22:38 +0100)]
Increase field widths on trace upload form

Fixes #664