aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2009-11-1710-344/+277
|\ | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/conversions.rb
| * 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
| |
| * ShushJeremy Kemper2009-11-051-0/+2
| |
| * Extracted localized_cache.rb from ActionController, added it to ↵José Valim2009-11-011-0/+1
| | | | | | | | AbstractController and made ActionMailer use it.
| * Use I18n on ActionMailer subjects by default.José Valim2009-11-011-3/+7
| |
| * More refactoring on ActionMailer::Base.José Valim2009-11-011-20/+23
| |
| * Make tests run without deprecation warning (just one left).José Valim2009-11-011-2/+2
| |
| * Another refactoring on AM. body is deprecated, use render instead.José Valim2009-11-013-109/+88
| |
| * Add some basic render_test to AbstractController.José Valim2009-11-011-5/+0
| |
| * Move all render and layout pieces required in ActionMailer from ↵José Valim2009-11-011-98/+70
| | | | | | | | ActionController to AbstractController.
| * Remove ActionMailer helpers and rely on AbstractController one.José Valim2009-11-013-131/+14
| |
| * Refactor ActionMailer layout and remove legacy one.José Valim2009-11-016-36/+31
| |
| * abstract all of the ActionMailer delivery methods into their own classes. ↵Matthew Rudy Jacobs2009-11-017-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é Valim2009-10-151-2/+2
| |
| * Revert "Rename Orchestra to Notifications [#3321 state:resolved]"José Valim2009-10-151-10/+10
| | | | | | | | This reverts commit 8cbf825425dc8ad3770881ea4e100b9023c69ce2.
| * 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-301-1/+1
|\|
| * Prefer tap to returningMatias Flores2009-09-281-1/+1
| | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3280 state:committed]
* | Merge commit 'mainstream/master'Pratik Naik2009-09-212-57/+64
|\|
| * Instrument create and deliver in ActionMailer.José Valim2009-09-201-56/+64
| |
| * Revert "Allow frameworks to be required by their gem name"Jeremy Kemper2009-09-121-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::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
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2438 state:committed]
* Default sent_on time to now in ActionMailerMatt Duncan2009-08-081-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 Katz2009-08-071-2/+2
|
* Replace _render_template_with_layout with _render_template since the layout ↵Yehuda Katz2009-08-071-2/+2
| | | | is optional
* Merge docrailsPratik Naik2009-07-251-1/+1
|
* Bump up the version to 3.0.preCarl Lerche2009-06-301-3/+3
|
* rm -r controller/base!Yehuda Katz + Carl Lerche2009-06-151-1/+1
|
* Keep ActionMailer using the old layouts code until it gets refactored.Yehuda Katz + Carl Lerche2009-06-151-1/+3
|
* Get tests to run (with failures) without old base aroundYehuda Katz + Carl Lerche2009-06-151-1/+3
|
* Simplify helper use of ActiveSupport::Dependencies, and use super better for ↵Yehuda Katz + Carl Lerche2009-06-101-8/+9
| | | | in #helpers
* 1.9 compatibility - don't pass an array as the from address as this ends up ↵Friedrich Göpel2009-06-091-1/+1
| | | | generating invalid SMTP commands.
* Prefer sibling action_controllerJeremy Kemper2009-06-051-10/+3
|
* Cherry-pick core extensionsJeremy Kemper2009-05-131-0/+1
|
* Fixes ActionMailer to work with the ActionView refactoringYehuda Katz + Carl Lerche2009-04-271-5/+6
|
* Refactor ActionView::PathYehuda Katz + Carl Lerche2009-04-222-23/+27
| | | | | | | | * Decouple from ActionController and ActionMailer * Bring back localization support. * Prepare to decouple templates from the filesystem. * Prepare to decouple localization from ActionView * Fix ActionMailer to take advantage of ActionView::Path
* Make more Template methods public to make ActionMailer tests passCarl Lerche & Yehuda Katz2009-04-161-1/+1
|
* Makes rails-dev-boost work againCarl Lerche & Yehuda Katz2009-04-141-1/+1
|
* Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-135-7/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
| * Prepare for final 2.3 releaseDavid Heinemeier Hansson2009-03-151-1/+1
| |
| * Allow custom type for multipart emails [#1691 state:resolved]Sean Dague2009-03-101-1/+1
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ruby 1.9 compat: rename deprecated assert_raises to assert_raise.Jeremy Kemper2009-03-081-1/+1
| | | | | | | | [#1617 state:resolved]
| * Removed the "charset" parameter from the Content-Type header of multipart ↵Elliott Wood2009-03-021-1/+4
| | | | | | | | | | | | | | sections of nested multipart messages. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2109 state:committed]
| * Prep for RC2 later todayDavid Heinemeier Hansson2009-02-271-1/+1
| |
| * Just require tmail instead of autoloading it to fix issues when using the gemMarcus Mateus2009-02-241-1/+2
| | | | | | | | | | version [#1851 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * load plugin view_paths to action_mailer view_paths and make action_mailer ↵Sven Fuchs2009-02-221-1/+3
| | | | | | | | | | | | use them [#2031 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 12:36:01 +0000