cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9462 commits 4 branches 1 tag 499 MiB
Commit graph

9462 commits

This branch
This branch
All branches
Author SHA1 Message Date
translatewiki.net
2be54006d2 Localisation updates from https://translatewiki.net. 2019-01-21 10:07:09 +01:00
translatewiki.net
4155bcb613 Localisation updates from https://translatewiki.net. 2019-01-17 11:01:22 +01:00
Andy Allan
6820d53e5f 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.
 2019-01-16 16:06:25 +01:00
Andy Allan
2f9291ba57
Merge pull request #1151 from polarbearing/patch-1 
Holiday Apartment is more specific for tourism=apartment
 2019-01-16 14:30:28 +01:00
Tom Hughes
d021f7b625 Merge remote-tracking branch 'upstream/pull/2118' 2019-01-16 12:22:31 +00:00
Andy Allan
8a2df0e0b5 More resourceful routing for nodes, ways, relations and changesets controllers 2019-01-16 13:10:11 +01:00
Tom Hughes
a7628a942b Merge remote-tracking branch 'upstream/pull/2117' 2019-01-16 11:39:18 +00:00
Andy Allan
30a4fb85a9 Remove old authorization helpers 
These have been replaced by abilities and capabilities
 2019-01-16 11:55:01 +01:00
Andy Allan
131fd76cae Ensure authorization checks happen for all controller methods 2019-01-16 11:45:13 +01:00
Andy Allan
fc6209dc07 Skip authorization checks for the errors controller 2019-01-16 11:44:55 +01:00
Tom Hughes
24b4538f8f Fix rubocop warning 2019-01-16 10:36:04 +00:00
Tom Hughes
11806a676f Merge remote-tracking branch 'upstream/pull/2116' 2019-01-16 10:23:27 +00:00
Tom Hughes
d2e11a327e Merge remote-tracking branch 'upstream/pull/2115' 2019-01-16 10:20:29 +00:00
Tom Hughes
6fb660f0af Merge remote-tracking branch 'upstream/pull/2111' 2019-01-16 10:15:34 +00:00
Andy Allan
581eca3bbe 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.
 2019-01-16 11:13:55 +01:00
Tom Hughes
81b37f9263 Fix styling of nested lists in rich text 2019-01-16 10:10:51 +00:00
Tom Hughes
df232ec96f Add noopener and noreferer to links in user generated content 2019-01-16 10:10:51 +00:00
Tom Hughes
1f3372f52c Switch to using kramdown for markdown formatting 
Fixes #2103
 2019-01-16 10:10:48 +00:00
Andy Allan
e59f1b6108 Sketch out how to use the jobs queue for trace insertion and deletion 
Refs #1852
 2019-01-16 10:49:11 +01:00
Andy Allan
3e49e4a62a Use CanCanCan to control access to oauth controller actions 2019-01-16 10:17:55 +01:00
Andy Allan
bda8544d94 Mark non-action methods as protected 2019-01-16 10:17:55 +01:00
Andy Allan
e7f943c715 Use CanCanCan for nodes, ways, relations, old and api controllers 2019-01-16 10:12:19 +01:00
translatewiki.net
fbbabeff1e Localisation updates from https://translatewiki.net. 2019-01-14 09:42:18 +01:00
translatewiki.net
687e9b6fd6 Localisation updates from https://translatewiki.net. 2019-01-10 08:57:06 +01:00
Tom Hughes
62637645bf Add basic tests for browse#new_note and browse#query 2019-01-09 21:12:33 +00:00
Tom Hughes
5c877e0fa4 Allow everybody to query features 2019-01-09 19:15:55 +00:00
Tom Hughes
99b380765a Allow everybody to create new notes 
Fixes #2110
 2019-01-09 18:13:55 +00:00
Tom Hughes
6c2432ae42 Merge remote-tracking branch 'upstream/pull/2109' 2019-01-09 17:27:16 +00:00
Tom Hughes
73fe5a13df Merge remote-tracking branch 'upstream/pull/2108' 2019-01-09 17:24:28 +00:00
Tom Hughes
74e1d7336e Merge remote-tracking branch 'upstream/pull/2107' 2019-01-09 17:20:08 +00:00
Tom Hughes
09b6560e81 Merge remote-tracking branch 'upstream/pull/2106' 2019-01-09 17:16:01 +00:00
Tom Hughes
1b292d2389 Merge remote-tracking branch 'upstream/pull/2105' 2019-01-09 17:14:53 +00:00
Andy Allan
b184b39f34 Use CanCanCan for oauth clients controller 2019-01-09 15:34:54 +01:00
Andy Allan
425f42dd80 Use CanCanCan for messages controller 2019-01-09 15:27:29 +01:00
Andy Allan
58c101762e Use a builder view for the capabilities call 
This is easier to work with than building the XML document by hand
in the controller.
 2019-01-09 14:30:18 +01:00
Andy Allan
686fee43bf Use full list of osm xml root attributes in builder templates 2019-01-09 14:15:39 +01:00
Andy Allan
1774109311 Use CanCanCan for changesets controller 
The expand_bbox method now needs require_write_api capability on tokens.
 2019-01-09 12:41:33 +01:00
Andy Allan
414c4b2c36 Use CanCanCan for traces controller 2019-01-09 11:40:54 +01:00
Andy Allan
73201ca96b Use CanCanCan for swf controller 2019-01-09 10:32:57 +01:00
Andy Allan
18e418cc4c Skip authorization checks for amf controller 2019-01-09 10:26:12 +01:00
Andy Allan
89399c5ba1 Add missing authorize_resource declaration to geocoder controller 2019-01-09 10:14:52 +01:00
Andy Allan
7420479cde Use CanCanCan for directions controller 2019-01-09 10:12:14 +01:00
Andy Allan
1e30edba53 Use CanCanCan for browse controller 2019-01-09 10:10:12 +01:00
Tom Hughes
fac3f0ef24 Update bundle 2019-01-08 18:21:03 +00:00
Tom Hughes
97bf1b303c Revert to omniauth-google-oauth2 version 0.5.3 2019-01-08 09:41:15 +00:00
translatewiki.net
108b68bc92 Localisation updates from https://translatewiki.net. 2019-01-07 10:19:16 +01:00
Tom Hughes
65d57a5bfa Fix new rubocop warning 2019-01-07 09:04:13 +00:00
Tom Hughes
b28e3052b0 Update bundle 2019-01-07 08:58:37 +00:00
translatewiki.net
9af32c9ad4 Localisation updates from https://translatewiki.net. 2019-01-03 16:50:51 +01:00
Andy Allan
44eea9dcaf Use CanCanCan for export controller 2019-01-02 19:21:10 +01:00