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

2067 commits

Author SHA1 Message Date
Tom Hughes
c694c78c9a Delete any outstanding tokens when a user changes their email 
This ensures that any tokens previously sent to the old email address
can no longer be used if somebody were able to access that address.
 2020-09-29 13:47:40 +01:00
Andy Allan
f70ec18989
Merge pull request #2809 from tomhughes/bootstrap 
Convert some more forms to use bootstrap
 2020-09-16 10:43:21 +02:00
Tom Hughes
70c4a750d7 Fix new rubocop warnings 2020-09-16 08:28:25 +01:00
Tom Hughes
18b9b9f14c Fix new rubocop warnings 2020-09-07 07:11:22 +01:00
mmd-osm
0fb725ea61 API User details JSON format 2020-09-06 22:11:23 +02:00
Tom Hughes
21adea321b Convert password reset forms to use bootstrap 2020-09-04 00:36:43 +01:00
Tom Hughes
c2af89c00e Fix rubocop Style/SoleNestedConditional warnings 2020-09-02 18:54:55 +01:00
Tom Hughes
b7432e9432 Handle new rubocop warnings 2020-09-02 07:18:21 +01:00
Tom Hughes
8d34b03232 Only show the "too many messages" error once 
Fixes #2790
 2020-08-23 10:41:39 +01:00
Tom Hughes
abca51e4d8 Fix some Style/StringConcatenation warnings 2020-08-09 19:48:16 +01:00
Tom Hughes
75e135869e Fix Style/ExplicitBlockArgument warnings 2020-08-09 19:06:04 +01:00
Tom Hughes
ea59d95f4a Fix some new rubocop warnings 2020-08-06 22:27:30 +01:00
Tom Hughes
0e2a66e8de Fix new rubocop warnings 2020-08-06 18:42:16 +01:00
Tom Hughes
2d3972249c Fix some rubocop todos 2020-08-02 19:38:58 +01:00
Tom Hughes
f881a8c83c Register warning and error flash types 
Fixes #2743
 2020-08-02 15:53:13 +01:00
Tom Hughes
77f9aec772 Fix some rubocop todos 2020-07-31 22:45:53 +01:00
Tom Hughes
d4130bcac8 Fix the Redirect warnings from Brakeman 
Unfortunately I've had to leave the check disabed as Brakeman
can't see inside the safe_referer method so doesn't realise that
it is cleaning the referer.
 2020-07-22 19:23:46 +01:00
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