Commit graph

810 commits

Author SHA1 Message Date
Andy Allan
9408ed6946 Pluralise user_preferences_controller
This is the rails convention for controllers and can make route
generation easier.

http://guides.rubyonrails.org/action_controller_overview.html#controller-naming-convention
2018-04-18 11:26:00 +08:00
Andy Allan
7dbf8d8336 Merge branch 'master' into moderation 2018-04-11 09:54:04 +08:00
Andy Allan
696bbd169b Redirect to the reportable after creating a report. 2018-03-14 17:24:41 +08:00
biswesh456
674589ce2c Change test case 2018-03-03 20:20:52 +05:30
Andy Allan
a20e28809f Merge branch 'master' into moderation 2018-02-28 15:55:28 +08:00
Andy Allan
424b6ef1cf Merge branch 'master' into moderation 2018-02-28 15:46:25 +08:00
biswesh456
646dcb62fc Allow admins and moderators to delete traces
Fixes #1625
2018-02-24 20:36:12 +05:30
Andy Allan
549acfa918
Merge pull request #1732 from tomhughes/npemap
Remove npemap as a source for UK postcodes
2018-02-23 10:23:22 +08:00
mmd-osm
910a7fe9fc Small comment fix 2018-02-14 17:23:30 +00:00
mmd-osm
cea403dce0 Remove BBOX expansion performance optimization
Closes #1749
Fixes #1742
2018-02-14 17:23:06 +00:00
Tom Hughes
96cc9abd23 Use https when redirecting to the render server 2018-02-09 22:31:45 +00:00
Tom Hughes
5925039729 Remove npemap as a source for UK postcodes 2018-02-04 15:14:41 +00:00
Tom Hughes
673b58f96f Merge remote-tracking branch 'upstream/pull/1704' 2018-02-04 15:09:40 +00:00
Tom Hughes
a83030dab7 Fix new rubocop warnings 2018-01-22 18:55:45 +00:00
Andy Allan
ae44879213 Merge branch 'master' into moderation 2018-01-21 11:20:19 +00:00
Tom Hughes
c658e84535 Fix tests that only worked if object 400 didn't exist 2017-12-19 17:43:53 +00:00
mmd-osm
e21c967fdd Revoking administrator role on current user should fail
Fixes #1697
Closes #1701
2017-12-19 17:31:34 +00:00
mmd-osm
2c7f2b117b Remove extra blank line 2017-12-16 14:06:21 +01:00
mmd-osm
7a396e9dc9 Fix for failing test cases 2017-12-16 13:51:02 +01:00
Andy Allan
63992d83bd Store the report category. 2017-12-13 16:02:55 +00:00
Tom Hughes
b77406ff38 Use decoded strings when parsing XML responses from geocoders
Fixes #1690
2017-11-29 23:07:19 +00:00
Tom Hughes
2ef803b9df Update rack-test and patch test issues 2017-11-29 20:35:17 +00:00
Andy Allan
ca032e0b44 Convert issue search tests to system tests 2017-11-29 18:58:51 +00:00
Andy Allan
9ce00608a4 Remove the test around missing report_type, since we're not currently requiring that. 2017-11-29 18:04:31 +00:00
Andy Allan
f0bcdae908 Put the expected value first in assert_equal 2017-11-29 18:02:26 +00:00
Andy Allan
1766c3216f Move controller tests for new reports into seperate file, and adapt to new form structure. 2017-11-29 17:59:42 +00:00
Andy Allan
8e859b0f1d Index page no longer redirects when there's no issues. 2017-11-29 17:37:29 +00:00
Andy Allan
a09e3f3fe0 Move and amend the issue comment controller tests. 2017-11-29 17:28:37 +00:00
Andy Allan
effb1b7f41 Merge branch 'master' into moderation 2017-11-29 12:18:39 +00:00
Andy Allan
1b181d4c1d Put specific page titles at the start
The makes the shortened titles commonly shown on browser tabs more
useful.
2017-11-22 14:57:26 +00:00
Tom Hughes
1c77d2432e Avoid using rinku's auto_link helper
It's currently broken (https://github.com/vmg/rinku/issues/70) and
in case our own linkify has some additional customisations.
2017-10-27 19:45:32 +01:00
Tom Hughes
f02c753cc4 Use send_data for GPX traces intead of monkey patching send_file 2017-10-09 20:38:08 +01:00
Tom Hughes
8dae890a76 Fix rubocop warnings 2017-10-05 19:18:38 +01:00
Tom Hughes
6209a9be78 Drop geocoder.us from search engines
Fixes #1633
2017-09-25 22:52:03 +01:00
Tom Hughes
f1faffd4d1 Merge remote-tracking branch 'upstream/pull/1614' 2017-08-30 21:09:32 +01:00
Andy Allan
c647aa3d4d Refactor the from_xml methods to act on existing trace objects.
Setting the new tags with the = operator takes care of removing the
old ones, and is the same approach as taken by the tagstring= method.

Fixes #1600
2017-08-18 10:09:50 +01:00
Andy Allan
e9324ad681 Add failing test demonstrating tag duplication when updating traces via the API. 2017-08-17 19:03:50 +01:00
Tom Hughes
a70898be6d Make sure we show errors correctly when resetting a password 2017-08-11 17:45:57 +01:00
Tom Hughes
85b0098b1c Make sure the account form is POSTed
Fixes #1601
2017-08-02 15:32:13 +01:00
Andy Allan
e31376e28d Merge branch 'master' into moderation 2017-08-02 12:12:57 +01:00
Tom Hughes
f258af223b Fix user settings form
Fixes #1601
2017-08-01 19:25:07 +01:00
Andy Allan
6fe5d42100 Standardise on basic_authorization without the parentheses 2017-07-12 14:36:17 +01:00
Andy Allan
65e1dbb4a6 Rubocop autofixes. 2017-07-12 11:49:23 +01:00
Andy Allan
99df5f6179 Rename association to reported_user, for clarity 2017-07-12 11:44:05 +01:00
Andy Allan
6f375ef493 Get tests passing. Use factories instead of fixtures. 2017-07-12 11:38:50 +01:00
Andy Allan
dbd88d893f Merge branch 'master' into moderation 2017-07-12 10:16:11 +01:00
Tom Hughes
28bfaa9fb6 Replace timecop with the rails builtin travel_to method 2017-07-10 21:19:22 +01:00
Andy Allan
cbf71f04c2 Hide contributor terms details, unless the user hasn't agreed
It's no longer important to show when users agreed to the contributor terms.
For users that haven't agreed, we still show their status on their profile.

Logic was also re-written to avoid lots of `if not` things, and tests added.
2017-07-05 12:39:52 +01:00
Tom Hughes
fe1e28b4f4 Fix more parameter sanitisation issues and add tests 2017-06-29 20:52:57 +01:00
Tom Hughes
3893fd72a9 Fix some tests for changes in rails 5 2017-06-27 08:26:44 +01:00