Merge remote-tracking branch 'upstream/pull/2014'
[rails.git] / app / models / notifier.rb
2018-10-03 Tom HughesMerge remote-tracking branch 'upstream/pull/2014'
2018-10-03 Tom HughesMerge remote-tracking branch 'upstream/pull/2012'
2018-10-03 Andy AllanRename user_controller to users_controller
2018-10-03 Andy AllanMerge branch 'master' into messages
2018-09-22 Tom HughesFix Style/SafeNavigation rubocop warnings
2018-09-05 Tom HughesMerge remote-tracking branch 'upstream/pull/1974'
2018-09-05 Tom HughesMerge remote-tracking branch 'upstream/pull/1973'
2018-09-05 Tom HughesMerge remote-tracking branch 'upstream/pull/1972'
2018-09-05 Andy AllanRename diary_entry#view to diary_entry#show
2018-09-05 Andy AllanRename user#view to user#show
2018-09-05 Andy AllanUse resourceful routing for message replies
2018-06-10 Tom HughesMerge branch 'master' into next
2018-05-18 hikemaniacRebase to current master
2018-05-15 Tom HughesMerge remote-tracking branch 'upstream/pull/1863'
2018-05-15 Andy AllanRename messages#read to #show
2018-05-14 Tom HughesMerge remote-tracking branch 'upstream/pull/1857'
2018-05-13 Tom HughesMerge remote-tracking branch 'upstream/pull/1851'
2018-05-13 Tom HughesMerge remote-tracking branch 'upstream/pull/1850'
2018-05-09 Andy AllanUse named paths for messages
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-18 Tom HughesMerge remote-tracking branch 'upstream/pull/1827'
2018-04-18 Tom HughesMerge remote-tracking branch 'upstream/pull/1826'
2018-04-18 Tom HughesMerge remote-tracking branch 'upstream/pull/1824'
2018-04-11 Andy AllanSet default_url_options for action_mailer
2018-02-28 Andy AllanMerge branch 'master' into moderation
2018-02-23 Andy AllanMerge pull request #1732 from tomhughes/npemap
2018-02-05 Tom HughesUse configured server protocol for links in e-mail...
2017-12-13 Andy AllanRemove new issue notifications for now
2017-11-29 Andy AllanMerge branch 'master' into moderation
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-08-02 Andy AllanMerge branch 'master' into moderation
2017-07-12 Andy AllanMerge branch 'master' into moderation
2017-03-05 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1437'
2017-02-28 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1469'
2017-02-27 Herve Saint-AmandIncluded greeting string in changeset_comment_notificat...
2017-02-12 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1030...
2017-02-05 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1347...
2017-02-05 Tom HughesFix rubocop warnings
2017-02-05 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1401'
2017-01-16 Herve Saint-AmandMove attach_project_logo to be its own before_action...
2017-01-16 Herve Saint-AmandRenamed @user_message_author to @author as suggested
2017-01-14 Herve Saint-AmandRevert "Added a greeting to the changeset comment message"
2017-01-13 Herve Saint-AmandLogo was being attached twice on changeset comment...
2017-01-12 Herve Saint-AmandDressed up note comment messages
2017-01-12 Herve Saint-AmandDressed up friend_notification mail
2017-01-12 Herve Saint-AmandAdded a greeting to the changeset comment message
2017-01-09 Herve Saint-AmandDressed up a few more messages.
2017-01-08 Herve Saint-AmandMoved message table HTMl to a partial template
2017-01-03 Herve Saint-AmandRemove HTML markup from locale file
2017-01-02 Herve Saint-AmandMore compact image paths
2017-01-02 Herve Saint-AmandProper way to get path to small avatar
2017-01-01 Herve Saint-AmandFixed quotes
2017-01-01 Herve Saint-AmandRemove unused variable
2017-01-01 Herve Saint-AmandRemove unused import
2017-01-01 Herve Saint-AmandBetter loading of attached images
2016-12-29 Herve Saint-Amandavatar inline attachment
2016-12-29 Herve Saint-Amandintial commit, for 'en' locale only, for changeset_comm...
2016-12-21 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1395'
2016-12-18 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1367'
2016-11-29 Tom HughesMake sure email replies to diary comments come from...
2016-10-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1344'
2016-10-12 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1309'
2016-10-12 Mikel Maronmerge upstream/master and resolve conflicts from https...
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 ShreyUI changes + Redirection after creating report fixed
2016-08-22 ShreyControllers + a few tests + new notification added...
2016-08-15 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1004'
2016-03-20 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/954'
2016-03-14 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/954'
2016-03-09 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1120'
2016-03-09 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/1122'
2016-01-19 Tom HughesFix rubocop warnings
2016-01-06 Tom HughesRework locale selection
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/891'
2015-08-27 Tom HughesMerge remote-tracking branch 'openstreetmap/pull/903'
2015-08-18 Tom HughesFix new rubocopy warnings
2015-06-24 Tom HughesAdd HTML version of friend notification email
2015-02-20 Tom HughesStandardise on double quoted strings
2015-02-20 Tom HughesFix most auto-correctable rubocop issues
2014-11-03 Richard FairhurstMerge pull request #24 from zerebubuth/routing-merge
2014-11-03 Matt AmosMerge remote-tracking branch 'upstream/master' into...
2014-11-01 Tom HughesMerge branch 'master' into overpass
2014-11-01 Tom HughesMerge branch 'comments'
2014-10-23 Łukasz GurdekChangeset discussions
2013-08-23 Tom HughesMerge remote-tracking branch 'osmlab/id-default'
2013-08-18 Tom HughesMerge remote-tracking branch 'osmlab/welcome-2'
2013-08-12 John FirebaughReduce welcome email to minimal text
2013-05-27 Tom HughesPass the correct locale to Nominatim.describe_location
2013-05-27 Tom HughesSimplify locale handing in notification emails
2013-05-27 Tom HughesUse correct locale for note comment notification emails
2013-04-29 Tom HughesMake the notification mails for notes show when a note...
2013-04-23 Tom HughesMerge branch 'notes'
2013-04-16 Tom HughesMerge branch 'master' into notes
2013-04-08 Tom HughesMerge branch 'master' into notes
next