aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/base.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2010-01-041-109/+110
|\
| * Expose a _render_partial hook as thhe _render_template one and make use of it.José Valim2009-12-311-0/+1
| * controller_path is required by ActionView, so move it up to AbstractControlle...José Valim2009-12-311-0/+1
| * Adding :transfer_encoding -> :content_transfer_encoding as part of TmailCompatMikel Lindsaar2009-12-311-1/+2
| * Adding default 8bit encoding if the body has non usascii in itMikel Lindsaar2009-12-281-0/+2
| * Remove unused code paths and require mail only when it's needed.José Valim2009-12-281-14/+8
| * Moved sort_parts into Mail, updated mail requirement to 1.4.2Mikel Lindsaar2009-12-281-31/+10
| * DRY ActionMailer code.José Valim2009-12-271-60/+61
| * Merge Mail with latest Rails and move mail gem to Gemfile.José Valim2009-12-271-62/+34
| |\
| | * Refactor multiple parts logic and move Utils to PartContainer.José Valim2009-12-251-11/+3
| | * adv_attr_accessors in ActionMailer are not sent to the views, use the mailer ...José Valim2009-12-251-12/+12
| | * All AM modules are safe to deferJoshua Peek2009-12-221-0/+3
| | * Make ActionMailer::Base inherit from AbstractController::BaseJosé Valim2009-12-221-44/+16
| | * Fix ActionMailer. The fact that ActionMailer::Base does not inherit from Abst...Carlhuda2009-12-211-0/+3
| | * Rename the RenderingController module to just plain RenderingDavid Heinemeier Hansson2009-12-201-1/+1
| * | Merged in latest changes from rails/masterMikel Lindsaar2009-12-171-1/+2
| * | Fixes for working with 1.9.1-headMikel Lindsaar2009-12-171-1/+0
| * | Merge branch 'rails'Mikel Lindsaar2009-12-171-4/+8
| |\|
| | * Reorganize autoloads:Carlhuda2009-12-021-1/+1
| | * Silence known internal AM deprecation callsJoshua Peek2009-12-011-3/+7
| * | Merge branch 'master' of git://github.com/rails/rails into rails_masterMikel Lindsaar2009-11-241-2/+4
| |\|
| * | Changed deprecation to use ActiveSupport::DeprecationMikel Lindsaar2009-11-241-2/+3
| * | Deprecating attachment :body => 'string' in favour of attachment :data => 'st...Mikel Lindsaar2009-11-231-1/+5
| * | Removing utils, and updating requires to matchMikel Lindsaar2009-11-231-3/+3
| * | 131 tests, 309 assertions, 0 failures, 0 errorsMikel Lindsaar2009-11-221-3/+4
| * | Down to 30 failures totalMikel Lindsaar2009-11-201-5/+5
| * | More updates... 45 errors left to get it working with Mail gemMikel Lindsaar2009-11-201-9/+31
| * | Starting again on actionmailer integration with mailMikel Lindsaar2009-11-121-16/+34
* | | Merge remote branch 'mainstream/master'Pratik Naik2009-11-171-229/+86
|\ \ \ | | |/ | |/|
| * | Be sure to invoke the super chain! And initialize response body.Jeremy Kemper2009-11-101-0/+2
| * | Change mailer subjects lookup.José Valim2009-11-091-2/+2
| |/
| * Extracted localized_cache.rb from ActionController, added it to AbstractContr...José Valim2009-11-011-0/+1
| * Use I18n on ActionMailer subjects by default.José Valim2009-11-011-3/+7
| * More refactoring on ActionMailer::Base.José Valim2009-11-011-20/+23
| * Another refactoring on AM. body is deprecated, use render instead.José Valim2009-11-011-109/+43
| * Add some basic render_test to AbstractController.José Valim2009-11-011-5/+0
| * Move all render and layout pieces required in ActionMailer from ActionControl...José Valim2009-11-011-98/+70
| * Remove ActionMailer helpers and rely on AbstractController one.José Valim2009-11-011-16/+14
| * Refactor ActionMailer layout and remove legacy one.José Valim2009-11-011-23/+19
| * abstract all of the ActionMailer delivery methods into their own classes. the...Matthew Rudy Jacobs2009-11-011-62/+13
| * Renamed Orchestra to Notifications once again [#3321 state:resolved]José Valim2009-10-151-2/+2
| * Revert "Rename Orchestra to Notifications [#3321 state:resolved]"José Valim2009-10-151-10/+10
| * AV expects options[:locals] to be a HashJeremy Kemper2009-10-141-0/+1
| * Rename Orchestra to Notifications [#3321 state:resolved]Joshua Peek2009-10-141-10/+10
* | Merge commit 'mainstream/master'Pratik Naik2009-09-211-56/+64
|\|
| * Instrument create and deliver in ActionMailer.José Valim2009-09-201-56/+64
| * Refactor ActionView::ResolverYehuda Katz + Carl Lerche2009-09-031-1/+1
* | Typo. wil should be willJohan Andersson2009-08-191-1/+1
|/
* Adds a :file delivery_method to save email to a file on diskEric Davis2009-08-081-1/+21
* Default sent_on time to now in ActionMailerMatt Duncan2009-08-081-0/+1