Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adding :transfer_encoding -> :content_transfer_encoding as part of TmailCompat | Mikel Lindsaar | 2009-12-31 | 1 | -0/+9 |
| | |||||
* | Adding TMailCompat layer for :set_content_type and friends | Mikel Lindsaar | 2009-12-30 | 1 | -0/+14 |
| | |||||
* | Merge branch 'master' of git://github.com/mikel/rails into mail | Jeremy Kemper | 2009-12-29 | 11 | -112/+178 |
|\ | | | | | | | | | Conflicts: actionmailer/lib/action_mailer.rb | ||||
| * | Adding default 8bit encoding if the body has non usascii in it | Mikel Lindsaar | 2009-12-28 | 1 | -1/+1 |
| | | |||||
| * | Moved sort_parts into Mail, updated mail requirement to 1.4.2 | Mikel Lindsaar | 2009-12-28 | 1 | -7/+5 |
| | | |||||
| * | 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 | 4 | -26/+55 |
| |\ | |||||
| | * | adv_attr_accessors in ActionMailer are not sent to the views, use the mailer ↵ | José Valim | 2009-12-25 | 2 | -11/+46 |
| | | | | | | | | | | | | object if you need to access the subject, recipients, from, etc. | ||||
| | * | Make ActionMailer::Base inherit from AbstractController::Base | José Valim | 2009-12-22 | 2 | -5/+7 |
| | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| * | | Changing body to use :to_s instead of :decoded... better use case | Mikel Lindsaar | 2009-12-27 | 6 | -38/+38 |
| | | | |||||
| * | | Updating actionmailer to call :to_s on all field values instead of decoded | Mikel Lindsaar | 2009-12-27 | 1 | -8/+8 |
| | | | |||||
| * | | Merged in latest changes from rails/master | Mikel Lindsaar | 2009-12-17 | 1 | -1/+1 |
| | | | |||||
| * | | Fixes for working with 1.9.1-head | Mikel Lindsaar | 2009-12-17 | 2 | -3/+9 |
| | | | |||||
| * | | Merge branch 'rails' | Mikel Lindsaar | 2009-12-17 | 3 | -27/+58 |
| |\| | | | | | | | | | | | | | | | | 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 | -5/+2 |
| | | | | | | | | | | | | adding any to the load path more than once. | ||||
| | * | Define a welcome controller in mailer tests | Joshua Peek | 2009-11-29 | 1 | -22/+22 |
| | | | |||||
| | * | avoid generating invalid SMTP commands in ruby pre 1.9 | Michael Koziarski | 2009-11-28 | 1 | -0/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+4 |
| |\| | |||||
* | | | Merge commit 'mikel/master' into mail | Jeremy Kemper | 2009-11-23 | 2 | -8/+18 |
|\| | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer.rb | ||||
| * | | Fixed up incompatible encoding problem for Ruby 1.9 in test suite | Mikel Lindsaar | 2009-11-23 | 2 | -3/+13 |
| | | | |||||
| * | | Deprecating attachment :body => 'string' in favour of attachment :data => ↵ | Mikel Lindsaar | 2009-11-23 | 1 | -5/+5 |
| | | | | | | | | | | | | 'string' | ||||
* | | | Never require jcode | Jeremy Kemper | 2009-11-22 | 1 | -1/+0 |
| | | | |||||
* | | | Merge commit 'origin/master' into mail | Jeremy Kemper | 2009-11-22 | 2 | -2/+4 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Avoid adding component lib/ to load path multiple times | Joshua Peek | 2009-11-09 | 1 | -1/+3 |
| | | |||||
| * | Change mailer subjects lookup. | José Valim | 2009-11-09 | 1 | -1/+1 |
| | | |||||
* | | 131 tests, 309 assertions, 0 failures, 0 errors | Mikel Lindsaar | 2009-11-22 | 3 | -38/+47 |
| | | |||||
* | | Updating tests for Mail gem | Mikel Lindsaar | 2009-11-22 | 2 | -2/+2 |
| | | |||||
* | | 131 tests, 266 assertions, 9 failures, 6 errors | Mikel Lindsaar | 2009-11-21 | 2 | -13/+13 |
| | | |||||
* | | Down to 13 failures, 14 errors | Mikel Lindsaar | 2009-11-20 | 1 | -6/+13 |
| | | |||||
* | | Down to 30 failures total | Mikel Lindsaar | 2009-11-20 | 4 | -46/+92 |
| | | |||||
* | | More updates... 45 errors left to get it working with Mail gem | Mikel Lindsaar | 2009-11-20 | 6 | -48/+62 |
| | | |||||
* | | Starting again on actionmailer integration with mail | Mikel Lindsaar | 2009-11-12 | 9 | -80/+112 |
|/ | |||||
* | Use I18n on ActionMailer subjects by default. | José Valim | 2009-11-01 | 1 | -0/+15 |
| | |||||
* | Make tests run without deprecation warning (just one left). | José Valim | 2009-11-01 | 5 | -77/+108 |
| | |||||
* | Another refactoring on AM. body is deprecated, use render instead. | José Valim | 2009-11-01 | 1 | -6/+2 |
| | |||||
* | Move all render and layout pieces required in ActionMailer from ↵ | José Valim | 2009-11-01 | 1 | -1/+14 |
| | | | | ActionController to AbstractController. | ||||
* | Remove ActionMailer helpers and rely on AbstractController one. | José Valim | 2009-11-01 | 1 | -3/+7 |
| | |||||
* | abstract all of the ActionMailer delivery methods into their own classes. ↵ | Matthew Rudy Jacobs | 2009-11-01 | 3 | -6/+34 |
| | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
* | Have all the tests running off a single Gemfile | Yehuda Katz + Carl Lerche | 2009-10-20 | 1 | -7/+7 |
| | |||||
* | Need to use "use_controllers" for nonexistent controller in AM test | Joshua Peek | 2009-10-18 | 1 | -21/+23 |
| | |||||
* | Change config implementation in AV slightly | Yehuda Katz | 2009-10-15 | 1 | -1/+1 |
| | |||||
* | Fix AM tests by configuring AV | Jeremy Kemper | 2009-10-15 | 1 | -0/+2 |
| | |||||
* | Don't push siblings on load path if using bundled env | Jeremy Kemper | 2009-10-14 | 1 | -2/+8 |
| | |||||
* | Mark html safety | Jeremy Kemper | 2009-10-09 | 1 | -1/+1 |
| | |||||
* | Get rid of parenthesize argument warnings | Pratik Naik | 2009-08-09 | 1 | -5/+5 |
| | |||||
* | Adds a :file delivery_method to save email to a file on disk | Eric Davis | 2009-08-08 | 2 | -0/+34 |
| | | | | | 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 | -2/+3 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2607 state:committed] | ||||
* | Replace _render_template_with_layout with _render_template since the layout ↵ | Yehuda Katz | 2009-08-07 | 1 | -4/+6 |
| | | | | is optional | ||||
* | Move mocha down below initial T::U require and bump version to 0.9.7 [#2858 ↵ | Yehuda Katz + Carl Lerche | 2009-07-01 | 1 | -3/+0 |
| | | | | state:resolved] | ||||
* | Fix failing CI test (broken in 2daac47 or e693f45): make ↵ | Chad Woolley | 2009-05-27 | 2 | -5/+6 |
| | | | | | | test_multipart_with_template_path_with_dots only test path with dots, and stop failing on unrelated mimetype assertion. The image/jpeg multipart content type is already tested in test_explicitly_multipart_messages. Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local> |