Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:mikel/rails | José Valim and Mikel Lindsaar | 2010-01-26 | 1 | -9/+22 |
|\ | |||||
| * | Refactor content type setting, added tests to ensure boundary exists on ↵ | José Valim and Mikel Lindsaar | 2010-01-26 | 1 | -9/+22 |
| | | | | | | | | multipart and fixed typo | ||||
* | | Remove old files, add some information to docs and improve test suite. | José Valim and Mikel Lindsaar | 2010-01-26 | 1 | -14/+34 |
|/ | |||||
* | We don't support enriched yet | José Valim and Mikel Lindsaar | 2010-01-26 | 1 | -1/+0 |
| | |||||
* | Added initial documentation for the new API | José Valim and Mikel Lindsaar | 2010-01-25 | 1 | -98/+159 |
| | |||||
* | Got AM working with Mail yield on delivery_handler and updated tests | José Valim and Mikel Lindsaar | 2010-01-25 | 1 | -8/+1 |
| | |||||
* | Added delivery_handler method to mail and implemented in ActionMailer to ↵ | José Valim and Mikel Lindsaar | 2010-01-25 | 1 | -2/+11 |
| | | | | deliver inside of instrumentation | ||||
* | Added delivers_from. | José Valim and Mikel Lindsaar | 2010-01-25 | 1 | -2/+12 |
| | |||||
* | Ensure implicit multipart templates with locale works as expected. | José Valim and Mikel Lindsaar | 2010-01-24 | 1 | -0/+5 |
| | |||||
* | Add tests to mail helper. | José Valim and Mikel Lindsaar | 2010-01-24 | 1 | -1/+0 |
| | |||||
* | Move old tests to a specific folder and add some delivery method tests. | José Valim and Mikel Lindsaar | 2010-01-24 | 1 | -9/+1 |
| | |||||
* | Handle some TODOs and deprecations. | José Valim and Mikel Lindsaar | 2010-01-24 | 1 | -19/+20 |
| | |||||
* | Finish cleaning up delivery methods implementation. | José Valim and Mikel Lindsaar | 2010-01-24 | 1 | -28/+1 |
| | |||||
* | Maintain old_api and deprecated_api in different files. | José Valim and Mikel Lindsaar | 2010-01-24 | 1 | -0/+1 |
| | |||||
* | Add new class delivery method API. | José Valim and Mikel Lindsaar | 2010-01-24 | 1 | -1/+17 |
| | |||||
* | Some refactoring. | José Valim and Mikel Lindsaar | 2010-01-24 | 1 | -71/+93 |
| | |||||
* | Adding failing tests for calling just the action, instead of ↵ | José Valim and Mikel Lindsaar | 2010-01-24 | 1 | -1/+3 |
| | | | | :create_action_name and :deliver_action_name | ||||
* | Delegated ActionMailer::Base.deliveries to Mail.deliveries, added callback ↵ | José Valim and Mikel Lindsaar | 2010-01-24 | 1 | -38/+18 |
| | | | | 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 sequence | José Valim and Mikel Lindsaar | 2010-01-24 | 1 | -4/+8 |
| | |||||
* | Add some tests to collector with templates and any. | José Valim and Mikel Lindsaar | 2010-01-23 | 1 | -1/+1 |
| | |||||
* | Make implicit and explicit templates pass through the same part creation ↵ | José Valim and Mikel Lindsaar | 2010-01-23 | 1 | -62/+64 |
| | | | | process. | ||||
* | Added basic explicit multipart rendering and tests | José Valim and Mikel Lindsaar | 2010-01-23 | 1 | -7/+21 |
| | |||||
* | Refactor subject with i18n. | José Valim and Mikel Lindsaar | 2010-01-23 | 1 | -3/+7 |
| | |||||
* | Get implicit multipart and attachments working together. | José Valim and Mikel Lindsaar | 2010-01-22 | 1 | -22/+28 |
| | |||||
* | First work on implicit multipart. | José Valim and Mikel Lindsaar | 2010-01-22 | 1 | -24/+25 |
| | |||||
* | Add basic template rendering to new DSL. | José Valim and Mikel Lindsaar | 2010-01-22 | 1 | -19/+50 |
| | |||||
* | Add more tests to new API. | José Valim and Mikel Lindsaar | 2010-01-22 | 1 | -14/+24 |
| | |||||
* | Move class methods to deprecated stuff. | José Valim and Mikel Lindsaar | 2010-01-22 | 1 | -47/+6 |
| | |||||
* | Moved deprecated_body.rb to deprecatead_api.rb | José Valim and Mikel Lindsaar | 2010-01-22 | 1 | -61/+0 |
| | |||||
* | Mail method accepting all headers set via the hash | José Valim and Mikel Lindsaar | 2010-01-21 | 1 | -2/+4 |
| | |||||
* | Created mail method for new API | José Valim and Mikel Lindsaar | 2010-01-20 | 1 | -14/+45 |
| | |||||
* | Moved old API into deprecated_api.rb in preparation for new Rails 3 Mailer API | José Valim and Mikel Lindsaar | 2010-01-20 | 1 | -153/+3 |
| | |||||
* | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-01-20 | 1 | -8/+9 |
|\ | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb | ||||
| * | Mail should log when raise_delivery_methods is false. | José Valim | 2010-01-19 | 1 | -6/+8 |
| | | |||||
* | | Refactor delivery methods. | José Valim | 2010-01-19 | 1 | -70/+11 |
| | | |||||
* | | Get all tests passing. | José Valim | 2010-01-19 | 1 | -6/+30 |
| | | |||||
* | | First pass on fixing delivery method | Mikel Lindsaar | 2010-01-19 | 1 | -8/+4 |
| | | |||||
* | | latest updates | Mikel Lindsaar | 2010-01-19 | 1 | -12/+10 |
| | | |||||
* | | Merge branch 'master' of git://github.com/rails/rails into rails | Mikel Lindsaar | 2010-01-19 | 1 | -5/+38 |
|\| | |||||
| * | Bring render_message back for 2.3 compatibility. | José Valim | 2010-01-19 | 1 | -11/+31 |
| | | |||||
| * | Bring body(Hash) behavior back. | José Valim | 2010-01-19 | 1 | -2/+15 |
| | | |||||
| * | Merge docrails | Pratik Naik | 2010-01-17 | 1 | -1/+1 |
| | | |||||
* | | Fixing up base to refactor settings | Mikel Lindsaar | 2010-01-17 | 1 | -43/+27 |
| | | |||||
* | | Migrated over to Mail doing delivery. | Mikel Lindsaar | 2010-01-16 | 1 | -22/+65 |
|/ | |||||
* | Remove URI object from ActiveResource notification, send the :mailer class ↵ | José Valim | 2010-01-15 | 1 | -1/+1 |
| | | | | in AM (like in AP#process_action) and remove locale instrumentation. | ||||
* | Add message_id to AM payload and don't send bcc and cc if they were not sent. | José Valim | 2010-01-15 | 1 | -9/+8 |
| | |||||
* | Ensure we just send Ruby Stdlib objects in ActionMailer notifications. | José Valim | 2010-01-15 | 1 | -4/+19 |
| | |||||
* | Add subscriber to ActionMailer. | José Valim | 2010-01-14 | 1 | -11/+8 |
| | |||||
* | Mailer should give self as payload because it contains all the information ↵ | José Valim | 2010-01-08 | 1 | -1/+1 |
| | | | | needed (as the template rendered and the mailer name). | ||||
* | Remove duplicated url_for code and move methods shared between ActionMailer ↵ | José Valim | 2010-01-07 | 1 | -2/+1 |
| | | | | and ActionController up to AbstractController. |