aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
Commit message (Collapse)AuthorAgeFilesLines
* Fixed up documentation to reflect code change and cleaned up tests of ↵Mikel Lindsaar2010-01-271-21/+19
| | | | spurious #deliver calls
* Fixed up being able to pass random headers in with headers, or mail. Also, ↵Mikel Lindsaar2010-01-271-11/+20
| | | | undeprecated headers(hash) as this works now too
* Make defaults accept a hash.José Valim and Mikel Lindsaar2010-01-261-37/+41
|
* Implementing class level :defaults hash, instead of delivers_from et alMikel Lindsaar2010-01-261-13/+26
|
* Merge remote branch 'mikel/master'José Valim2010-01-2616-598/+844
|\
| * Merge branch 'master' of github.com:mikel/railsJosé Valim and Mikel Lindsaar2010-01-261-9/+22
| |\
| | * Refactor content type setting, added tests to ensure boundary exists on ↵José Valim and Mikel Lindsaar2010-01-261-9/+22
| | | | | | | | | | | | multipart and fixed typo
| * | Remove old files, add some information to docs and improve test suite.José Valim and Mikel Lindsaar2010-01-261-14/+34
| |/
| * 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-251-98/+159
| |
| * Got AM working with Mail yield on delivery_handler and updated testsJosé Valim and Mikel Lindsaar2010-01-252-10/+3
| |
| * Added delivery_handler method to mail and implemented in ActionMailer to ↵José Valim and Mikel Lindsaar2010-01-252-3/+12
| | | | | | | | deliver inside of instrumentation
| * Added delivers_from.José Valim and Mikel Lindsaar2010-01-251-2/+12
| |
| * 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
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/mail_helper.rb railties/lib/rails/configuration.rb
| * | | Ensure implicit multipart templates with locale works as expected.José Valim and Mikel Lindsaar2010-01-241-0/+5
| |/ /
| * | Add tests to mail helper.José Valim and Mikel Lindsaar2010-01-242-3/+2
| | |
| * | Move old tests to a specific folder and add some delivery method tests.José Valim and Mikel Lindsaar2010-01-243-12/+16
| | |
| * | Handle some TODOs and deprecations.José Valim and Mikel Lindsaar2010-01-245-38/+41
| | |
| * | Finish cleaning up delivery methods implementation.José Valim and Mikel Lindsaar2010-01-242-70/+55
| | |
| * | 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-242-11/+32
| | |
| * | Some refactoring.José Valim and Mikel Lindsaar2010-01-244-164/+164
| | |
| * | Adding failing tests for calling just the action, instead of ↵José Valim and Mikel Lindsaar2010-01-241-1/+3
| | | | | | | | | | | | :create_action_name and :deliver_action_name
| * | Moving AS::Notifications call to one location in baseJosé Valim and Mikel Lindsaar2010-01-241-9/+7
| | |
| * | Delegated ActionMailer::Base.deliveries to Mail.deliveries, added callback ↵José Valim and Mikel Lindsaar2010-01-243-39/+51
| | | | | | | | | | | | support in Mail to call ActionMailer on delivery, moved deliver to deprecated API in preparation for new API
| * | Set sort order for explicit parts from the collector's template sequenceJosé Valim and Mikel Lindsaar2010-01-241-4/+8
| | |
| * | Add some tests to collector with templates and any.José Valim and Mikel Lindsaar2010-01-232-3/+2
| | |
| * | Make implicit and explicit templates pass through the same part creation ↵José Valim and Mikel Lindsaar2010-01-232-72/+79
| | | | | | | | | | | | process.
| * | Adding collector to ActionMailerJosé Valim and Mikel Lindsaar2010-01-231-0/+32
| | |
| * | Added basic explicit multipart rendering and testsJosé Valim and Mikel Lindsaar2010-01-233-8/+23
| | |
| * | Refactor subject with i18n.José Valim and Mikel Lindsaar2010-01-231-3/+7
| | |
| * | Get implicit multipart and attachments working together.José Valim and Mikel Lindsaar2010-01-222-22/+30
| | |
| * | First work on implicit multipart.José Valim and Mikel Lindsaar2010-01-221-24/+25
| | |
| * | Add basic template rendering to new DSL.José Valim and Mikel Lindsaar2010-01-223-28/+52
| | |
| * | Add more tests to new API.José Valim and Mikel Lindsaar2010-01-222-15/+25
| | |
| * | 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-226-149/+118
| | |
| * | Updating deprecated_body.rb to use :content instead of :data or :body in the ↵José Valim and Mikel Lindsaar2010-01-221-3/+8
| | | | | | | | | | | | params hash
| * | Added use of AS::Notifications for tmail_compat.rbJosé Valim and Mikel Lindsaar2010-01-221-3/+6
| | |
| * | Updating deprecated API to sanitize old style attachments hash to work with ↵José Valim and Mikel Lindsaar2010-01-221-10/+35
| | | | | | | | | | | | new mail.attachments method
| * | Adding tests for attachments['blah.rb'] = {} et alJosé Valim and Mikel Lindsaar2010-01-212-1/+16
| | |
| * | Mail method accepting all headers set via the hashJosé Valim and Mikel Lindsaar2010-01-211-2/+4
| | |
| * | Created mail method for new APIJosé Valim and Mikel Lindsaar2010-01-202-16/+47
| | |
| * | Moved old API into deprecated_api.rb in preparation for new Rails 3 Mailer APIJosé Valim and Mikel Lindsaar2010-01-204-153/+169
| | |
| * | Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-01-203-13/+14
| |\ \ | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb
| * | | Refactor delivery methods.José Valim2010-01-194-74/+89
| | | |
| * | | Get all tests passing.José Valim2010-01-191-6/+30
| | | |
| * | | First pass on fixing delivery methodMikel Lindsaar2010-01-191-8/+4
| | | |
| * | | latest updatesMikel Lindsaar2010-01-191-12/+10
| | | |