Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mikel/master' into mail | Jeremy Kemper | 2009-11-23 | 7 | -30/+37 |
|\ | | | | | | | | | Conflicts: actionmailer/lib/action_mailer.rb | ||||
| * | 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 |
| | | |||||
| * | 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 | 2 | -6/+10 |
| | | | | | | | | 'string' | ||||
| * | Removing utils, and updating requires to match | Mikel Lindsaar | 2009-11-23 | 4 | -20/+12 |
| | | |||||
* | | Add mail dep to AM gemspec | Jeremy Kemper | 2009-11-23 | 1 | -0/+1 |
| | | |||||
* | | Never require jcode | Jeremy Kemper | 2009-11-22 | 1 | -1/+0 |
| | | |||||
* | | Rely on gemspec and bundled env for gem dependency. We just require it. | Jeremy Kemper | 2009-11-22 | 1 | -2/+1 |
| | | |||||
* | | Merge commit 'origin/master' into mail | Jeremy Kemper | 2009-11-22 | 4 | -10/+16 |
|\ \ | |/ |/| | |||||
| * | Unify test:isolated across components and run by default at toplevel | Jeremy Kemper | 2009-11-10 | 1 | -5/+7 |
| | | |||||
| * | Be sure to invoke the super chain! And initialize response body. | Jeremy Kemper | 2009-11-10 | 1 | -0/+2 |
| | | |||||
| * | Enable warnings for mailer tests | Joshua Peek | 2009-11-09 | 1 | -1/+1 |
| | | |||||
| * | 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 | 2 | -3/+3 |
| | | |||||
* | | 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 | 8 | -65/+57 |
| | | |||||
* | | 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 | 3 | -13/+36 |
| | | |||||
* | | Down to 13 failures, 14 errors | Mikel Lindsaar | 2009-11-20 | 2 | -7/+14 |
| | | |||||
* | | Down to 30 failures total | Mikel Lindsaar | 2009-11-20 | 5 | -51/+97 |
| | | |||||
* | | More updates... 45 errors left to get it working with Mail gem | Mikel Lindsaar | 2009-11-20 | 9 | -72/+94 |
| | | |||||
* | | Starting again on actionmailer integration with mail | Mikel Lindsaar | 2009-11-12 | 44 | -8119/+186 |
|/ | |||||
* | 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 | 2 | -3/+22 |
| | |||||
* | 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 | 6 | -79/+110 |
| | |||||
* | Another refactoring on AM. body is deprecated, use render instead. | José Valim | 2009-11-01 | 4 | -115/+90 |
| | |||||
* | 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 | 2 | -99/+84 |
| | | | | ActionController to AbstractController. | ||||
* | Remove ActionMailer helpers and rely on AbstractController one. | José Valim | 2009-11-01 | 4 | -134/+21 |
| | |||||
* | 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 | 11 | -68/+193 |
| | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -17/+7 |
| | |||||
* | Add rackmount to actionmailer gemspec | Joshua Peek | 2009-10-20 | 1 | -0/+1 |
| | |||||
* | Missed Gemfile commits | Jeremy Kemper | 2009-10-19 | 1 | -0/+9 |
| | |||||
* | Need to use "use_controllers" for nonexistent controller in AM test | Joshua Peek | 2009-10-18 | 1 | -21/+23 |
| | |||||
* | We won't be publishing tars and zips anymore | Joshua Peek | 2009-10-16 | 1 | -4/+2 |
| | |||||
* | Merge branch 'master' into orchestra | Jeremy Kemper | 2009-10-15 | 1 | -1/+1 |
|\ | |||||
| * | Change config implementation in AV slightly | Yehuda Katz | 2009-10-15 | 1 | -1/+1 |
| | | |||||
* | | 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. | ||||
* | 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 |
| | |||||
* | 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 |
| | |||||
* | Mark html safety | Jeremy Kemper | 2009-10-09 | 1 | -1/+1 |
| | |||||
* | Prefer tap to returning | Matias Flores | 2009-09-28 | 1 | -1/+1 |
| | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3280 state:committed] |