]> git.openstreetmap.org Git - rails.git/log
rails.git
5 years 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.

5 years 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.

5 years 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

5 years 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'

5 years 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

5 years 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'

5 years 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

5 years 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

5 years 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

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

5 years 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'

5 years 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'

5 years 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'

5 years 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.

5 years 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

5 years 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

5 years 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

5 years 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

5 years 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

5 years 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

5 years 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

5 years 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.

5 years 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.

5 years 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

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

5 years 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

5 years 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'

5 years 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'

5 years 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'

5 years 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'

5 years 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'

5 years 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

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

5 years 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.

5 years 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

5 years 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.

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

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

5 years 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

5 years 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

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

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

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

5 years 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

5 years 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.

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

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

5 years 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.

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

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

5 years 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'

5 years 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

5 years 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

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

5 years 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

5 years 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.

5 years 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

5 years 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.

5 years 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.

5 years 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'

5 years 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

5 years 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.

5 years 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

5 years 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'

5 years 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'

5 years 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

5 years 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.

5 years 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.

5 years 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

5 years 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'

5 years 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

5 years 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'

5 years 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

5 years 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

5 years 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.

6 years 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.

6 years 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'

6 years 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

6 years agoMerge remote-tracking branch 'upstream/pull/2072'
Tom Hughes [Wed, 28 Nov 2018 18:24:04 +0000 (18:24 +0000)]
Merge remote-tracking branch 'upstream/pull/2072'

6 years agoSplit browse_helper.rb into two modules due to rubocop ModuleLength
Paul Dexter-Sobkowiak [Tue, 27 Nov 2018 01:08:57 +0000 (01:08 +0000)]
Split browse_helper.rb into two modules due to rubocop ModuleLength

6 years agoMerge remote-tracking branch 'upstream/pull/2075'
Tom Hughes [Wed, 28 Nov 2018 18:09:20 +0000 (18:09 +0000)]
Merge remote-tracking branch 'upstream/pull/2075'

6 years agoMerge remote-tracking branch 'upstream/pull/2074'
Tom Hughes [Wed, 28 Nov 2018 18:09:17 +0000 (18:09 +0000)]
Merge remote-tracking branch 'upstream/pull/2074'

6 years agoRemove user_roles integration test since it is not meaningful
Andy Allan [Wed, 28 Nov 2018 16:21:12 +0000 (17:21 +0100)]
Remove user_roles integration test since it is not meaningful

This test has not been meaningful for a long while, since both check_success and check_fail contain exactly the same code.

Additionally, the test doesn't cover any integrations (beyond logging in), and so it is only covering the same ground as the controller test.

6 years agoRemove the unused require_moderator filter
Andy Allan [Wed, 28 Nov 2018 14:46:37 +0000 (15:46 +0100)]
Remove the unused require_moderator filter

Use of this filter has been refactored to use CanCanCan

6 years agoUse CanCanCan for notes authorization
Andy Allan [Wed, 28 Nov 2018 14:33:43 +0000 (15:33 +0100)]
Use CanCanCan for notes authorization

6 years agoMerge remote-tracking branch 'upstream/pull/2073'
Tom Hughes [Wed, 28 Nov 2018 11:54:00 +0000 (11:54 +0000)]
Merge remote-tracking branch 'upstream/pull/2073'

6 years agoUse CanCanCan for changeset comments
Andy Allan [Wed, 14 Nov 2018 14:45:30 +0000 (15:45 +0100)]
Use CanCanCan for changeset comments

This introduces different deny_access handlers for web and api requests, since we want to avoid sending redirects as API responses. See #2064 for discussion.

6 years agoUpdate to rails 5.2.1.1
Tom Hughes [Tue, 27 Nov 2018 23:10:24 +0000 (23:10 +0000)]
Update to rails 5.2.1.1

6 years agoShow tel: links for multiple phone numbers separated by ;
Paul Dexter-Sobkowiak [Mon, 26 Nov 2018 22:15:19 +0000 (22:15 +0000)]
Show tel: links for multiple phone numbers separated by ;

Closes #2069

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 26 Nov 2018 07:03:14 +0000 (08:03 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 22 Nov 2018 06:38:17 +0000 (07:38 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoAdd links to Welcome Mat on /welcome and /help
Mikel Maron [Tue, 20 Nov 2018 18:46:22 +0000 (18:46 +0000)]
Add links to Welcome Mat on /welcome and /help

Closes #2056

6 years agoUpdate Potlatch 2 to 2.5-59-gdd728d5e build
Tom Hughes [Mon, 19 Nov 2018 18:02:46 +0000 (18:02 +0000)]
Update Potlatch 2 to 2.5-59-gdd728d5e build

6 years agoAllow connect_src to match all sites in Potlatch
Tom Hughes [Mon, 19 Nov 2018 17:34:47 +0000 (17:34 +0000)]
Allow connect_src to match all sites in Potlatch

It seems that Safari matches connections made from a flash application
against connect_src while Firefox uses object_src instead.

Fixes #2067

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Mon, 19 Nov 2018 07:48:39 +0000 (08:48 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoFix issues with renaming of diary entry controller
Tom Hughes [Sat, 17 Nov 2018 17:47:51 +0000 (17:47 +0000)]
Fix issues with renaming of diary entry controller

6 years agoTake security policy URLs from the configuration file
Tom Hughes [Thu, 15 Nov 2018 18:47:15 +0000 (18:47 +0000)]
Take security policy URLs from the configuration file

6 years agoLocalisation updates from https://translatewiki.net.
translatewiki.net [Thu, 15 Nov 2018 07:24:40 +0000 (08:24 +0100)]
Localisation updates from https://translatewiki.net.

6 years agoFix tests for rails 5.2.1 compatibility
Tom Hughes [Thu, 15 Nov 2018 00:46:53 +0000 (00:46 +0000)]
Fix tests for rails 5.2.1 compatibility

Rails 5.2.1 has changed how the request body is handled
internally for a test which means we can no longer cheat
by stashing it in the request environment and must instead
pass it properly to the request method.

6 years agoUpdate to rails 5.2.1
Tom Hughes [Wed, 14 Nov 2018 22:35:44 +0000 (22:35 +0000)]
Update to rails 5.2.1