Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bring AM tests back to green again. | José Valim | 2010-01-26 | 3 | -17/+3 |
| | |||||
* | Fix failing tests on AM about render(:body => Hash). | José Valim | 2010-01-26 | 6 | -68/+36 |
| | |||||
* | Merge branch 'master' of git://github.com/rails/rails | José Valim | 2010-01-26 | 6 | -2/+58 |
|\ | |||||
| * | Failing AM test for legacy multipart alternative rendering | Joshua Peek | 2010-01-26 | 3 | -0/+39 |
| | | |||||
| * | Failing AM test for nested layouts | Joshua Peek | 2010-01-26 | 3 | -2/+19 |
| | | |||||
* | | Also include translation in ActionMailer. | José Valim | 2010-01-26 | 1 | -0/+1 |
|/ | |||||
* | Tidy up tests and docs. | José Valim and Mikel Lindsaar | 2010-01-26 | 2 | -20/+21 |
| | |||||
* | Fixing up tests and docs to use defaults :from => 'name' instead of ↵ | Mikel Lindsaar | 2010-01-27 | 2 | -4/+5 |
| | | | | defaults({:from => 'name'}) | ||||
* | Merge branch 'master' of github.com:mikel/rails | Mikel Lindsaar | 2010-01-27 | 4 | -26/+43 |
|\ | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb | ||||
| * | Deprecate old defaults API. | José Valim and Mikel Lindsaar | 2010-01-26 | 4 | -32/+43 |
| | | |||||
* | | Fixed up documentation to reflect code change and cleaned up tests of ↵ | Mikel Lindsaar | 2010-01-27 | 2 | -59/+58 |
| | | | | | | | | spurious #deliver calls | ||||
* | | Fixed up being able to pass random headers in with headers, or mail. Also, ↵ | Mikel Lindsaar | 2010-01-27 | 2 | -16/+50 |
|/ | | | | undeprecated headers(hash) as this works now too | ||||
* | Make defaults accept a hash. | José Valim and Mikel Lindsaar | 2010-01-26 | 2 | -79/+84 |
| | |||||
* | Fixing up expectations in base_test.rb | Mikel Lindsaar | 2010-01-26 | 1 | -10/+10 |
| | |||||
* | Implementing class level :defaults hash, instead of delivers_from et al | Mikel Lindsaar | 2010-01-26 | 2 | -16/+49 |
| | |||||
* | Merge remote branch 'mikel/master' | José Valim | 2010-01-26 | 52 | -1086/+1736 |
|\ | |||||
| * | Fix small typo. | José Valim and Mikel Lindsaar | 2010-01-26 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of github.com:mikel/rails | José Valim and Mikel Lindsaar | 2010-01-26 | 2 | -18/+36 |
| |\ | |||||
| | * | Refactor content type setting, added tests to ensure boundary exists on ↵ | José Valim and Mikel Lindsaar | 2010-01-26 | 2 | -18/+36 |
| | | | | | | | | | | | | multipart and fixed typo | ||||
| * | | Remove old files, add some information to docs and improve test suite. | José Valim and Mikel Lindsaar | 2010-01-26 | 4 | -38/+58 |
| |/ | |||||
| * | 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 | 3 | -119/+202 |
| | | |||||
| * | Updated to mail 2.1.1 | José Valim and Mikel Lindsaar | 2010-01-25 | 1 | -1/+1 |
| | | |||||
| * | Updated gemspec for Mail | José Valim and Mikel Lindsaar | 2010-01-25 | 1 | -1/+1 |
| | | |||||
| * | Got AM working with Mail yield on delivery_handler and updated tests | José Valim and Mikel Lindsaar | 2010-01-25 | 7 | -13/+23 |
| | | |||||
| * | changed test to get TestMailer to use :file delivery method directly (as ↵ | José Valim and Mikel Lindsaar | 2010-01-25 | 1 | -3/+3 |
| | | | | | | | | setup action was resetting delivery_method to :test on init | ||||
| * | Added delivery_handler method to mail and implemented in ActionMailer to ↵ | José Valim and Mikel Lindsaar | 2010-01-25 | 4 | -9/+43 |
| | | | | | | | | deliver inside of instrumentation | ||||
| * | Added delivers_from. | José Valim and Mikel Lindsaar | 2010-01-25 | 2 | -5/+18 |
| | | |||||
| * | Add some view paths tests. | José Valim and Mikel Lindsaar | 2010-01-25 | 2 | -23/+43 |
| | | |||||
| * | Merge branch 'master' of github.com:mikel/rails | José Valim and Mikel Lindsaar | 2010-01-24 | 1 | -7/+1 |
| |\ | |||||
| | * | Merge branch 'master' of git://github.com/rails/rails | José Valim and Mikel Lindsaar | 2010-01-25 | 1 | -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 Lindsaar | 2010-01-24 | 6 | -0/+36 |
| |/ / | |||||
| * | | Add tests to mail helper. | José Valim and Mikel Lindsaar | 2010-01-24 | 11 | -141/+86 |
| | | | |||||
| * | | Move old tests to a specific folder and add some delivery method tests. | José Valim and Mikel Lindsaar | 2010-01-24 | 16 | -73/+131 |
| | | | |||||
| * | | Handle some TODOs and deprecations. | José Valim and Mikel Lindsaar | 2010-01-24 | 6 | -40/+45 |
| | | | |||||
| * | | Finish cleaning up delivery methods implementation. | José Valim and Mikel Lindsaar | 2010-01-24 | 4 | -82/+66 |
| | | | |||||
| * | | Maintain old_api and deprecated_api in different files. | José Valim and Mikel Lindsaar | 2010-01-24 | 4 | -243/+261 |
| | | | |||||
| * | | Add new class delivery method API. | José Valim and Mikel Lindsaar | 2010-01-24 | 12 | -271/+259 |
| | | | |||||
| * | | Some refactoring. | José Valim and Mikel Lindsaar | 2010-01-24 | 4 | -164/+164 |
| | | | |||||
| * | | Adding failing tests for calling just the action, instead of ↵ | José Valim and Mikel Lindsaar | 2010-01-24 | 2 | -2/+18 |
| | | | | | | | | | | | | :create_action_name and :deliver_action_name | ||||
| * | | Moving AS::Notifications call to one location in base | José Valim and Mikel Lindsaar | 2010-01-24 | 2 | -14/+9 |
| | | | |||||
| * | | Delegated ActionMailer::Base.deliveries to Mail.deliveries, added callback ↵ | José Valim and Mikel Lindsaar | 2010-01-24 | 11 | -49/+70 |
| | | | | | | | | | | | | 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 | 2 | -14/+17 |
| | | | |||||
| * | | Add some tests to collector with templates and any. | José Valim and Mikel Lindsaar | 2010-01-23 | 5 | -14/+50 |
| | | | |||||
| * | | Make implicit and explicit templates pass through the same part creation ↵ | José Valim and Mikel Lindsaar | 2010-01-23 | 3 | -84/+104 |
| | | | | | | | | | | | | process. | ||||
| * | | Adding collector to ActionMailer | José Valim and Mikel Lindsaar | 2010-01-23 | 1 | -0/+32 |
| | | | |||||
| * | | Added basic explicit multipart rendering and tests | José Valim and Mikel Lindsaar | 2010-01-23 | 4 | -19/+79 |
| | | | |||||
| * | | Refactor subject with i18n. | José Valim and Mikel Lindsaar | 2010-01-23 | 1 | -3/+7 |
| | | | |||||
| * | | Updated Gemspec to mail 2.0.3 from gemcutter | Mikel Lindsaar | 2010-01-23 | 1 | -1/+1 |
| | | | |||||
| * | | Get implicit multipart and attachments working together. | José Valim and Mikel Lindsaar | 2010-01-22 | 4 | -40/+109 |
| | | |