Commit graph

20 commits

Author SHA1 Message Date
Tom Hughes
f280dcb2d7 Merge remote-tracking branch 'upstream/pull/2278' 2019-06-26 13:36:44 +01:00
Andy Allan
3914050fcc Simplify partial rendering when the partial is named after the model 2019-06-26 14:13:09 +02:00
Andy Allan
df560bd71d Use the distance_in_words_ago scope for diary comments pages
Refs #2255
2019-06-19 18:04:08 +02:00
Tom Hughes
31edc7dff6 Merge remote-tracking branch 'upstream/pull/2226' 2019-06-18 21:10:07 +01:00
Andy Allan
5450bade1a Use built-in form sumbit translation keys for diary comments
Also use a diary comment object as the basis for the form
2019-06-12 16:20:29 +02:00
Tom Hughes
63186dc161 Fix erblint warnings 2019-06-06 18:20:21 +01:00
Andy Allan
9e158a5d39 Show all diary comments to administrators 2019-06-06 16:03:42 +02:00
Andy Allan
fdffd22cca Allow admins to unhide diary comments, if they wish 2019-06-06 16:03:42 +02:00
Andy Allan
49fc17c6b6 Show deleted diary entries to administrators, if the user isn't also deleted
This will allow administrators to review diary entry deletions from non-spam users.
2019-06-06 15:59:47 +02:00
Andy Allan
f2f3fbb1f1 Allow administrators to unhide diary entries, if they wish 2019-06-06 15:59:47 +02:00
Andy Allan
9431b471a7 rubocop and erblint fixes 2019-05-29 17:09:51 +02:00
Andy Allan
1b1d90a0f9 Refactor diary entry form
This uses the built-in helpers for naming form elements, rather than
having to override with specific i18n labels. It also changes the label
to 'Update', and capitalizes the title on the edit page.
2019-05-29 16:09:14 +02:00
Andy Allan
b7893df84e Refactor diary entries to use create and update methods
This brings it slightly more into line with resourceful routing.
2019-05-29 15:37:23 +02:00
Andy Allan
2142ff02c2 Allow moderators to hide diary entries and comments 2019-05-15 13:40:15 +02:00
Tom Hughes
7ce40eeb38 erblint: use consistent spacing in HTML tags 2019-03-28 00:30:48 +00:00
Tom Hughes
ecd81eadbe erblint: use parentheses for nested function calls 2019-03-27 18:55:48 +00:00
Tom Hughes
3af16f6337 erblint: fix remaining single quoted strings 2019-03-27 16:15:19 +00:00
Andy Allan
74b91c0e3e erblint: Add or remove curly braces around hash parameters as required 2019-03-27 10:30:48 +01:00
Andy Allan
0625c1effb Whitespace fixes for diary_entry erb files 2019-03-26 20:23:35 +00:00
Andy Allan
26777c4464 Pluralize diary entries controller 2018-11-07 16:31:04 +01:00