rails.git
10 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 4 Feb 2019 08:09:16 +0000 (09:09 +0100)]
Localisation updates from https://translatewiki.net.

10 months agoFix broken translation
Tom Hughes [Thu, 31 Jan 2019 13:56:48 +0000 (13:56 +0000)]
Fix broken translation

10 months agoRevert to kramdown 1.x for now
Tom Hughes [Thu, 31 Jan 2019 13:52:42 +0000 (13:52 +0000)]
Revert to kramdown 1.x for now

https://github.com/gettalong/kramdown/issues/571

10 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Wed, 30 Jan 2019 22:52:53 +0000 (23:52 +0100)]
Localisation updates from https://translatewiki.net.

10 months agoUpdate bundle
Tom Hughes [Wed, 30 Jan 2019 12:06:21 +0000 (12:06 +0000)]
Update bundle

10 months agoAdd polyfill for Array.prototype.findIndex
Tom Hughes [Tue, 29 Jan 2019 23:14:25 +0000 (23:14 +0000)]
Add polyfill for Array.prototype.findIndex

Fixes #2124

10 months agoMerge remote-tracking branch 'upstream/pull/2063'
Tom Hughes [Tue, 29 Jan 2019 21:35:29 +0000 (21:35 +0000)]
Merge remote-tracking branch 'upstream/pull/2063'

10 months agoChange default directions engine to fossgis_osrm_car
Tom Hughes [Tue, 29 Jan 2019 19:17:01 +0000 (19:17 +0000)]
Change default directions engine to fossgis_osrm_car

Also handle old cookies and URLs that ask for engines that
are no longer available.

10 months agoRemove old MapQuest Directions routing support
Simon Poole [Tue, 29 Jan 2019 19:03:30 +0000 (19:03 +0000)]
Remove old MapQuest Directions routing support

10 months agoRemove old OSRM routing support
Simon Poole [Wed, 14 Nov 2018 18:05:33 +0000 (19:05 +0100)]
Remove old OSRM routing support

10 months agoAdd support for FOSSGIS routing server
Simon Poole [Fri, 10 Aug 2018 13:24:25 +0000 (15:24 +0200)]
Add support for FOSSGIS routing server

10 months agoClear notifications after trace import tests
Tom Hughes [Tue, 29 Jan 2019 00:00:46 +0000 (00:00 +0000)]
Clear notifications after trace import tests

10 months agoMerge remote-tracking branch 'upstream/pull/2123'
Tom Hughes [Mon, 28 Jan 2019 22:57:38 +0000 (22:57 +0000)]
Merge remote-tracking branch 'upstream/pull/2123'

10 months agoUpdate to iD v2.13.1
Quincy Morgan [Mon, 28 Jan 2019 22:44:11 +0000 (17:44 -0500)]
Update to iD v2.13.1

10 months agoDon't swallow exceptions deleting traces
Tom Hughes [Mon, 28 Jan 2019 19:10:35 +0000 (19:10 +0000)]
Don't swallow exceptions deleting traces

10 months agoMerge remote-tracking branch 'upstream/pull/2120'
Tom Hughes [Mon, 28 Jan 2019 19:04:02 +0000 (19:04 +0000)]
Merge remote-tracking branch 'upstream/pull/2120'

10 months agoMerge remote-tracking branch 'upstream/pull/2122'
Tom Hughes [Wed, 23 Jan 2019 19:05:14 +0000 (19:05 +0000)]
Merge remote-tracking branch 'upstream/pull/2122'

10 months agoAdd passthrough of new `locale`, `maprules`, and `presets` URL hash parameters to iD
Quincy Morgan [Wed, 23 Jan 2019 17:13:27 +0000 (12:13 -0500)]
Add passthrough of new `locale`, `maprules`, and `presets` URL hash parameters to iD

10 months agoUpdate to iD v2.13.0
Quincy Morgan [Wed, 23 Jan 2019 16:57:33 +0000 (11:57 -0500)]
Update to iD v2.13.0

10 months agoWrite some basic functionality tests for trace.import
Andy Allan [Wed, 23 Jan 2019 15:47:54 +0000 (16:47 +0100)]
Write some basic functionality tests for trace.import

10 months agoBasic tests for the trace jobs
Andy Allan [Wed, 23 Jan 2019 13:47:49 +0000 (14:47 +0100)]
Basic tests for the trace jobs

10 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 21 Jan 2019 09:07:09 +0000 (10:07 +0100)]
Localisation updates from https://translatewiki.net.

10 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 17 Jan 2019 10:01:22 +0000 (11:01 +0100)]
Localisation updates from https://translatewiki.net.

10 months agoUse gd-ffij gem to create trace icons
Andy Allan [Wed, 16 Jan 2019 15:06:25 +0000 (16:06 +0100)]
Use gd-ffij gem to create trace icons

This is a port of the gd-based code from the gpx-importer at
https://github.com/openstreetmap/gpx-import

The gd-ffij library does not yet have support for animated gifs, so
we just create a static image for now. But at least that's better than
the non-functioning RMagick code.

10 months agoMerge pull request #1151 from polarbearing/patch-1
Andy Allan [Wed, 16 Jan 2019 13:30:28 +0000 (14:30 +0100)]
Merge pull request #1151 from polarbearing/patch-1

Holiday Apartment is more specific for tourism=apartment

10 months agoMerge remote-tracking branch 'upstream/pull/2118'
Tom Hughes [Wed, 16 Jan 2019 12:22:31 +0000 (12:22 +0000)]
Merge remote-tracking branch 'upstream/pull/2118'

10 months agoMore resourceful routing for nodes, ways, relations and changesets controllers
Andy Allan [Wed, 16 Jan 2019 12:10:11 +0000 (13:10 +0100)]
More resourceful routing for nodes, ways, relations and changesets controllers

10 months agoMerge remote-tracking branch 'upstream/pull/2117'
Tom Hughes [Wed, 16 Jan 2019 11:39:18 +0000 (11:39 +0000)]
Merge remote-tracking branch 'upstream/pull/2117'

10 months agoRemove old authorization helpers
Andy Allan [Wed, 16 Jan 2019 10:55:01 +0000 (11:55 +0100)]
Remove old authorization helpers

These have been replaced by abilities and capabilities

10 months agoEnsure authorization checks happen for all controller methods
Andy Allan [Wed, 16 Jan 2019 10:45:13 +0000 (11:45 +0100)]
Ensure authorization checks happen for all controller methods

10 months agoSkip authorization checks for the errors controller
Andy Allan [Wed, 16 Jan 2019 10:44:55 +0000 (11:44 +0100)]
Skip authorization checks for the errors controller

10 months agoFix rubocop warning
Tom Hughes [Wed, 16 Jan 2019 10:36:04 +0000 (10:36 +0000)]
Fix rubocop warning

10 months agoMerge remote-tracking branch 'upstream/pull/2116'
Tom Hughes [Wed, 16 Jan 2019 10:23:27 +0000 (10:23 +0000)]
Merge remote-tracking branch 'upstream/pull/2116'

10 months agoMerge remote-tracking branch 'upstream/pull/2115'
Tom Hughes [Wed, 16 Jan 2019 10:20:29 +0000 (10:20 +0000)]
Merge remote-tracking branch 'upstream/pull/2115'

10 months agoMerge remote-tracking branch 'upstream/pull/2111'
Tom Hughes [Wed, 16 Jan 2019 10:15:34 +0000 (10:15 +0000)]
Merge remote-tracking branch 'upstream/pull/2111'

10 months agoAdd a configuration flag for using the job queue to import traces
Andy Allan [Wed, 16 Jan 2019 10:13:55 +0000 (11:13 +0100)]
Add a configuration flag for using the job queue to import traces

This will allow the code to be merged to master, even if osm.org
isn't ready to start using it yet.

10 months agoFix styling of nested lists in rich text
Tom Hughes [Wed, 16 Jan 2019 10:09:47 +0000 (10:09 +0000)]
Fix styling of nested lists in rich text

10 months agoAdd noopener and noreferer to links in user generated content
Tom Hughes [Wed, 9 Jan 2019 18:00:47 +0000 (18:00 +0000)]
Add noopener and noreferer to links in user generated content

10 months agoSwitch to using kramdown for markdown formatting
Tom Hughes [Wed, 9 Jan 2019 17:52:24 +0000 (17:52 +0000)]
Switch to using kramdown for markdown formatting

Fixes #2103

10 months agoSketch out how to use the jobs queue for trace insertion and deletion
Andy Allan [Wed, 31 Oct 2018 16:51:30 +0000 (17:51 +0100)]
Sketch out how to use the jobs queue for trace insertion and deletion

Refs #1852

10 months agoUse CanCanCan to control access to oauth controller actions
Andy Allan [Wed, 9 Jan 2019 15:58:38 +0000 (16:58 +0100)]
Use CanCanCan to control access to oauth controller actions

10 months agoMark non-action methods as protected
Andy Allan [Wed, 9 Jan 2019 15:43:41 +0000 (16:43 +0100)]
Mark non-action methods as protected

10 months agoUse CanCanCan for nodes, ways, relations, old and api controllers
Andy Allan [Wed, 9 Jan 2019 17:28:27 +0000 (18:28 +0100)]
Use CanCanCan for nodes, ways, relations, old and api controllers

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 14 Jan 2019 08:42:18 +0000 (09:42 +0100)]
Localisation updates from https://translatewiki.net.

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

11 months agoAdd basic tests for browse#new_note and browse#query
Tom Hughes [Wed, 9 Jan 2019 21:12:33 +0000 (21:12 +0000)]
Add basic tests for browse#new_note and browse#query

11 months agoAllow everybody to query features
Tom Hughes [Wed, 9 Jan 2019 19:15:55 +0000 (19:15 +0000)]
Allow everybody to query features

11 months agoAllow everybody to create new notes
Tom Hughes [Wed, 9 Jan 2019 18:13:05 +0000 (18:13 +0000)]
Allow everybody to create new notes

Fixes #2110

11 months agoMerge remote-tracking branch 'upstream/pull/2109'
Tom Hughes [Wed, 9 Jan 2019 17:27:16 +0000 (17:27 +0000)]
Merge remote-tracking branch 'upstream/pull/2109'

11 months agoMerge remote-tracking branch 'upstream/pull/2108'
Tom Hughes [Wed, 9 Jan 2019 17:24:28 +0000 (17:24 +0000)]
Merge remote-tracking branch 'upstream/pull/2108'

11 months agoMerge remote-tracking branch 'upstream/pull/2107'
Tom Hughes [Wed, 9 Jan 2019 17:20:08 +0000 (17:20 +0000)]
Merge remote-tracking branch 'upstream/pull/2107'

11 months agoMerge remote-tracking branch 'upstream/pull/2106'
Tom Hughes [Wed, 9 Jan 2019 17:16:01 +0000 (17:16 +0000)]
Merge remote-tracking branch 'upstream/pull/2106'

11 months agoMerge remote-tracking branch 'upstream/pull/2105'
Tom Hughes [Wed, 9 Jan 2019 17:14:53 +0000 (17:14 +0000)]
Merge remote-tracking branch 'upstream/pull/2105'

11 months agoUse CanCanCan for oauth clients controller
Andy Allan [Wed, 9 Jan 2019 14:34:54 +0000 (15:34 +0100)]
Use CanCanCan for oauth clients controller

11 months agoUse CanCanCan for messages controller
Andy Allan [Wed, 9 Jan 2019 14:27:29 +0000 (15:27 +0100)]
Use CanCanCan for messages controller

11 months agoUse a builder view for the capabilities call
Andy Allan [Wed, 9 Jan 2019 13:30:18 +0000 (14:30 +0100)]
Use a builder view for the capabilities call

This is easier to work with than building the XML document by hand
in the controller.

11 months agoUse full list of osm xml root attributes in builder templates
Andy Allan [Wed, 9 Jan 2019 13:15:39 +0000 (14:15 +0100)]
Use full list of osm xml root attributes in builder templates

11 months agoUse CanCanCan for changesets controller
Andy Allan [Wed, 9 Jan 2019 11:22:39 +0000 (12:22 +0100)]
Use CanCanCan for changesets controller

The expand_bbox method now needs require_write_api capability on tokens.

11 months agoUse CanCanCan for traces controller
Andy Allan [Wed, 9 Jan 2019 10:40:54 +0000 (11:40 +0100)]
Use CanCanCan for traces controller

11 months agoUse CanCanCan for swf controller
Andy Allan [Wed, 9 Jan 2019 09:32:57 +0000 (10:32 +0100)]
Use CanCanCan for swf controller

11 months agoSkip authorization checks for amf controller
Andy Allan [Wed, 9 Jan 2019 09:26:12 +0000 (10:26 +0100)]
Skip authorization checks for amf controller

11 months agoAdd missing authorize_resource declaration to geocoder controller
Andy Allan [Wed, 9 Jan 2019 09:14:52 +0000 (10:14 +0100)]
Add missing authorize_resource declaration to geocoder controller

11 months agoUse CanCanCan for directions controller
Andy Allan [Wed, 9 Jan 2019 09:12:14 +0000 (10:12 +0100)]
Use CanCanCan for directions controller

11 months agoUse CanCanCan for browse controller
Andy Allan [Wed, 9 Jan 2019 09:10:12 +0000 (10:10 +0100)]
Use CanCanCan for browse controller

11 months agoUpdate bundle
Tom Hughes [Tue, 8 Jan 2019 18:21:03 +0000 (18:21 +0000)]
Update bundle

11 months agoRevert to omniauth-google-oauth2 version 0.5.3
Tom Hughes [Tue, 8 Jan 2019 09:40:38 +0000 (09:40 +0000)]
Revert to omniauth-google-oauth2 version 0.5.3

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 7 Jan 2019 09:19:15 +0000 (10:19 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoFix new rubocop warning
Tom Hughes [Mon, 7 Jan 2019 09:04:13 +0000 (09:04 +0000)]
Fix new rubocop warning

11 months agoUpdate bundle
Tom Hughes [Mon, 7 Jan 2019 08:58:37 +0000 (08:58 +0000)]
Update bundle

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 3 Jan 2019 15:50:51 +0000 (16:50 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoUse CanCanCan for export controller
Andy Allan [Wed, 2 Jan 2019 18:21:10 +0000 (19:21 +0100)]
Use CanCanCan for export controller

11 months agoUse CanCanCan for search controller
Andy Allan [Wed, 2 Jan 2019 18:17:32 +0000 (19:17 +0100)]
Use CanCanCan for search controller

11 months agoMerge remote-tracking branch 'gravitystorm/terms_capabilities'
Tom Hughes [Wed, 2 Jan 2019 17:24:18 +0000 (17:24 +0000)]
Merge remote-tracking branch 'gravitystorm/terms_capabilities'

11 months agoRequire terms agreement for abilities and capabilities related to api write methods
Andy Allan [Wed, 2 Jan 2019 16:40:43 +0000 (17:40 +0100)]
Require terms agreement for abilities and capabilities related to api write methods

11 months agoReplace custom panning with new panInside leaflet method
Tom Hughes [Wed, 2 Jan 2019 11:03:06 +0000 (11:03 +0000)]
Replace custom panning with new panInside leaflet method

11 months agoUpdate leaflet.locate.js
Tom Hughes [Wed, 2 Jan 2019 10:58:28 +0000 (10:58 +0000)]
Update leaflet.locate.js

11 months agoUpdate leaflet to 1.4.0
Tom Hughes [Wed, 2 Jan 2019 10:51:31 +0000 (10:51 +0000)]
Update leaflet to 1.4.0

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 31 Dec 2018 17:05:03 +0000 (18:05 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoAllow inline styling on pages that display the map
Tom Hughes [Mon, 31 Dec 2018 09:30:40 +0000 (09:30 +0000)]
Allow inline styling on pages that display the map

Both leaflet itself and at least one of our plugins use inline
styling to style markers so we need to allow it.

Fixes #2093

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 27 Dec 2018 09:58:51 +0000 (10:58 +0100)]
Localisation updates from https://translatewiki.net.

11 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 17 Dec 2018 08:04:08 +0000 (09:04 +0100)]
Localisation updates from https://translatewiki.net.

12 months agoMerge remote-tracking branch 'upstream/pull/2087'
Tom Hughes [Thu, 13 Dec 2018 15:49:34 +0000 (15:49 +0000)]
Merge remote-tracking branch 'upstream/pull/2087'

12 months agoUpdate to iD v2.12.2
Bryan Housel [Thu, 13 Dec 2018 15:34:21 +0000 (10:34 -0500)]
Update to iD v2.12.2

12 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 13 Dec 2018 08:17:29 +0000 (09:17 +0100)]
Localisation updates from https://translatewiki.net.

12 months agoAllow abilities that require no login for token based access
Tom Hughes [Wed, 12 Dec 2018 22:41:29 +0000 (22:41 +0000)]
Allow abilities that require no login for token based access

Fixes #2085

12 months agoMerge remote-tracking branch 'upstream/pull/2084'
Tom Hughes [Wed, 12 Dec 2018 18:40:13 +0000 (18:40 +0000)]
Merge remote-tracking branch 'upstream/pull/2084'

12 months agoMerge remote-tracking branch 'upstream/pull/2083'
Tom Hughes [Wed, 12 Dec 2018 18:33:23 +0000 (18:33 +0000)]
Merge remote-tracking branch 'upstream/pull/2083'

12 months agoRefactor users_controller to use CanCanCan for authorisation
Andy Allan [Wed, 12 Dec 2018 15:01:54 +0000 (16:01 +0100)]
Refactor users_controller to use CanCanCan for authorisation

12 months agoUse only token capabilities when a token is provided
Andy Allan [Wed, 12 Dec 2018 12:58:38 +0000 (13:58 +0100)]
Use only token capabilities when a token is provided

The Authenticate#allow? method (from oauth-plugin) sets current_user as a side
effect of checking the token. But this allows a valid token to access
all actions that are available to that user, beyond the capabilities for
that token.

12 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 10 Dec 2018 07:19:29 +0000 (08:19 +0100)]
Localisation updates from https://translatewiki.net.

12 months agoOnly check IP addresses for anonymous note comments
Tom Hughes [Wed, 5 Dec 2018 12:54:55 +0000 (12:54 +0000)]
Only check IP addresses for anonymous note comments

12 months agoMerge remote-tracking branch 'upstream/pull/2080'
Tom Hughes [Wed, 5 Dec 2018 08:23:54 +0000 (08:23 +0000)]
Merge remote-tracking branch 'upstream/pull/2080'

12 months agoUpdate to iD v2.12.1
Bryan Housel [Wed, 5 Dec 2018 07:04:18 +0000 (02:04 -0500)]
Update to iD v2.12.1

12 months agoMerge remote-tracking branch 'upstream/pull/2079'
Tom Hughes [Tue, 4 Dec 2018 20:41:34 +0000 (20:41 +0000)]
Merge remote-tracking branch 'upstream/pull/2079'

12 months agoUpdate to rails 5.2.2
Tom Hughes [Tue, 4 Dec 2018 20:41:06 +0000 (20:41 +0000)]
Update to rails 5.2.2

12 months agoUpdate to iD v2.12.0
Bryan Housel [Tue, 4 Dec 2018 03:25:48 +0000 (22:25 -0500)]
Update to iD v2.12.0

12 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 3 Dec 2018 06:50:33 +0000 (07:50 +0100)]
Localisation updates from https://translatewiki.net.

12 months agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 29 Nov 2018 17:01:06 +0000 (18:01 +0100)]
Localisation updates from https://translatewiki.net.

12 months agoMerge remote-tracking branch 'upstream/pull/2078'
Tom Hughes [Wed, 28 Nov 2018 21:11:32 +0000 (21:11 +0000)]
Merge remote-tracking branch 'upstream/pull/2078'

12 months agoUse CanCanCan for user_roles auth
Andy Allan [Wed, 28 Nov 2018 16:20:13 +0000 (17:20 +0100)]
Use CanCanCan for user_roles auth