aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2010-01-174-18/+48
|\
| * Remove URI object from ActiveResource notification, send the :mailer class in...José Valim2010-01-151-1/+1
| * Add message_id to AM payload and don't send bcc and cc if they were not sent.José Valim2010-01-151-9/+8
| * Ensure we just send Ruby Stdlib objects in ActionMailer notifications.José Valim2010-01-152-7/+22
| * Add subscriber to ActionMailer.José Valim2010-01-143-11/+31
| * Mailer should give self as payload because it contains all the information ne...José Valim2010-01-081-1/+1
| * Remove duplicated url_for code and move methods shared between ActionMailer a...José Valim2010-01-071-2/+1
| * Autoload AS test caseJoshua Peek2010-01-041-3/+0
| * Use underscore in notification namespaces.José Valim2010-01-041-1/+1
| * Use namespaces in notifications.José Valim2010-01-031-1/+1
* | Merge remote branch 'mainstream/master'Pratik Naik2010-01-0443-9644/+1675
|\|
| * Silence warningsMikel Lindsaar2010-01-021-1466/+1467
| * 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
| * Merge commit 'mikel/master'Jeremy Kemper2009-12-313-2/+13
| |\
| | * removing spurious lineMikel Lindsaar2009-12-311-1/+0
| | * Adding :transfer_encoding -> :content_transfer_encoding as part of TmailCompatMikel Lindsaar2009-12-313-2/+14
| * | Some railties cleanup:Carl Lerche2009-12-311-1/+1
| * | Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rbCarl Lerche2009-12-311-0/+1
| |/
| * Adding TMailCompat layer for :set_content_type and friendsMikel Lindsaar2009-12-301-0/+10
| * 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-282-14/+9
| * 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-277-85/+89
| |\
| | * Refactor multiple parts logic and move Utils to PartContainer.José Valim2009-12-254-31/+24
| | * adv_attr_accessors in ActionMailer are not sent to the views, use the mailer ...José Valim2009-12-254-31/+33
| | * Finish moving config.frameworks-dependent code to the framework pluginCarlhuda2009-12-231-0/+24
| | * All AM modules are safe to deferJoshua Peek2009-12-223-5/+7
| | * 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-172-1/+21
| * | Fixes for working with 1.9.1-headMikel Lindsaar2009-12-172-20/+0
| * | Merge branch 'rails'Mikel Lindsaar2009-12-173-19/+25
| |\|
| | * Reorganize autoloads:Carlhuda2009-12-023-16/+18
| | * Silence known internal AM deprecation callsJoshua Peek2009-12-011-3/+7
| | * avoid generating invalid SMTP commands in ruby pre 1.9Michael Koziarski2009-11-281-1/+1
| * | 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-232-10/+3
| * | 131 tests, 309 assertions, 0 failures, 0 errorsMikel Lindsaar2009-11-223-26/+5
| * | Down to 13 failures, 14 errorsMikel Lindsaar2009-11-201-1/+1
| * | Down to 30 failures totalMikel Lindsaar2009-11-201-5/+5
| * | More updates... 45 errors left to get it working with Mail gemMikel Lindsaar2009-11-203-24/+32
| * | Starting again on actionmailer integration with mailMikel Lindsaar2009-11-1234-8038/+72
* | | Merge remote branch 'mainstream/master'Pratik Naik2009-11-179-343/+275
|\ \ \ | | |/ | |/|
| * | 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
| |/