rails.git
21 months agoMerge branch 'master' into moderation
Andy Allan [Wed, 28 Feb 2018 07:46:25 +0000 (15:46 +0800)]
Merge branch 'master' into moderation

21 months agoReposition the note and user report flags
Andy Allan [Wed, 28 Feb 2018 07:43:22 +0000 (15:43 +0800)]
Reposition the note and user report flags

21 months agoRework the new report form text and layout
Andy Allan [Wed, 28 Feb 2018 07:27:01 +0000 (15:27 +0800)]
Rework the new report form text and layout

21 months agoRearrange issues table and combine some columns.
Andy Allan [Wed, 28 Feb 2018 06:56:47 +0000 (14:56 +0800)]
Rearrange issues table and combine some columns.

21 months agoRemove reporting of changesets
Andy Allan [Wed, 28 Feb 2018 06:39:40 +0000 (14:39 +0800)]
Remove reporting of changesets

21 months agoAllow reporting of anonymous notes
Andy Allan [Wed, 28 Feb 2018 06:26:40 +0000 (14:26 +0800)]
Allow reporting of anonymous notes

21 months agoRefactor reportable_url to just return the url
Andy Allan [Wed, 28 Feb 2018 04:15:45 +0000 (12:15 +0800)]
Refactor reportable_url to just return the url

Allows removal of the largely duplicate instance_url helper (which
returned the same urls, but with a hard-coded title).

21 months agoRefactor reportable_url helper to focus on just the title choices.
Andy Allan [Wed, 28 Feb 2018 03:53:43 +0000 (11:53 +0800)]
Refactor reportable_url helper to focus on just the title choices.

21 months agoRemove the report_type helper and use the model_name.human to look up translations.
Andy Allan [Wed, 28 Feb 2018 03:40:00 +0000 (11:40 +0800)]
Remove the report_type helper and use the model_name.human to look up translations.

21 months agoLink to diary comments using anchors, rather than showing them alone
Andy Allan [Wed, 28 Feb 2018 03:24:00 +0000 (11:24 +0800)]
Link to diary comments using anchors, rather than showing them alone

Neither way is perfect, but this is less surprising than seeing a diary
entry with only one comment visible.

21 months agoAllow the status to be translated in the table of results
Andy Allan [Wed, 28 Feb 2018 02:50:27 +0000 (10:50 +0800)]
Allow the status to be translated in the table of results

21 months agoRework status search to avoid relying on the enum ids, and also to allow translations
Andy Allan [Wed, 28 Feb 2018 02:44:50 +0000 (10:44 +0800)]
Rework status search to avoid relying on the enum ids, and also to allow translations

21 months agoAvoid submit_tag to avoid 'Save changes' default
Andy Allan [Fri, 23 Feb 2018 04:30:37 +0000 (12:30 +0800)]
Avoid submit_tag to avoid 'Save changes' default

21 months agoresolve last_reported_by vs last_updated_by duplication
Andy Allan [Fri, 23 Feb 2018 02:18:57 +0000 (10:18 +0800)]
resolve last_reported_by vs last_updated_by duplication

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Feb 2018 11:21:36 +0000 (12:21 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 19 Feb 2018 08:22:31 +0000 (09:22 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoAdd libffi to requirements
Tom Hughes [Sun, 18 Feb 2018 10:22:34 +0000 (10:22 +0000)]
Add libffi to requirements

21 months agoFix route path 'hovering' when marker positions are changed
Jamie Guthrie [Wed, 14 Feb 2018 19:54:53 +0000 (19:54 +0000)]
Fix route path 'hovering' when marker positions are changed

Closes #1755

21 months agoFix directions for roundabout without exit number
Jamie Guthrie [Thu, 15 Feb 2018 09:53:00 +0000 (09:53 +0000)]
Fix directions for roundabout without exit number

Closes #1756

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 15 Feb 2018 09:00:41 +0000 (10:00 +0100)]
Localisation updates from https://translatewiki.net.

21 months agoUpdate bundle
Tom Hughes [Wed, 14 Feb 2018 21:14:47 +0000 (21:14 +0000)]
Update bundle

21 months agoAvoid relying on global state to detect when we are dragging
Tom Hughes [Wed, 14 Feb 2018 17:58:01 +0000 (17:58 +0000)]
Avoid relying on global state to detect when we are dragging

We can't guarantee what order getRoute calls will finish in so
relying on global state is dangerous - capture it in the closure
instead so that each route knows what it is doing.

21 months agoStop map zooming out after dropping marker
Tom Hughes [Wed, 14 Feb 2018 01:19:30 +0000 (01:19 +0000)]
Stop map zooming out after dropping marker

Closes #1751

21 months agoChange directions start to say 'on road' rather than 'at end of road'
Jamie Guthrie [Wed, 14 Feb 2018 00:22:39 +0000 (00:22 +0000)]
Change directions start to say 'on road' rather than 'at end of road'

Closes #1750

21 months agoSmall comment fix
mmd-osm [Tue, 13 Feb 2018 22:24:07 +0000 (23:24 +0100)]
Small comment fix

21 months agoRemove BBOX expansion performance optimization
mmd-osm [Tue, 13 Feb 2018 22:07:30 +0000 (23:07 +0100)]
Remove BBOX expansion performance optimization

Closes #1749
Fixes #1742

21 months agoCorrectly swap from and to values when reversing directions
Jamie Guthrie [Wed, 14 Feb 2018 06:49:41 +0000 (06:49 +0000)]
Correctly swap from and to values when reversing directions

Closes #1752
Fixes #1748

21 months agoImprove OSRM directions for on and off ramps
Jamie Guthrie [Tue, 13 Feb 2018 17:28:09 +0000 (17:28 +0000)]
Improve OSRM directions for on and off ramps

Try and show both the name of the road being turned on to and the
destination depending on what is available.

Closes #1740

21 months agoAdd padding to directions popups
Jamie Guthrie [Tue, 13 Feb 2018 01:28:57 +0000 (01:28 +0000)]
Add padding to directions popups

Clicking on a direction step now pans to the popup, but includes some
padding so that the popup is not hidden in the corner of the screen.

Closes #1745

21 months agoUse both name and ref when naming roads in directions
Jamie Guthrie [Mon, 12 Feb 2018 07:29:31 +0000 (07:29 +0000)]
Use both name and ref when naming roads in directions

Closes #1741

21 months agoUpdate wiki_pages.yml, fix http url in update script
mmd-osm [Sun, 11 Feb 2018 16:40:31 +0000 (17:40 +0100)]
Update wiki_pages.yml, fix http url in update script

21 months agoFix broken translation
Tom Hughes [Mon, 12 Feb 2018 20:11:30 +0000 (20:11 +0000)]
Fix broken translation

21 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 12 Feb 2018 07:40:25 +0000 (08:40 +0100)]
Localisation updates from https://translatewiki.net.

22 months agoUse https when redirecting to the render server
Tom Hughes [Fri, 9 Feb 2018 22:31:45 +0000 (22:31 +0000)]
Use https when redirecting to the render server

22 months agoUse correct class to disable zoom buttons
Tom Hughes [Fri, 9 Feb 2018 18:49:58 +0000 (18:49 +0000)]
Use correct class to disable zoom buttons

Fixes #1365

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 8 Feb 2018 09:08:10 +0000 (10:08 +0100)]
Localisation updates from https://translatewiki.net.

22 months agoUse configured protocol for URLs in diary feeds
Tom Hughes [Mon, 5 Feb 2018 22:31:27 +0000 (22:31 +0000)]
Use configured protocol for URLs in diary feeds

22 months agoUse configured server protocol for shared URLs
Tom Hughes [Mon, 5 Feb 2018 21:03:45 +0000 (21:03 +0000)]
Use configured server protocol for shared URLs

Closes #939

22 months agoUse configured server protocol for links in e-mail notifications
Tom Hughes [Mon, 5 Feb 2018 21:01:36 +0000 (21:01 +0000)]
Use configured server protocol for links in e-mail notifications

Closes #1341

22 months agoMake OSM::GreatCircle clamp results to the globe
Tom Hughes [Sun, 4 Feb 2018 17:42:40 +0000 (17:42 +0000)]
Make OSM::GreatCircle clamp results to the globe

22 months agoMake travis build 3GL quad tile functions
Tom Hughes [Sun, 4 Feb 2018 17:38:55 +0000 (17:38 +0000)]
Make travis build 3GL quad tile functions

22 months agoAdd tests for quad tiles
Tom Hughes [Sun, 4 Feb 2018 17:33:44 +0000 (17:33 +0000)]
Add tests for quad tiles

22 months agoFix C version of QuadTile#tiles_for_area to return correct tiles
Tom Hughes [Sun, 4 Feb 2018 17:22:06 +0000 (17:22 +0000)]
Fix C version of QuadTile#tiles_for_area to return correct tiles

22 months agoMerge remote-tracking branch 'upstream/pull/1704'
Tom Hughes [Sun, 4 Feb 2018 15:09:40 +0000 (15:09 +0000)]
Merge remote-tracking branch 'upstream/pull/1704'

22 months agoAdd marker at trace start coordinate
Biswesh Mohapatra [Sun, 4 Feb 2018 00:32:35 +0000 (06:02 +0530)]
Add marker at trace start coordinate

Fixes #1676
Closes #1731

22 months agoRemove duplicate link: traces >> more
Biswesh Mohapatra [Sat, 3 Feb 2018 23:16:12 +0000 (04:46 +0530)]
Remove duplicate link: traces >> more

Fixes #1699
Closes #1730

22 months agoAllow lat/lon from the URL to take precedence when routing
Tom Hughes [Sat, 3 Feb 2018 16:39:39 +0000 (16:39 +0000)]
Allow lat/lon from the URL to take precedence when routing

22 months agoGo through the router when reversing directions
Tom Hughes [Sat, 3 Feb 2018 16:21:35 +0000 (16:21 +0000)]
Go through the router when reversing directions

22 months agoMerge remote-tracking branch 'upstream/pull/1693'
Tom Hughes [Sat, 3 Feb 2018 16:12:51 +0000 (16:12 +0000)]
Merge remote-tracking branch 'upstream/pull/1693'

22 months agoMerge remote-tracking branch 'upstream/pull/1727'
Tom Hughes [Thu, 1 Feb 2018 22:43:36 +0000 (22:43 +0000)]
Merge remote-tracking branch 'upstream/pull/1727'

22 months agoFix typo
Mikkel Kirkgaard Nielsen [Thu, 1 Feb 2018 20:37:40 +0000 (21:37 +0100)]
Fix typo

Closes #1728

22 months agoUse https for default style tiles
Tom Hughes [Thu, 1 Feb 2018 20:17:01 +0000 (20:17 +0000)]
Use https for default style tiles

22 months agoUpdate to iD v2.6.1
Bryan Housel [Thu, 1 Feb 2018 16:43:19 +0000 (11:43 -0500)]
Update to iD v2.6.1

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 1 Feb 2018 09:03:02 +0000 (10:03 +0100)]
Localisation updates from https://translatewiki.net.

22 months agoAllow cross domain flash access from http sites
Tom Hughes [Tue, 30 Jan 2018 12:59:47 +0000 (12:59 +0000)]
Allow cross domain flash access from http sites

22 months agoNormalise newlines in incoming emails
Tom Hughes [Tue, 30 Jan 2018 00:27:01 +0000 (00:27 +0000)]
Normalise newlines in incoming emails

Fixes #1708

22 months agoMerge remote-tracking branch 'upstream/pull/1726'
Tom Hughes [Mon, 29 Jan 2018 18:54:18 +0000 (18:54 +0000)]
Merge remote-tracking branch 'upstream/pull/1726'

22 months agoUpdate query icon to display cursor with '?'
Bryan Housel [Mon, 29 Jan 2018 18:21:23 +0000 (13:21 -0500)]
Update query icon to display cursor with '?'
(fixes #1712)

22 months agoAdd '+' to note icon ("add a note to the map")
Bryan Housel [Mon, 29 Jan 2018 17:25:00 +0000 (12:25 -0500)]
Add '+' to note icon ("add a note to the map")

22 months agoRework FOSS4g-IT and FOSSGIS banners to leave space for close 'X'
Bryan Housel [Mon, 29 Jan 2018 15:11:41 +0000 (10:11 -0500)]
Rework FOSS4g-IT and FOSSGIS banners to leave space for close 'X'

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 29 Jan 2018 08:24:45 +0000 (09:24 +0100)]
Localisation updates from https://translatewiki.net.

22 months agoUpdate Nominatim description terms
Sarah Hoffmann [Thu, 25 Jan 2018 20:32:26 +0000 (21:32 +0100)]
Update Nominatim description terms

22 months agoAdd links to the trademark policy
Simon Poole [Thu, 25 Jan 2018 19:20:07 +0000 (20:20 +0100)]
Add links to the trademark policy

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 25 Jan 2018 04:29:24 +0000 (05:29 +0100)]
Localisation updates from https://translatewiki.net.

22 months agoFix rubocop warnings
Tom Hughes [Wed, 24 Jan 2018 14:37:37 +0000 (14:37 +0000)]
Fix rubocop warnings

22 months agoUpdate paperclip
Tom Hughes [Wed, 24 Jan 2018 14:36:52 +0000 (14:36 +0000)]
Update paperclip

22 months agoAdd support for compressed request bodies
Tom Hughes [Sun, 21 Jan 2018 15:50:32 +0000 (15:50 +0000)]
Add support for compressed request bodies

22 months agoMerge remote-tracking branch 'upstream/pull/1721'
Tom Hughes [Wed, 24 Jan 2018 14:23:56 +0000 (14:23 +0000)]
Merge remote-tracking branch 'upstream/pull/1721'

22 months agoadd banner for the Italian OSM conference 2018
Martin Koppenhoefer [Wed, 24 Jan 2018 13:10:20 +0000 (14:10 +0100)]
add banner for the Italian OSM conference 2018

22 months agocleanup banners: remove past conferences from 2017
Peter Barth [Mon, 22 Jan 2018 20:40:39 +0000 (21:40 +0100)]
cleanup banners: remove past conferences from 2017

22 months agoadd banner for this year's FOSSGIS conference
Peter Barth [Mon, 22 Jan 2018 20:40:27 +0000 (21:40 +0100)]
add banner for this year's FOSSGIS conference

22 months agoFix new rubocop warnings
Tom Hughes [Mon, 22 Jan 2018 14:36:16 +0000 (14:36 +0000)]
Fix new rubocop warnings

22 months agoUpdate bundle
Tom Hughes [Mon, 22 Jan 2018 14:17:52 +0000 (14:17 +0000)]
Update bundle

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 22 Jan 2018 14:19:10 +0000 (15:19 +0100)]
Localisation updates from https://translatewiki.net.

22 months agoFully internationalise the issues and reports interfaces.
Andy Allan [Mon, 22 Jan 2018 11:56:39 +0000 (11:56 +0000)]
Fully internationalise the issues and reports interfaces.

22 months agoUpdate to iD v2.6.0
Bryan Housel [Sun, 21 Jan 2018 15:52:31 +0000 (10:52 -0500)]
Update to iD v2.6.0

22 months agoMerge branch 'master' into moderation
Andy Allan [Sun, 21 Jan 2018 11:20:19 +0000 (11:20 +0000)]
Merge branch 'master' into moderation

22 months agoReopen issues if necessary when creating a report.
Andy Allan [Sun, 21 Jan 2018 11:18:24 +0000 (11:18 +0000)]
Reopen issues if necessary when creating a report.

22 months agoUse no-r2 comment to block RTL gem from changing sprites
Tom Hughes [Thu, 18 Jan 2018 17:38:42 +0000 (17:38 +0000)]
Use no-r2 comment to block RTL gem from changing sprites

Fixes #1717

22 months agoUpdate leaflet to 1.3.1
Tom Hughes [Thu, 18 Jan 2018 17:32:33 +0000 (17:32 +0000)]
Update leaflet to 1.3.1

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 18 Jan 2018 07:47:01 +0000 (08:47 +0100)]
Localisation updates from https://translatewiki.net.

22 months agoUpdate Potlatch 2 to 2.5-21-gec1befed build
Tom Hughes [Wed, 17 Jan 2018 12:32:58 +0000 (12:32 +0000)]
Update Potlatch 2 to 2.5-21-gec1befed build

22 months agoUpdate the Leaflet.contextmenu plugin to 1.5.0
Tom Hughes [Mon, 15 Jan 2018 10:25:21 +0000 (10:25 +0000)]
Update the Leaflet.contextmenu plugin to 1.5.0

22 months agoUpdate leaflet to 1.3.0
Tom Hughes [Mon, 15 Jan 2018 10:23:22 +0000 (10:23 +0000)]
Update leaflet to 1.3.0

22 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 15 Jan 2018 07:08:50 +0000 (08:08 +0100)]
Localisation updates from https://translatewiki.net.

22 months agoAllow cross domain flash access from http sites
Tom Hughes [Sat, 13 Jan 2018 15:57:31 +0000 (15:57 +0000)]
Allow cross domain flash access from http sites

22 months agoEnable cross origin requests for diary RSS feeds
Tom Hughes [Sat, 13 Jan 2018 10:41:26 +0000 (10:41 +0000)]
Enable cross origin requests for diary RSS feeds

Fixes #1714

22 months agoMerge remote-tracking branch 'upstream/pull/1707'
Tom Hughes [Sat, 13 Jan 2018 10:35:42 +0000 (10:35 +0000)]
Merge remote-tracking branch 'upstream/pull/1707'

23 months agoAllow apache to control the HSTS setting
Tom Hughes [Thu, 11 Jan 2018 19:44:20 +0000 (19:44 +0000)]
Allow apache to control the HSTS setting

23 months agoAllow apache to control the HSTS setting
Tom Hughes [Thu, 11 Jan 2018 19:19:36 +0000 (19:19 +0000)]
Allow apache to control the HSTS setting

23 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 11 Jan 2018 07:10:41 +0000 (08:10 +0100)]
Localisation updates from https://translatewiki.net.

23 months agoFix jshint warning
Tom Hughes [Mon, 8 Jan 2018 20:30:51 +0000 (20:30 +0000)]
Fix jshint warning

23 months agoConvert various URLs to https
Tom Hughes [Mon, 8 Jan 2018 20:18:21 +0000 (20:18 +0000)]
Convert various URLs to https

23 months agoUse https for nominatim
Tom Hughes [Mon, 8 Jan 2018 10:49:36 +0000 (10:49 +0000)]
Use https for nominatim

23 months agoMonkey patch OAuth to allow http signatures on https requests
Tom Hughes [Thu, 4 Jan 2018 22:34:22 +0000 (22:34 +0000)]
Monkey patch OAuth to allow http signatures on https requests

23 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 8 Jan 2018 08:18:17 +0000 (09:18 +0100)]
Localisation updates from https://translatewiki.net.

23 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 4 Jan 2018 09:23:00 +0000 (10:23 +0100)]
Localisation updates from https://translatewiki.net.

23 months agoRemove dependencies on mapzen services
Tom Hughes [Tue, 2 Jan 2018 18:45:20 +0000 (18:45 +0000)]
Remove dependencies on mapzen services

23 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 1 Jan 2018 14:41:07 +0000 (15:41 +0100)]
Localisation updates from https://translatewiki.net.

23 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 25 Dec 2017 14:23:29 +0000 (15:23 +0100)]
Localisation updates from https://translatewiki.net.