Merge branch 'master' into next
[rails.git] / app / views / diary_entry / _diary_comment.html.erb
2018-06-10 Tom HughesMerge branch 'master' into next
2018-05-18 hikemaniacRebase to current master
2018-05-16 Tom HughesMerge remote-tracking branch 'upstream/pull/1866'
2018-05-16 Andy AllanRemove if_user and similar methods
2018-04-29 J GuthrieMerge branch 'convert_roundabout_exits' of https:/...
2018-04-29 Jamie GuthrieMerge branch 'master' into convert_roundabout_exits
2018-04-29 Tom HughesMerge remote-tracking branch 'upstream/pull/1809'
2018-04-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1833'
2018-04-25 Andy AllanUse lazy translations where possible
2018-04-11 Andy AllanMerge branch 'master' into moderation
2018-03-28 Andy AllanCreate a report_link helper, and use text instead of...
2018-03-25 Tom HughesMerge remote-tracking branch 'upstream/pull/1788'
2018-03-21 Andy AllanUse user_path links. Fixes #1785
2018-02-28 Andy AllanMerge branch 'master' into moderation
2018-02-28 Andy AllanMerge branch 'master' into moderation
2018-01-21 Andy AllanMerge branch 'master' into moderation
2017-12-13 Andy AllanFix some reporting links.
2017-11-29 Andy AllanMerge branch 'master' into moderation
2017-11-22 Andy AllanMerge branch 'p' of https://github.com/jfirebaugh/opens...
2017-08-02 Andy AllanUse current_user instead of @user.
2017-08-02 Andy AllanMerge branch 'master' into moderation
2017-07-12 Andy AllanSet the reported_user in a callback
2017-07-12 Andy AllanMerge branch 'master' into moderation
2016-08-22 Matt AmosMore whitespace fixes. Attempting to get tests to pass.
2016-08-22 ShreyUI changes + Redirection after creating report fixed
2016-08-22 ShreyChanged report button + Added disclaimer on report...
2016-08-22 ShreyAdded report icon + changes to admin UI + changes to...
2016-08-22 ShreyMoved strings to locales + Added 'Issues' button +...
2016-08-22 ShreyFixed tests + Altered migration file + Added reporting...
2016-08-22 ShreyDB changes + Related issues added
2016-08-22 Shreybasic UI for reporting diary entries,diary entry commen...
2013-09-15 Tom HughesMake the timestamp for a diary comment into a permalink...
2013-02-02 Tom HughesMerge branch 'master' into notes
2013-01-24 Tom HughesFix lists in rich text to display properly
2013-01-15 Tom HughesMerge branch 'master' into notes
2013-01-14 Saman Bemel-BenrudSite cleanup
2012-08-22 Tom HughesMerge branch 'master' into openstreetbugs
2012-06-18 Tom HughesRemove use of deprecated :comment attribute on link_to...
2012-05-13 Tom HughesUse POST for hiding diary entries and comments
2012-03-17 Tom HughesTreat all newly entered blocks of text as Markdown
2012-01-05 Tom HughesMerge branch 'master' into openstreetbugs
2011-11-14 Tom HughesMake helpers return text instead of appending to the...
2011-11-14 Tom HughesMark some strings that shouldn't be escaped as raw
2011-08-13 Tom HughesMerge branch 'master' into openstreetbugs
2011-07-02 Tom HughesLots more work on making RTL layout work
2010-07-28 Tom HughesMerge branch 'master' into openid
2010-07-28 Tom HughesMerge branch 'master' into openstreetbugs
2010-07-21 Tom HughesConvert diary views to use CSS based user specific...
2010-04-19 Tom HughesMerge branch 'master' into openid
2010-03-18 Kai KruegerMerge -r 20198:20540 from trunc into openstreetbugs...
2010-02-28 Tom HughesAdd a "friendly" date/time format and use it whenever...
2010-02-28 Tom HughesAdd user images to diary view.
2009-11-14 Tom HughesAdd support for logical deletion of diary entries and...
2009-06-09 Tom HughesMerge 15722:15806 from head and adjust new views to...
2009-06-09 Tom HughesRename views to rails 2 style names.