Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
| | ||||||
* | Extracted localized_cache.rb from ActionController, added it to ↵ | José Valim | 2009-11-01 | 1 | -0/+1 | |
| | | | | AbstractController and made ActionMailer use it. | |||||
* | Use I18n on ActionMailer subjects by default. | José Valim | 2009-11-01 | 1 | -3/+7 | |
| | ||||||
* | More refactoring on ActionMailer::Base. | José Valim | 2009-11-01 | 1 | -20/+23 | |
| | ||||||
* | Make tests run without deprecation warning (just one left). | José Valim | 2009-11-01 | 1 | -2/+2 | |
| | ||||||
* | Another refactoring on AM. body is deprecated, use render instead. | José Valim | 2009-11-01 | 3 | -109/+88 | |
| | ||||||
* | Add some basic render_test to AbstractController. | José Valim | 2009-11-01 | 1 | -5/+0 | |
| | ||||||
* | Move all render and layout pieces required in ActionMailer from ↵ | José Valim | 2009-11-01 | 1 | -98/+70 | |
| | | | | ActionController to AbstractController. | |||||
* | Remove ActionMailer helpers and rely on AbstractController one. | José Valim | 2009-11-01 | 3 | -131/+14 | |
| | ||||||
* | Refactor ActionMailer layout and remove legacy one. | José Valim | 2009-11-01 | 6 | -36/+31 | |
| | ||||||
* | abstract all of the ActionMailer delivery methods into their own classes. ↵ | Matthew Rudy Jacobs | 2009-11-01 | 7 | -62/+158 | |
| | | | | | | | | | | | | | | | | | | | | | | thereby the following are equivalent ActionMailer::Base.delivery_method = :smtp ActionMailer::Base.delivery_method = ActionMailer::DeliveryMethod::Smtp we could equally set our own custom object as long as it provides the instance method :perform_delivery(mail) eg. class MySmsDeliveryMethod def perform_delivery(mail) Sms.send(mail['to'], mail['body']) end end MySmsMailer.delivery_method = MySmsDeliveryMethod.new Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Renamed Orchestra to Notifications once again [#3321 state:resolved] | José Valim | 2009-10-15 | 1 | -2/+2 | |
| | ||||||
* | Revert "Rename Orchestra to Notifications [#3321 state:resolved]" | José Valim | 2009-10-15 | 1 | -10/+10 | |
| | | | | This reverts commit 8cbf825425dc8ad3770881ea4e100b9023c69ce2. | |||||
* | AV expects options[:locals] to be a Hash | Jeremy Kemper | 2009-10-14 | 1 | -0/+1 | |
| | ||||||
* | Rename Orchestra to Notifications [#3321 state:resolved] | Joshua Peek | 2009-10-14 | 1 | -10/+10 | |
| | ||||||
* | Prefer tap to returning | Matias Flores | 2009-09-28 | 1 | -1/+1 | |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3280 state:committed] | |||||
* | Instrument create and deliver in ActionMailer. | José Valim | 2009-09-20 | 1 | -56/+64 | |
| | ||||||
* | Revert "Allow frameworks to be required by their gem name" | Jeremy Kemper | 2009-09-12 | 1 | -1/+0 | |
| | | | | | | | This has just been confusing. Better to educate than band-aid. This reverts commit 18a24274ec823ded4ffa29bf33fd3d76816aab7e. Originally from http://dev.rubyonrails.org/ticket/8845 [drnic] | |||||
* | Refactor ActionView::Resolver | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -1/+1 | |
| | ||||||
* | Adds a :file delivery_method to save email to a file on disk | Eric Davis | 2009-08-08 | 1 | -1/+21 | |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2438 state:committed] | |||||
* | Default sent_on time to now in ActionMailer | Matt Duncan | 2009-08-08 | 1 | -0/+1 | |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2607 state:committed] | |||||
* | Rename find_by_parts and find_by_parts? to find and exists? | Yehuda Katz | 2009-08-07 | 1 | -2/+2 | |
| | ||||||
* | Replace _render_template_with_layout with _render_template since the layout ↵ | Yehuda Katz | 2009-08-07 | 1 | -2/+2 | |
| | | | | is optional | |||||
* | Merge docrails | Pratik Naik | 2009-07-25 | 1 | -1/+1 | |
| | ||||||
* | Bump up the version to 3.0.pre | Carl Lerche | 2009-06-30 | 1 | -3/+3 | |
| | ||||||
* | rm -r controller/base! | Yehuda Katz + Carl Lerche | 2009-06-15 | 1 | -1/+1 | |
| | ||||||
* | Keep ActionMailer using the old layouts code until it gets refactored. | Yehuda Katz + Carl Lerche | 2009-06-15 | 1 | -1/+3 | |
| | ||||||
* | Get tests to run (with failures) without old base around | Yehuda Katz + Carl Lerche | 2009-06-15 | 1 | -1/+3 | |
| |