Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| | * | Fix failing tests after merge. | José Valim | 2010-01-24 | 1 | -1/+1 |
| | | | |||||
| | * | Rename plugin_name to railtie_name and engine_name. | José Valim | 2010-01-24 | 1 | -1/+1 |
| | | | |||||
| | * | Moved more configuration away from bootstrap. | José Valim | 2010-01-22 | 1 | -5/+0 |
| | | | |||||
| | * | Add view paths to Engine setup. | José Valim | 2010-01-22 | 1 | -2/+1 |
| | | | |||||
* | | | 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 | 2 | -3/+2 |
| | | |||||
* | | Move old tests to a specific folder and add some delivery method tests. | José Valim and Mikel Lindsaar | 2010-01-24 | 3 | -12/+16 |
| | | |||||
* | | Handle some TODOs and deprecations. | José Valim and Mikel Lindsaar | 2010-01-24 | 5 | -38/+41 |
| | | |||||
* | | Finish cleaning up delivery methods implementation. | José Valim and Mikel Lindsaar | 2010-01-24 | 2 | -70/+55 |
| | | |||||
* | | 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 | 2 | -11/+32 |
| | | |||||
* | | 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 | 1 | -1/+3 |
| | | | | | | | | :create_action_name and :deliver_action_name | ||||
* | | Moving AS::Notifications call to one location in base | José Valim and Mikel Lindsaar | 2010-01-24 | 1 | -9/+7 |
| | | |||||
* | | Delegated ActionMailer::Base.deliveries to Mail.deliveries, added callback ↵ | José Valim and Mikel Lindsaar | 2010-01-24 | 3 | -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 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 | 2 | -3/+2 |
| | | |||||
* | | Make implicit and explicit templates pass through the same part creation ↵ | José Valim and Mikel Lindsaar | 2010-01-23 | 2 | -72/+79 |
| | | | | | | | | 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 | 3 | -8/+23 |
| | | |||||
* | | 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 | 2 | -22/+30 |
| | | |||||
* | | 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 | 3 | -28/+52 |
| | | |||||
* | | Add more tests to new API. | José Valim and Mikel Lindsaar | 2010-01-22 | 2 | -15/+25 |
| | | |||||
* | | Move class methods to deprecated stuff. | José Valim and Mikel Lindsaar | 2010-01-22 | 2 | -47/+54 |
| | | |||||
* | | Moved deprecated_body.rb to deprecatead_api.rb | José Valim and Mikel Lindsaar | 2010-01-22 | 6 | -149/+118 |
| | | |||||
* | | Updating deprecated_body.rb to use :content instead of :data or :body in the ↵ | José Valim and Mikel Lindsaar | 2010-01-22 | 1 | -3/+8 |
| | | | | | | | | params hash | ||||
* | | Added use of AS::Notifications for tmail_compat.rb | José Valim and Mikel Lindsaar | 2010-01-22 | 1 | -3/+6 |
| | | |||||
* | | Updating deprecated API to sanitize old style attachments hash to work with ↵ | José Valim and Mikel Lindsaar | 2010-01-22 | 1 | -10/+35 |
| | | | | | | | | new mail.attachments method | ||||
* | | Adding tests for attachments['blah.rb'] = {} et al | José Valim and Mikel Lindsaar | 2010-01-21 | 2 | -1/+16 |
| | | |||||
* | | 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 | 2 | -16/+47 |
| | | |||||
* | | Moved old API into deprecated_api.rb in preparation for new Rails 3 Mailer API | José Valim and Mikel Lindsaar | 2010-01-20 | 4 | -153/+169 |
| | | |||||
* | | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-01-20 | 3 | -13/+14 |
|\| | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb | ||||
| * | Mail should log when raise_delivery_methods is false. | José Valim | 2010-01-19 | 2 | -10/+12 |
| | | |||||
| * | Get rid of RAILS_ROOT deprecation on AM::TestCase. | José Valim | 2010-01-19 | 1 | -1/+1 |
| | | |||||
* | | Refactor delivery methods. | José Valim | 2010-01-19 | 4 | -74/+89 |
| | | |||||
* | | 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 | 2 | -27/+54 |
|\| | |||||
| * | 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 | 2 | -24/+31 |
| | | |||||
| * | Merge docrails | Pratik Naik | 2010-01-17 | 1 | -1/+1 |
| | | |||||
* | | Fixing up base to refactor settings | Mikel Lindsaar | 2010-01-17 | 1 | -43/+27 |
| | | |||||
* | | Removed autoload of DeliveryMethods | Mikel Lindsaar | 2010-01-16 | 1 | -1/+0 |
| | | |||||
* | | Migrated over to Mail doing delivery. | Mikel Lindsaar | 2010-01-16 | 1 | -22/+65 |
| | |