| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-02-02 | 3 | -15/+11 | |
| |\ | ||||||
| | * | Convert to class_attribute | Jeremy Kemper | 2010-02-01 | 3 | -15/+11 | |
| | | | ||||||
| * | | Updating copyright dates on all licenses | Mikel Lindsaar | 2010-02-01 | 1 | -1/+1 | |
| |/ | ||||||
| * | Updating Action Mailer documentation | Mikel Lindsaar | 2010-01-31 | 3 | -45/+58 | |
| | | ||||||
| * | Add transfer_encoding= setter deprecation. | José Valim | 2010-01-30 | 1 | -1/+7 | |
| | | ||||||
| * | Fix some backward incompatible behavior on AM. | José Valim | 2010-01-30 | 1 | -0/+1 | |
| | | ||||||
| * | ActionMailer should depend just on AbstractController. | José Valim | 2010-01-29 | 3 | -7/+13 | |
| | | ||||||
| * | Rename 'defaults' class method to 'default' to reflect that it's a declaration | Jeremy Kemper | 2010-01-27 | 3 | -21/+21 | |
| | | ||||||
| * | Unvendor'd text-format, now requires text-format gem | Mikel Lindsaar | 2010-01-28 | 3 | -1478/+1 | |
| | | ||||||
| * | Fixed bug on HTML only emails getting set to text/plain | Mikel Lindsaar | 2010-01-28 | 1 | -1/+1 | |
| | | ||||||
| * | Fix failing tests on AM about render(:body => Hash). | José Valim | 2010-01-26 | 2 | -8/+6 | |
| | | ||||||
| * | 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 | 1 | -2/+2 | |
| | | ||||||
| * | Fixing up tests and docs to use defaults :from => 'name' instead of ↵ | Mikel Lindsaar | 2010-01-27 | 1 | -1/+2 | |
| | | | | | 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 | 1 | -21/+19 | |
| | | | | | | | | | spurious #deliver calls | |||||
| * | | Fixed up being able to pass random headers in with headers, or mail. Also, ↵ | Mikel Lindsaar | 2010-01-27 | 1 | -11/+20 | |
| |/ | | | | undeprecated headers(hash) as this works now too | |||||
| * | Make defaults accept a hash. | José Valim and Mikel Lindsaar | 2010-01-26 | 1 | -37/+41 | |
| | | ||||||
| * | Implementing class level :defaults hash, instead of delivers_from et al | Mikel Lindsaar | 2010-01-26 | 1 | -13/+26 | |
| | | ||||||
| * | Merge remote branch 'mikel/master' | José Valim | 2010-01-26 | 16 | -598/+844 | |
| |\ | ||||||
| | * | 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 | 2 | -10/+3 | |
| | | | ||||||
| | * | Added delivery_handler method to mail and implemented in ActionMailer to ↵ | José Valim and Mikel Lindsaar | 2010-01-25 | 2 | -3/+12 | |
| | | | | | | | | | deliver inside of instrumentation | |||||
| | * | Added delivers_from. | José Valim and Mikel Lindsaar | 2010-01-25 | 1 | -2/+12 | |
| | | | ||||||
| | * | 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 | 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 | |
| | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |