Tom Hughes
77bece20ff
Merge remote-tracking branch 'upstream/pull/2700'
2020-07-08 18:43:26 +01:00
Andy Allan
8c326a6c1f
Remove unnecessary layout calls from api controllers
...
These were left over from the refactoring of the controllers into api and non-api versions.
2020-07-08 18:51:27 +02:00
Andy Allan
41d6f19a6b
Rename the notes#mine action to index
2020-07-08 18:43:30 +02:00
Tom Hughes
9f993fe8c8
Fix new rubocop warnings
2020-07-07 10:44:52 +01:00
Tom Hughes
96ee7ef95c
Only report traces as offline when they are offline
2020-07-07 10:37:56 +01:00
Tom Hughes
ce99bfd9ac
Remove some debug logging comitted by mistake
2020-07-07 10:37:39 +01:00
Tom Hughes
2def62ee19
Fix errors with GPX offline mode
2020-07-05 14:49:12 +01:00
Andy Allan
600812f6ad
Rework user#set_status and #delete to avoid GET requests
...
This renames the delete action to destroy, and starts using resourceful
routing for user actions.
2020-06-10 11:49:18 +02:00
Tom Hughes
d6f518f627
More improvements to locale selection for the data browser
...
Use the browser language preferences for non-logged in users.
2020-06-07 19:10:48 +01:00
Tom Hughes
293fe68eff
Merge remote-tracking branch 'upstream/pull/2642'
2020-06-04 17:40:13 +01:00
Tom Hughes
c9f9ade96f
Fix new rubocop warnings
2020-06-03 17:47:35 +01:00
Andy Allan
3786366fdc
Rename friend to friendship in notifier
...
Followup to #2269
2020-06-03 18:29:08 +02:00
Andy Allan
8ebfdbc1ff
Move make_friend and remove_friend to friendships controller
2020-06-03 18:23:07 +02:00
Tom Hughes
f3219ada14
Fix new rubocop warnings
2020-05-12 19:18:45 +01:00
Tom Hughes
03cde71a5e
Refactor more controller tests
2020-04-26 20:33:06 +01:00
Tom Hughes
359d76c8f0
Redirect to the error page for non-existent issues
2020-04-22 12:37:56 +01:00
Tom Hughes
66ec3cd845
Add blob to frame-src in CSP for iD
...
Fixes #2582
Closes #2583
2020-04-09 18:43:12 +01:00
Tom Hughes
b5c778b662
Fix new rubocop warnings
2020-03-31 19:08:10 +01:00
Tom Hughes
06122fc090
Enforce restrictions on issue visibility properly
2020-03-01 19:20:18 +00:00
Tom Hughes
aaf9d15d56
Rework set_default_request_format ast set_request_formats
...
Instead of trying to work out the exact format, just figure
out the list of allowed formats and let rails do the rest.
2020-02-29 15:28:23 +00:00
Andy Allan
73c95847a6
Merge pull request #2485 from mmd-osm/patch/json2
...
JSON output nodes, ways, relations, map
2020-02-26 15:55:48 +01:00
Tom Hughes
ff7ddb6b86
Merge remote-tracking branch 'upstream/pull/2381'
2020-02-19 19:11:32 +00:00
ENT8R
b84799f481
Keep the behaviour backwards-compatible
2020-02-19 12:58:47 +01:00
Tom Hughes
a6db591ff0
Allow the embed page to be embedded in third party frames
2020-02-12 11:18:37 +00:00
mmd-osm
3159c3c3f7
JSON: return HTTP 406 for unsupported formats
2020-01-22 22:33:30 +01:00
mmd-osm
b556b054d1
JSON: added clarification for non-supported Accept header formats
2020-01-22 17:38:28 +01:00
mmd-osm
03ca0b2c69
Added Accept header unit tests
2020-01-12 17:46:11 +01:00
Andy Allan
8a774e7519
Use a post link to logout
...
This avoids needing to access the session id, which is currently
only working with the memcache store.
The fallback page is preserved for anyone who wants to logout without
using javascript.
Refs #2488
2020-01-08 14:03:05 +01:00
mmd-osm
97036c181e
JSON output, handle Accept header
2020-01-02 15:17:11 +01:00
Tom Hughes
3426976606
Merge remote-tracking branch 'upstream/pull/2444'
2019-12-30 22:34:24 +00:00
mmd-osm
45a1d298a9
Move default_format_xml to api_controller
2019-12-30 17:26:00 +01:00
mmd-osm
75a49786f8
API JSON output
2019-12-30 16:37:52 +01:00
Tom Hughes
ac6a872a48
Avoid errors when /edit is called on an invalid object
2019-12-16 21:23:09 +00:00
Tom Hughes
7531060a12
Use squiggly heredocs
2019-12-11 10:40:41 +00:00
Tom Hughes
57f5b7840e
Fix rubocop warnings
2019-12-04 19:31:53 +00:00
Andy Allan
f1c6a87aa1
Merge pull request #2427 from mmd-osm/patch/remove_expand_bbox
...
Remove expand_bbox endpoint
2019-12-04 12:48:34 +01:00
Andy Allan
44c6fdc273
Use the conventional 'destroy' method name for destroying traces
2019-12-04 11:59:18 +01:00
Mayank Tankhiwale
11cd1c9fc1
Merge branch 'master' of https://github.com/tankhiwale/openstreetmap-website
2019-11-23 20:32:47 +05:30
Mayank Tankhiwale
9f7ec064e4
Fix #2402
...
1. Modified about routes
2. Accept the new params in site#about
3. Update about.html.erb
2019-11-23 20:26:19 +05:30
Andy Allan
8ad88b9ddc
Move user preference XML generation to a view
2019-11-20 16:39:23 +01:00
Andy Allan
25ebf87e5a
Rename UserPreference controller methods to follow rails conventions more closely
2019-11-20 16:09:48 +01:00
mmd-osm
fc8923c305
Remove expand_bbox endpoint
2019-11-09 21:08:40 +01:00
Tom Hughes
90e2a144dc
Merge remote-tracking branch 'upstream/pull/2412'
2019-10-30 19:20:30 +00:00
Andy Allan
7410b59a50
Remove unused trace_optionals partial
...
Although the code to render the partial runs, `yield :optionals`
was removed from the site layout in 2013. So the code has been
ineffective since then.
2019-10-30 15:02:35 +01:00
Andy Allan
15865b5a8d
Remove node/way/relation Search API
...
This API clearly shows its age, having never been fully implemented
and simply returning 100 ways (or 2000 relations) at random matching
the provided tags.
It is, as far as I'm aware, completely unused. While it provides a
good amount of humour to anyone who reads the code, the time as come
for it to be retired.
2019-10-23 11:41:05 +02:00
Andy Allan
60ecfde65c
Convert various administator? tests to use cancancan permissions checks
2019-10-23 10:52:12 +02:00
Tom Hughes
936967d0cb
Allow administrators to see deleted diary comments
2019-10-17 12:16:28 +01:00
ENT8R
b7bdc88008
Don't expose technical terms to the user
2019-10-03 17:17:59 +02:00
ENT8R
d6c01586fe
Sort and order notes by different values and ascending or descending order
2019-10-03 14:12:27 +02:00
Tom Hughes
783b5e3729
Merge remote-tracking branch 'upstream/pull/1926'
2019-08-28 17:23:10 +01:00
