Commit graph

2142 commits

Author SHA1 Message Date
Andy Allan
a1853204fa More lazy translation lookups for traces 2018-05-09 12:08:39 +08:00
Tom Hughes
f349aeb061 Update translation keys for renaming of note to notes 2018-04-29 01:09:38 +01:00
Tom Hughes
d7b43c5f17 Fix syntax error with ruby 2.5 2018-04-28 17:12:27 +01:00
Rajdeep Mandrekar
3def2f839f Use rails helpers to construct URLs
Fixes #1817
Closes #1840
2018-04-25 22:22:51 +01:00
Tom Hughes
00425c8fca Merge remote-tracking branch 'upstream/pull/1838' 2018-04-25 17:38:35 +01:00
Tom Hughes
0d7c9a187e Merge remote-tracking branch 'upstream/pull/1836' 2018-04-25 17:37:55 +01:00
Andy Allan
8445561fcc Use lazy translation lookups for the oauth controller. 2018-04-25 15:42:34 +08:00
Andy Allan
2c7bc36493 Use lazy translation lookups for redactions
Requires renaming the translation keys
2018-04-25 14:39:37 +08:00
Andy Allan
a0de9b780d Use lazy lookups for user_blocks translations 2018-04-25 12:03:58 +08:00
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
7b2af50f4a Refactor @this_user to @user
Historically we used @user for the currently logged in user, but
this was changed to `current_user` in 2017.
2018-04-11 11:42:33 +08:00
Andy Allan
7dbf8d8336 Merge branch 'master' into moderation 2018-04-11 09:54:04 +08:00
Andy Allan
3b75e92415 Be more consistent with 'my' vs 'your' for objects that belong to
the user
2018-03-28 17:07:50 +08:00
Andy Allan
32d1afbb18 Create a report_link helper, and use text instead of a flag icon 2018-03-28 11:05:46 +08:00
Tom Hughes
1f2ac59d1d Fix new rubocop warnings 2018-03-26 19:00:03 +01:00
Andy Allan
9f84c6f46e Use user_path links. Fixes #1785 2018-03-21 11:33:45 +08:00
Andy Allan
696bbd169b Redirect to the reportable after creating a report. 2018-03-14 17:24:41 +08:00
Andy Allan
2fc70be734 Add a redirect and error message if user ends up trying to report something without the correct parameters 2018-03-14 17:09:57 +08:00
Andy Allan
85bf9adb91 Handle issue_types properly if current_user is both and admin and a moderator 2018-03-14 16:47:45 +08:00
Andy Allan
283cffdfdb Handle current_user being both an admin and a moderator for building user list 2018-03-14 16:47:45 +08:00
Andy Allan
6bcffbf499 Unwind the set_issues method 2018-03-14 16:34:19 +08:00
Andy Allan
e7e12a38c6 Create a more accurate permissions check message 2018-03-14 16:29:47 +08:00
Andy Allan
b2ff9f3aad Simplify redirect. 2018-03-09 15:56:56 +08:00
Andy Allan
508bb04f21 Remove unused code 2018-03-05 10:19:11 +08:00
biswesh456
674589ce2c Change test case 2018-03-03 20:20:52 +05:30
Andy Allan
04a87bb121 Rubocop fixes 2018-02-28 16:23:25 +08:00
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
Andy Allan
3006ce9713 Remove reporting of changesets 2018-02-28 14:39:40 +08:00
Andy Allan
80a241f798 Allow reporting of anonymous notes 2018-02-28 14:26:40 +08:00
Andy Allan
b955a7e78e Link to diary comments using anchors, rather than showing them alone
Neither way is perfect, but this is less surprising than seeing a diary
entry with only one comment visible.
2018-02-28 11:24:00 +08:00
Andy Allan
0366c2eabb Rework status search to avoid relying on the enum ids, and also to allow translations 2018-02-28 10:44:50 +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
Andy Allan
7b5e0d91f3 resolve last_reported_by vs last_updated_by duplication 2018-02-23 10:18:57 +08:00
Tom Hughes
96cc9abd23 Use https when redirecting to the render server 2018-02-09 22:31:45 +00:00
Tom Hughes
2515c77276 Use configured protocol for URLs in diary feeds 2018-02-05 22:31:27 +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
79bd1777ab Fully internationalise the issues and reports interfaces. 2018-01-22 11:57:08 +00:00
Andy Allan
ae44879213 Merge branch 'master' into moderation 2018-01-21 11:20:19 +00:00
Andy Allan
3a386f185c Reopen issues if necessary when creating a report. 2018-01-21 11:18:24 +00:00
Tom Hughes
9cf698322c Merge remote-tracking branch 'upstream/pull/1707' 2018-01-13 10:35:42 +00:00
Tom Hughes
be86e4824f Convert various URLs to https 2018-01-08 20:18:21 +00:00
Tom Hughes
af1397436f Use https for nominatim 2018-01-08 10:50:44 +00:00
Tom Hughes
9340c46173 Remove dependencies on mapzen services 2018-01-02 18:45:20 +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
Guillaume RISCHARD
ca36cf2826 Remove support for soon discontinued josm remote https endpoint 2017-12-16 16:15:52 +01:00
mmd-osm
b2a3955d93 Allow (un)subscribing discussions also when changeset still open
Fixes #1627
2017-12-16 13:32:04 +01:00