Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Silence warnings | Mikel Lindsaar | 2010-01-02 | 1 | -1466/+1467 |
| | |||||
* | 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 | 4 | -4/+13 |
|\ | |||||
| * | 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 | 4 | -4/+14 |
| | | |||||
* | | 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 | 2 | -0/+12 |
| | |||||
* | Adding default 8bit encoding if the body has non usascii in it | Mikel Lindsaar | 2009-12-28 | 1 | -0/+2 |
| | |||||
* | 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 | 2 | -32/+12 |
| | |||||
* | DRY ActionMailer code. | José Valim | 2009-12-27 | 1 | -60/+61 |
| | |||||
* | Merge Mail with latest Rails and move mail gem to Gemfile. | José Valim | 2009-12-27 | 8 | -98/+92 |
|\ | |||||
| * | 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 | 4 | -31/+33 |
| | | | | | | | | 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 | 1 | -44/+16 |
| | | | | | | | | 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 | 1 | -1/+1 |
| | | |||||
* | | Updating actionmailer to call :to_s on all field values instead of decoded | Mikel Lindsaar | 2009-12-27 | 1 | -1/+1 |
| | | |||||
* | | 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 |
| | | |||||
* | | Merged in latest changes from rails/master | Mikel Lindsaar | 2009-12-17 | 3 | -2/+23 |
| | | |||||
* | | Fixes for working with 1.9.1-head | Mikel Lindsaar | 2009-12-17 | 3 | -21/+1 |
| | | |||||
* | | Merge branch 'rails' | Mikel Lindsaar | 2009-12-17 | 4 | -37/+44 |
|\| | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer.rb actionmailer/lib/action_mailer/delivery_method/smtp.rb | ||||
| * | Fully expand relative rails framework paths and make sure we aren't | Joshua Peek | 2009-12-16 | 1 | -2/+3 |
| | | | | | | | | adding any to the load path more than once. | ||||
| * | Should fix a few Sam Ruby fails. | Yehuda Katz | 2009-12-03 | 1 | -1/+0 |
| | | |||||
| * | Reorganize autoloads: | Carlhuda | 2009-12-02 | 4 | -32/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * A new module (ActiveSupport::Autoload) is provide that extends autoloading with new behavior. * All autoloads in modules that have extended ActiveSupport::Autoload will be eagerly required in threadsafe environments * Autoloads can optionally leave off the path if the path is the same as full_constant_name.underscore * It is possible to specify that a group of autoloads live under an additional path. For instance, all of ActionDispatch's middlewares are ActionDispatch::MiddlewareName, but they live under "action_dispatch/middlewares/middleware_name" * It is possible to specify that a group of autoloads are all found at the same path. For instance, a number of exceptions might all be declared there. * One consequence of this is that testing-related constants are not autoloaded. To get the testing helpers for a given component, require "component_name/test_case". For instance, "action_controller/test_case". * test_help.rb, which is automatically required by a Rails application's test helper, requires the test_case.rb for all active components, so this change will not be disruptive in existing or new applications. | ||||
| * | Silence known internal AM deprecation calls | Joshua Peek | 2009-12-01 | 1 | -3/+7 |
| | | |||||
| * | avoid generating invalid SMTP commands in ruby pre 1.9 | Michael Koziarski | 2009-11-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> Conflicts: actionmailer/lib/action_mailer/base.rb | ||||
* | | Merge branch 'master' of git://github.com/rails/rails into rails_master | Mikel Lindsaar | 2009-11-24 | 1 | -2/+4 |
|\| | |||||
| * | Be sure to invoke the super chain! And initialize response body. | Jeremy Kemper | 2009-11-10 | 1 | -0/+2 |
| | | |||||
| * | Change mailer subjects lookup. | José Valim | 2009-11-09 | 1 | -2/+2 |
| | | |||||
* | | Change require mail version to 1.3.0 | Mikel Lindsaar | 2009-11-24 | 1 | -1/+1 |
| | | |||||
* | | Changed deprecation to use ActiveSupport::Deprecation | Mikel Lindsaar | 2009-11-24 | 1 | -2/+3 |
| | | |||||
* | | Deprecating attachment :body => 'string' in favour of attachment :data => ↵ | Mikel Lindsaar | 2009-11-23 | 1 | -1/+5 |
| | | | | | | | | 'string' | ||||
* | | Removing utils, and updating requires to match | Mikel Lindsaar | 2009-11-23 | 3 | -13/+5 |
| | | |||||
* | | Opps.. need to require it as well as gem mail :) | Mikel Lindsaar | 2009-11-22 | 1 | -0/+1 |
| | | |||||
* | | Adding mail as a gem load | Mikel Lindsaar | 2009-11-22 | 1 | -2/+1 |
| | | |||||
* | | 131 tests, 309 assertions, 0 failures, 0 errors | Mikel Lindsaar | 2009-11-22 | 4 | -27/+7 |
| | | |||||
* | | Down to 13 failures, 14 errors | Mikel Lindsaar | 2009-11-20 | 1 | -1/+1 |
| | | |||||
* | | Down to 30 failures total | Mikel Lindsaar | 2009-11-20 | 1 | -5/+5 |
| | | |||||
* | | More updates... 45 errors left to get it working with Mail gem | Mikel Lindsaar | 2009-11-20 | 3 | -24/+32 |
| | | |||||
* | | Starting again on actionmailer integration with mail | Mikel Lindsaar | 2009-11-12 | 35 | -8039/+74 |
|/ | |||||
* | Shush | Jeremy Kemper | 2009-11-05 | 1 | -0/+2 |
| |