Commit graph

2682 commits

Author SHA1 Message Date
Andy Allan
736ff9b1a0 Use lazy translation lookups for the user_blocks partials. 2018-04-18 14:20:41 +08:00
Tom Hughes
c174845258 Merge remote-tracking branch 'upstream/pull/1816' 2018-04-15 19:55:03 +01:00
Andy Allan
713de1fadb Set default_url_options for action_mailer
This saves having to repeat the same host and protocol options
throughout the notifiers
2018-04-11 15:53:30 +08:00
Andy Allan
0a86a1ea8d Fix handling of title when replying to diary entries 2018-04-11 14:03:17 +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
Tom Hughes
adbd737a0c Ask for confirmation before deleting a trace
Fixes #1812
2018-04-05 21:16:28 +01:00
Tom Hughes
357de642b3 Merge remote-tracking branch 'upstream/pull/1799' 2018-03-28 17:38:34 +01: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
5e76b66271 Use named paths for a few trace links 2018-03-28 16:55:10 +08:00
Andy Allan
c71fd544e0 Avoid sending a commit value from from the search button 2018-03-28 11:05:46 +08:00
Andy Allan
918a382cad Use options_for_select to set the selected items in the search form 2018-03-28 11:05:46 +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
Andy Allan
9f84c6f46e Use user_path links. Fixes #1785 2018-03-21 11:33:45 +08:00
Andy Allan
c1bb412033 Fix class name 2018-03-14 15:18:47 +08:00
Andy Allan
870a497f94 Remove unnecessary div 2018-03-14 15:16:51 +08:00
Andy Allan
04901868fa Apply list styling to list of related reports 2018-03-14 15:14:35 +08:00
Andy Allan
e41751fb32 Use th instead of td and b 2018-03-14 14:56:06 +08:00
Andy Allan
9e46754c88 User user_path to generate links to users 2018-03-14 14:21:43 +08:00
Andy Allan
05b871db99 Avoid wrapping in the reports count column 2018-03-14 13:06:32 +08:00
Andy Allan
aaaeb211de Combine last_updated_by and last_updated_at columns on issues index
Also change to use time as a distance, and link to the user.
2018-03-14 12:51:22 +08:00
Andy Allan
e44f856b53 Combine category and reporting user 2018-03-14 12:51:22 +08:00
Andy Allan
36970bcf50 Use underscore versions of model names for translation keys. 2018-03-14 12:12:24 +08:00
Andy Allan
424b6ef1cf Merge branch 'master' into moderation 2018-02-28 15:46:25 +08:00
Andy Allan
7821bf48ad Reposition the note and user report flags 2018-02-28 15:43:22 +08:00
Andy Allan
8587c2a02b Rework the new report form text and layout 2018-02-28 15:27:01 +08:00
Andy Allan
05ae0755a4 Rearrange issues table and combine some columns. 2018-02-28 14:56:47 +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
3bd06529c7 Refactor reportable_url to just return the url
Allows removal of the largely duplicate instance_url helper (which
returned the same urls, but with a hard-coded title).
2018-02-28 13:30:17 +08:00
Andy Allan
2a89bf2e6c Refactor reportable_url helper to focus on just the title choices. 2018-02-28 11:53:43 +08:00
Andy Allan
38efcc2f33 Remove the report_type helper and use the model_name.human to look up translations. 2018-02-28 11:40:00 +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
75e178e6b8 Allow the status to be translated in the table of results 2018-02-28 10:50:27 +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
2d915b0e24 Avoid submit_tag to avoid 'Save changes' default 2018-02-23 12:30:37 +08:00
Andy Allan
7b5e0d91f3 resolve last_reported_by vs last_updated_by duplication 2018-02-23 10:18:57 +08:00
Biswesh Mohapatra
dd27ee8afe Add marker at trace start coordinate
Fixes #1676
Closes #1731
2018-02-04 15:04:17 +00:00
Biswesh Mohapatra
16b78022c7 Remove duplicate link: traces >> more
Fixes #1699
Closes #1730
2018-02-04 15:00:30 +00:00
Tom Hughes
9d2f920feb Merge remote-tracking branch 'upstream/pull/1693' 2018-02-03 16:12:51 +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
Tom Hughes
be86e4824f Convert various URLs to https 2018-01-08 20:18:21 +00:00
Tom Hughes
9340c46173 Remove dependencies on mapzen services 2018-01-02 18:45:20 +00:00
mmd-osm
965123372d Added explanation about discussions on open changesets
Closes #1705
2017-12-18 21:19:35 +00:00
J Guthrie
7a933cf928 Added 'Reverse Directions' link
Added a text link that reverses the directions of the planned route
2017-12-17 01:09:09 +00:00
Tom Hughes
30757696bd Move advice on what to enter in a note to guide text 2017-12-14 16:07:32 +00:00
Andy Allan
e3054fc15a Fix some reporting links. 2017-12-13 16:35:14 +00:00