Add /api/0.6/users to fetch multiple users
[rails.git] / app / controllers / diary_entry_controller.rb
2018-06-10 Tom HughesMerge branch 'master' into next
2018-06-06 Tom HughesMerge remote-tracking branch 'upstream/pull/1892'
2018-06-06 Tom HughesMerge remote-tracking branch 'upstream/pull/1893'
2018-06-06 Tom HughesMerge remote-tracking branch 'upstream/pull/1894'
2018-06-06 Andy AllanPrefer the helper in controllers
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 Rajdeep MandrekarUse rails helpers to construct URLs
2018-04-18 Tom HughesMerge remote-tracking branch 'upstream/pull/1824'
2018-04-15 Tom HughesMerge remote-tracking branch 'upstream/pull/1815'
2018-04-15 Tom HughesMerge remote-tracking branch 'upstream/pull/1820'
2018-04-15 Tom HughesMerge remote-tracking branch 'upstream/pull/1816'
2018-04-15 Tom HughesMerge remote-tracking branch 'upstream/pull/1814'
2018-04-11 Andy AllanRefactor @this_user to @user
2018-04-11 Andy AllanMerge branch 'master' into moderation
2018-03-26 Tom HughesFix new rubocop warnings
2018-02-28 Andy AllanMerge branch 'master' into moderation
2018-02-28 Andy AllanLink to diary comments using anchors, rather than showi...
2018-02-23 Andy AllanMerge pull request #1732 from tomhughes/npemap
2018-02-05 Tom HughesUse configured protocol for URLs in diary feeds
2018-02-04 Tom HughesMerge remote-tracking branch 'upstream/pull/1704'
2018-02-03 Tom HughesMerge remote-tracking branch 'upstream/pull/1693'
2018-01-22 Tom HughesFix new rubocop warnings
2018-01-21 Andy AllanMerge branch 'master' into moderation
2017-11-29 Andy AllanMerge branch 'master' into moderation
2017-11-23 Tom HughesAllow third party images in user content
2017-11-22 Andy AllanMerge branch 'pull/843' into titles
2017-11-22 Andy AllanMerge branch 'p' of https://github.com/jfirebaugh/opens...
2017-11-15 Andy AllanMerge branch 'wheres_this' of https://github.com/pnorma...
2017-10-16 Tom HughesMerge remote-tracking branch 'upstream/pull/1580'
2017-08-02 Andy AllanMerge branch 'master' into moderation
2017-07-12 Tom HughesMerge remote-tracking branch 'upstream/pull/1583'
2017-07-12 Andy AllanUse current_user to represent the currently logged...
2017-07-12 Andy AllanMerge branch 'master' into moderation
2017-06-29 Tom HughesSanitize parameters for various paged views
2017-06-02 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1553'
2017-06-02 Tom HughesRemove all use of the :text option to render
2017-06-01 Tom HughesFix rubocop warnings
2017-02-12 Herve Saint-Amandmerging master into html-mail-fixes
2017-02-12 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1030...
2017-02-09 Tom HughesOnly create diary entries for POST requests
2016-10-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1344'
2016-10-20 Tom HughesFix rubocop warnings
2016-10-12 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1309'
2016-10-12 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1322'
2016-10-12 Mikel Maronmerge upstream/master and resolve conflicts from https...
2016-10-12 Andy AllanRemove unnecessary controller references from the redir...
2016-10-07 Mikel Maronfix rubocop warnings
2016-10-07 Mikel Marontests passing
2016-10-07 Mikel Maronmore idiomatic models for diary entry subscriptions
2016-10-04 Mikel Maronnot api endpoints, moved to button, fixed notifier...
2016-10-03 Mikel MaronWIP diary comment subscriptions
2016-08-22 Matt AmosMade rubocop happy by formatting and minor syntax tweaks.
2016-08-22 ShreyFixed link to DiaryComments
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/891'
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/903'
2015-03-02 Tom HughesYet more tests...
2015-02-26 Tom HughesFix some rubocop rails style issues
2015-02-20 Tom HughesStandardise on double quoted strings
2015-02-20 Tom HughesFix most auto-correctable rubocop issues
2015-02-20 Tom HughesCleanup trailing whitespace
2015-01-26 Richard FairhurstMerge pull request #28 from zerebubuth/routing-ui-tweaks-2
2015-01-26 Matt AmosMerge remote-tracking branch 'upstream/master' into...
2015-01-17 Tom HughesMerge branch 'rails42'
2015-01-11 Tom HughesReplace deprecated deliver method with deliver_now
2013-11-16 John FirebaughMerge branch 'master' into redesign
2013-10-15 Tom HughesFix bogus redirect on error
2013-09-21 Tom HughesReplace attr_accessible with strong parameters
2013-07-19 Tom HughesMerge remote-tracking branch 'osmlab/map-ui'
2013-07-19 Tom HughesReplace `:nothing => true` with `:text => ""`
2013-06-25 Tom HughesRemove remaining action cache usage and related infrast...
2013-04-01 Tom HughesOptimise database reads in DiaryEntry#list
2013-04-01 Tom HughesImprove selection logic in DiaryEntry#rss
2013-03-28 Tom HughesMerge branch 'master' into notes
2013-03-24 Tom HughesOptimise database reads in DiaryEntry#list
2013-03-24 Tom HughesImprove selection logic in DiaryEntry#rss
2013-02-05 Tom HughesMerge branch 'master' into notes
2013-02-03 Tom HughesAdd a test for commenting on diary entries
2013-01-15 Tom HughesMerge branch 'master' into notes
2013-01-14 Tom HughesDisable caching of pages with dynamic layout
2013-01-14 Saman Bemel-BenrudSite cleanup
2012-09-20 Tom HughesMerge branch 'master' into openstreetbugs
2012-08-28 Tom HughesMove a chunk of non-markup ruby code from a view to...
2012-08-22 Tom HughesMerge branch 'master' into openstreetbugs
2012-05-15 Tom HughesDon't show deleted comments in a user's diary comment...
2012-05-13 Tom HughesFixed diary entry and comment hiding for mass assignmen...
2012-03-21 Tom HughesFactor out common code for looking up users
2012-03-21 Tom HughesUse one "no_such_user" view everywhere
2012-03-08 Tom HughesMerge branch 'master' into openstreetbugs
2012-02-28 Steve SingerAdd a view to show diary comments left by a user
2012-01-16 Tom HughesRevert "Increase the size of the diary RSS feed tempora...
2012-01-14 Tom HughesIncrease the size of the diary RSS feed temporarily
2012-01-07 Tom HughesDon't cache user specific diary entry lists
2012-01-07 Tom HughesNo need to restrict friend's diary entries to public...
2012-01-07 Mikel MaronAdd some more social features
2012-01-05 Tom HughesMerge branch 'master' into openstreetbugs
2011-11-14 Tom HughesMake more use of named scopes
2011-11-14 Tom HughesTemporary fix for postgres enums pending rails 3.0.4
2011-11-14 Tom HughesUpdate ActiveRecord queries to use arel
next