aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' of github.com:mikel/railsMikel Lindsaar2010-01-274-26/+43
|\
| * Deprecate old defaults API.José Valim and Mikel Lindsaar2010-01-264-32/+43
* | Fixed up documentation to reflect code change and cleaned up tests of spuriou...Mikel Lindsaar2010-01-272-59/+58
* | Fixed up being able to pass random headers in with headers, or mail. Also, u...Mikel Lindsaar2010-01-272-16/+50
|/
* Make defaults accept a hash.José Valim and Mikel Lindsaar2010-01-262-79/+84
* Fixing up expectations in base_test.rbMikel Lindsaar2010-01-261-10/+10
* Implementing class level :defaults hash, instead of delivers_from et alMikel Lindsaar2010-01-262-16/+49
* Merge remote branch 'mikel/master'José Valim2010-01-2652-1086/+1736
|\
| * Fix small typo.José Valim and Mikel Lindsaar2010-01-261-1/+1
| * Merge branch 'master' of github.com:mikel/railsJosé Valim and Mikel Lindsaar2010-01-262-18/+36
| |\
| | * Refactor content type setting, added tests to ensure boundary exists on multi...José Valim and Mikel Lindsaar2010-01-262-18/+36
| * | Remove old files, add some information to docs and improve test suite.José Valim and Mikel Lindsaar2010-01-264-38/+58
| |/
| * We don't support enriched yetJosé Valim and Mikel Lindsaar2010-01-261-1/+0
| * Added initial documentation for the new APIJosé Valim and Mikel Lindsaar2010-01-253-119/+202
| * Updated to mail 2.1.1José Valim and Mikel Lindsaar2010-01-251-1/+1
| * Updated gemspec for MailJosé Valim and Mikel Lindsaar2010-01-251-1/+1
| * Got AM working with Mail yield on delivery_handler and updated testsJosé Valim and Mikel Lindsaar2010-01-257-13/+23
| * changed test to get TestMailer to use :file delivery method directly (as setu...José Valim and Mikel Lindsaar2010-01-251-3/+3
| * Added delivery_handler method to mail and implemented in ActionMailer to deli...José Valim and Mikel Lindsaar2010-01-254-9/+43
| * Added delivers_from.José Valim and Mikel Lindsaar2010-01-252-5/+18
| * Add some view paths tests.José Valim and Mikel Lindsaar2010-01-252-23/+43
| * Merge branch 'master' of github.com:mikel/railsJosé Valim and Mikel Lindsaar2010-01-241-7/+1
| |\
| | * Merge branch 'master' of git://github.com/rails/railsJosé Valim and Mikel Lindsaar2010-01-251-7/+1
| | |\
| * | | Ensure implicit multipart templates with locale works as expected.José Valim and Mikel Lindsaar2010-01-246-0/+36
| |/ /
| * | Add tests to mail helper.José Valim and Mikel Lindsaar2010-01-2411-141/+86
| * | Move old tests to a specific folder and add some delivery method tests.José Valim and Mikel Lindsaar2010-01-2416-73/+131
| * | Handle some TODOs and deprecations.José Valim and Mikel Lindsaar2010-01-246-40/+45
| * | Finish cleaning up delivery methods implementation.José Valim and Mikel Lindsaar2010-01-244-82/+66
| * | Maintain old_api and deprecated_api in different files.José Valim and Mikel Lindsaar2010-01-244-243/+261
| * | Add new class delivery method API.José Valim and Mikel Lindsaar2010-01-2412-271/+259
| * | Some refactoring.José Valim and Mikel Lindsaar2010-01-244-164/+164
| * | Adding failing tests for calling just the action, instead of :create_action_n...José Valim and Mikel Lindsaar2010-01-242-2/+18
| * | Moving AS::Notifications call to one location in baseJosé Valim and Mikel Lindsaar2010-01-242-14/+9
| * | Delegated ActionMailer::Base.deliveries to Mail.deliveries, added callback su...José Valim and Mikel Lindsaar2010-01-2411-49/+70
| * | Set sort order for explicit parts from the collector's template sequenceJosé Valim and Mikel Lindsaar2010-01-242-14/+17
| * | Add some tests to collector with templates and any.José Valim and Mikel Lindsaar2010-01-235-14/+50
| * | Make implicit and explicit templates pass through the same part creation proc...José Valim and Mikel Lindsaar2010-01-233-84/+104
| * | Adding collector to ActionMailerJosé Valim and Mikel Lindsaar2010-01-231-0/+32
| * | Added basic explicit multipart rendering and testsJosé Valim and Mikel Lindsaar2010-01-234-19/+79
| * | Refactor subject with i18n.José Valim and Mikel Lindsaar2010-01-231-3/+7
| * | Updated Gemspec to mail 2.0.3 from gemcutterMikel Lindsaar2010-01-231-1/+1
| * | Get implicit multipart and attachments working together.José Valim and Mikel Lindsaar2010-01-224-40/+109
| * | First work on implicit multipart.José Valim and Mikel Lindsaar2010-01-224-25/+44
| * | Add basic template rendering to new DSL.José Valim and Mikel Lindsaar2010-01-227-70/+88
| * | Add more tests to new API.José Valim and Mikel Lindsaar2010-01-223-48/+107
| * | Move class methods to deprecated stuff.José Valim and Mikel Lindsaar2010-01-222-47/+54
| * | Moved deprecated_body.rb to deprecatead_api.rbJosé Valim and Mikel Lindsaar2010-01-227-161/+118
| * | Merge branch 'master' of git://github.com/rails/railsJosé Valim and Mikel Lindsaar2010-01-221-11/+2
| |\ \
| * | | Updating deprecated_body.rb to use :content instead of :data or :body in the ...José Valim and Mikel Lindsaar2010-01-221-3/+8
| * | | Added use of AS::Notifications for tmail_compat.rbJosé Valim and Mikel Lindsaar2010-01-222-5/+6