]> git.openstreetmap.org Git - rails.git/history - app/controllers/diary_entries_controller.rb
Merge remote-tracking branch 'upstream/pull/4241'
[rails.git] / app / controllers / diary_entries_controller.rb
2023-08-31 Tom HughesMerge remote-tracking branch 'upstream/pull/4212'
2023-08-30 Tom HughesMerge remote-tracking branch 'upstream/pull/4210'
2023-08-30 Tom HughesMerge remote-tracking branch 'upstream/pull/4209'
2023-08-30 Andy AllanAvoid using _id in queries
2023-08-30 Andy AllanMerge pull request #4193 from AntonKhorev/lookup-friend
2023-08-30 Andy AllanMerge pull request #4197 from AntonKhorev/user-resources
2023-08-21 Anton KhorevMove user lookup and error render to concerns
2023-08-17 Tom HughesMerge remote-tracking branch 'upstream/pull/4171'
2023-08-16 Andy AllanMerge pull request #4133 from AntonKhorev/flex-leaflet...
2023-08-16 Andy AllanMerge pull request #4150 from AntonKhorev/note-table...
2023-08-16 Andy AllanMerge pull request #4156 from AntonKhorev/bootstrap...
2023-08-16 Andy AllanMerge pull request #4148 from tomhughes/avatar-image
2023-08-16 Andy AllanMerge pull request #4173 from AntonKhorev/comments
2023-08-16 Andy AllanMerge pull request #4172 from tomhughes/user-predicates
2023-08-15 Tom HughesFix predicate method names in the user model
2023-08-13 Tom HughesMerge remote-tracking branch 'upstream/pull/4144'
2023-08-13 Tom HughesMerge remote-tracking branch 'upstream/pull/4159'
2023-08-13 Tom HughesMerge remote-tracking branch 'upstream/pull/4158'
2023-08-12 Tom HughesMerge remote-tracking branch 'upstream/pull/4155'
2023-08-12 Tom HughesMerge remote-tracking branch 'upstream/pull/4149'
2023-08-11 Anton KhorevAdd home location condition to user model
2023-08-09 Tom HughesMerge remote-tracking branch 'upstream/pull/4132'
2023-08-02 Tom HughesMerge remote-tracking branch 'upstream/pull/4131'
2023-08-02 Andy AllanMerge pull request #4106 from tomhughes/diary-paging
2023-08-02 Andy AllanMerge pull request #4111 from AntonKhorev/hidden-welcom...
2023-08-02 Andy AllanMerge pull request #4112 from AntonKhorev/no-float...
2023-08-02 Andy AllanMerge pull request #4125 from tomhughes/oauth-scopes
2023-08-02 Andy AllanMerge pull request #4107 from tomhughes/diary-visibility
2023-07-27 Tom HughesReplace page numbers with ID based selection for diary...
2023-07-27 Tom HughesAllow administrators to see deleted diary entries
2023-02-08 Andy AllanMerge pull request #3691 from AntonKhorev/wikipedia...
2022-12-03 Tom HughesMerge remote-tracking branch 'upstream/pull/3126'
2022-11-30 Tom HughesMerge remote-tracking branch 'upstream/pull/3688'
2022-11-23 Andy AllanMerge pull request #3676 from harry-wood/notes-disappea...
2022-11-22 Tom HughesMerge remote-tracking branch 'upstream/pull/3301'
2022-11-22 Tom HughesFix new rubocop warnings
2022-11-16 Andy AllanMerge pull request #3779 from AntonKhorev/spinner
2022-11-08 Tom HughesMerge remote-tracking branch 'upstream/pull/3780'
2022-11-02 Tom HughesMerge remote-tracking branch 'upstream/pull/3781'
2022-11-02 Andy AllanEnable the ActionOrder cop for remaining controllers
2022-09-10 Adam HoyleMerge branch 'master' into feature/add-communities...
2022-04-25 Jesse WeinsteinMerge branch 'master' into HEAD
2022-03-09 Tom HughesMerge pull request #3486 from tomhughes/vips
2022-03-09 Andy AllanMerge pull request #3491 from tomhughes/legacy-trace
2022-03-09 Andy AllanMerge pull request #3492 from harry-wood/oauth-doc
2022-03-08 Tom HughesMerge remote-tracking branch 'upstream/pull/3493'
2022-03-08 Tom HughesFix Lint/DuplicateBranch rubocop warnings
2021-12-14 Adam HoyleMerge branch 'master' into feature/add-communities...
2021-11-25 Tom HughesMerge remote-tracking branch 'upstream/pull/3379'
2021-11-25 Tom HughesMerge remote-tracking branch 'upstream/pull/3382'
2021-11-25 Tom HughesMerge remote-tracking branch 'upstream/pull/3381'
2021-11-25 Tom HughesMerge remote-tracking branch 'upstream/pull/3380'
2021-11-25 Tom HughesMerge remote-tracking branch 'upstream/pull/3378'
2021-11-24 Andy AllanAdd a user link to the heading of the diary comments...
2021-04-08 Andy AllanMerge pull request #1558 from plarus/master
2020-10-21 Tom HughesMerge remote-tracking branch 'upstream/pull/2901'
2020-10-15 Tom HughesMerge remote-tracking branch 'upstream/pull/2887'
2020-10-15 Tom HughesMerge remote-tracking branch 'upstream/pull/2884'
2020-10-14 Andy AllanRename Notifier to UserMailer
2020-02-19 Tom HughesMerge remote-tracking branch 'upstream/pull/2381'
2019-11-07 Tom HughesMerge remote-tracking branch 'upstream/pull/834'
2019-10-30 Tom HughesMerge remote-tracking branch 'upstream/pull/2412'
2019-10-23 Tom HughesMerge remote-tracking branch 'upstream/pull/2403'
2019-10-23 Tom HughesMerge remote-tracking branch 'upstream/pull/2411'
2019-10-23 Andy AllanConvert various administator? tests to use cancancan...
2019-10-22 Tom HughesMerge remote-tracking branch 'upstream/pull/2354'
2019-10-21 Tom HughesMerge remote-tracking branch 'upstream/pull/2400'
2019-10-20 Tom HughesMerge remote-tracking branch 'upstream/pull/2383'
2019-10-17 Tom HughesAllow administrators to see deleted diary comments
2019-08-31 Stefan BaeblerMerge branch 'master' into tag-colour-preview-rebase
2019-08-28 Tom HughesMerge remote-tracking branch 'upstream/pull/1926'
2019-08-28 Andy AllanMerge pull request #2266 from systemed/patch-2
2019-06-27 mmdMerge branch 'master' into patch/view_migration
2019-06-26 Tom HughesMerge remote-tracking branch 'upstream/pull/2207'
2019-06-26 Tom HughesMerge remote-tracking branch 'upstream/pull/2271'
2019-06-20 Tom HughesMerge remote-tracking branch 'upstream/pull/2267'
2019-06-20 Tom HughesMerge remote-tracking branch 'upstream/pull/2270'
2019-06-20 Tom HughesMerge remote-tracking branch 'upstream/pull/2269'
2019-06-19 Andy AllanRename user.friend_users to user.friends
2019-06-18 Tom HughesMerge remote-tracking branch 'upstream/pull/2226'
2019-06-12 Tom HughesMerge remote-tracking branch 'upstream/pull/2228'
2019-06-10 Tom HughesMerge remote-tracking branch 'upstream/pull/2204'
2019-06-06 Tom HughesMerge remote-tracking branch 'upstream/pull/2248'
2019-06-06 Andy AllanShow all diary comments to administrators
2019-06-06 Andy AllanAllow admins to unhide diary comments, if they wish
2019-06-06 Andy AllanShow deleted diary entries to administrators, if the...
2019-06-06 Andy AllanAllow administrators to unhide diary entries, if they...
2019-05-30 Tom HughesMerge remote-tracking branch 'upstream/pull/2225'
2019-05-30 Tom HughesMerge remote-tracking branch 'upstream/pull/2237'
2019-05-29 Tom HughesMerge remote-tracking branch 'upstream/pull/2239'
2019-05-29 Tom HughesMerge remote-tracking branch 'upstream/pull/2238'
2019-05-29 Andy AllanAllow a configurable delay to keep diary entries from...
2019-05-29 Andy AllanRefactor diary entries to use create and update methods
2019-03-26 Tom HughesMerge remote-tracking branch 'upstream/pull/2175'
2019-03-19 Tom HughesMerge remote-tracking branch 'upstream/pull/2182'
2019-03-17 Tom HughesFix database offline mode
2019-03-16 Tom HughesMerge remote-tracking branch 'upstream/pull/2177'
2019-03-13 Andy AllanMove all settings to settings.yml
2019-01-16 Andy AllanMerge pull request #1151 from polarbearing/patch-1
2018-11-14 Tom HughesMerge remote-tracking branch 'upstream/pull/2060'
next