Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-01-17 | 8 | -55/+108 |
|\ | | | | | | | | | Conflicts: actionpack/lib/action_controller/metal/flash.rb | ||||
| * | Move I18n to gemspec and update dependencies. | José Valim | 2010-01-15 | 1 | -1/+1 |
| | | |||||
| * | Remove URI object from ActiveResource notification, send the :mailer class ↵ | José Valim | 2010-01-15 | 1 | -1/+1 |
| | | | | | | | | in AM (like in AP#process_action) and remove locale instrumentation. | ||||
| * | Add message_id to AM payload and don't send bcc and cc if they were not sent. | José Valim | 2010-01-15 | 1 | -9/+8 |
| | | |||||
| * | Ensure we just send Ruby Stdlib objects in ActionMailer notifications. | José Valim | 2010-01-15 | 3 | -8/+23 |
| | | |||||
| * | Add subscriber to ActionMailer. | José Valim | 2010-01-14 | 5 | -45/+84 |
| | | |||||
| * | Mailer should give self as payload because it contains all the information ↵ | José Valim | 2010-01-08 | 1 | -1/+1 |
| | | | | | | | | needed (as the template rendered and the mailer name). | ||||
| * | Return-Path per RFC needs '<' and '>' around the addr_spec | Mikel Lindsaar | 2010-01-08 | 1 | -1/+6 |
| | | |||||
| * | Liberalize picky test | Jeremy Kemper | 2010-01-07 | 1 | -1/+1 |
| | | |||||
| * | Updating mail require | Mikel Lindsaar | 2010-01-08 | 1 | -1/+1 |
| | | |||||
| * | Remove duplicated url_for code and move methods shared between ActionMailer ↵ | José Valim | 2010-01-07 | 1 | -2/+1 |
| | | | | | | | | and ActionController up to AbstractController. | ||||
| * | Autoload AS test case | Joshua Peek | 2010-01-04 | 1 | -3/+0 |
| | | |||||
| * | Autoload AM test case class | Joshua Peek | 2010-01-04 | 1 | -1/+0 |
| | | |||||
| * | Use underscore in notification namespaces. | José Valim | 2010-01-04 | 1 | -1/+1 |
| | | |||||
| * | Use namespaces in notifications. | José Valim | 2010-01-03 | 1 | -1/+1 |
| | | |||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-01-04 | 62 | -9905/+2157 |
|\| | |||||
| * | Silence warnings | Mikel Lindsaar | 2010-01-02 | 1 | -1466/+1467 |
| | | |||||
| * | Updating to Mail 1.5.0, including default values for all Message#field_name ↵ | Mikel Lindsaar | 2010-01-02 | 7 | -63/+64 |
| | | | | | | | | methods, can access field objects by calling Message#[:field_name] | ||||
| * | Expose a _render_partial hook as thhe _render_template one and make use of it. | José Valim | 2009-12-31 | 1 | -0/+1 |
| | | |||||
| * | controller_path is required by ActionView, so move it up to ↵ | José Valim | 2009-12-31 | 1 | -0/+1 |
| | | | | | | | | AbstractController and refactor AbstractController::Layouts. | ||||
| * | Merge commit 'mikel/master' | Jeremy Kemper | 2009-12-31 | 6 | -5/+23 |
| |\ | |||||
| | * | Updating mail requirement to 1.4.3 | Mikel Lindsaar | 2009-12-31 | 1 | -1/+1 |
| | | | |||||
| | * | removing spurious line | Mikel Lindsaar | 2009-12-31 | 1 | -1/+0 |
| | | | |||||
| | * | Adding :transfer_encoding -> :content_transfer_encoding as part of TmailCompat | Mikel Lindsaar | 2009-12-31 | 5 | -4/+23 |
| | | | |||||
| * | | Some railties cleanup: | Carl Lerche | 2009-12-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | * Rename <framework>/rails.rb -> <framework>/railtie.rb * Rails::Plugin -> Rails::Railtie * Rails::Plugin::Vendored -> Rails::Plugin | ||||
| * | | Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rb | Carl Lerche | 2009-12-31 | 1 | -0/+1 |
| |/ | |||||
| * | Adding TMailCompat layer for :set_content_type and friends | Mikel Lindsaar | 2009-12-30 | 3 | -0/+26 |
| | | |||||
| * | Clean up changelog a bit | Jeremy Kemper | 2009-12-29 | 1 | -22/+12 |
| | | |||||
| * | Move mail gem dep to Action Mailer's gemspec | Jeremy Kemper | 2009-12-29 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of git://github.com/mikel/rails into mail | Jeremy Kemper | 2009-12-29 | 23 | -316/+366 |
| |\ | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer.rb | ||||
| | * | Adding default 8bit encoding if the body has non usascii in it | Mikel Lindsaar | 2009-12-28 | 2 | -1/+3 |
| | | | |||||
| | * | Remove unused code paths and require mail only when it's needed. | José Valim | 2009-12-28 | 3 | -17/+9 |
| | | | |||||
| | * | Moved sort_parts into Mail, updated mail requirement to 1.4.2 | Mikel Lindsaar | 2009-12-28 | 4 | -39/+21 |
| | | | |||||
| | * | DRY ActionMailer code. | José Valim | 2009-12-27 | 1 | -60/+61 |
| | | | |||||
| | * | Getting rid of some warnings in AM suite. | José Valim | 2009-12-27 | 4 | -8/+10 |
| | | | |||||
| | * | Merge Mail with latest Rails and move mail gem to Gemfile. | José Valim | 2009-12-27 | 12 | -124/+147 |
| | |\ | |||||
| | | * | Refactor multiple parts logic and move Utils to PartContainer. | José Valim | 2009-12-25 | 4 | -31/+24 |
| | | | | |||||
| | | * | adv_attr_accessors in ActionMailer are not sent to the views, use the mailer ↵ | José Valim | 2009-12-25 | 6 | -42/+79 |
| | | | | | | | | | | | | | | | | object if you need to access the subject, recipients, from, etc. | ||||
| | | * | Finish moving config.frameworks-dependent code to the framework plugin | Carlhuda | 2009-12-23 | 1 | -0/+24 |
| | | | | |||||
| | | * | All AM modules are safe to defer | Joshua Peek | 2009-12-22 | 4 | -35/+17 |
| | | | | |||||
| | | * | Flip deferrable autoload convention | Joshua Peek | 2009-12-22 | 1 | -13/+18 |
| | | | | |||||
| | | * | Make ActionMailer::Base inherit from AbstractController::Base | José Valim | 2009-12-22 | 3 | -49/+23 |
| | | | | | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| | | * | Fix ActionMailer. The fact that ActionMailer::Base does not inherit from ↵ | Carlhuda | 2009-12-21 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | AbstractController::Base is either a bug or we need to re-evaluate the requirements of the mixins. | ||||
| | | * | Rename the RenderingController module to just plain Rendering | David Heinemeier Hansson | 2009-12-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | Updating action_mailer to need mail 1.4.1 | Mikel Lindsaar | 2009-12-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | Changing body to use :to_s instead of :decoded... better use case | Mikel Lindsaar | 2009-12-27 | 7 | -39/+39 |
| | | | | |||||
| | * | | Updating readme | Mikel Lindsaar | 2009-12-27 | 1 | -1/+4 |
| | | | | |||||
| | * | | Updating actionmailer to call :to_s on all field values instead of decoded | Mikel Lindsaar | 2009-12-27 | 2 | -9/+9 |
| | | | | |||||
| | * | | Updating requirement for mail to 1.3.4 | Mikel Lindsaar | 2009-12-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | Updating requirement for mail to 1.3.3 | Mikel Lindsaar | 2009-12-17 | 1 | -1/+1 |
| | | | |