Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rationalize railtie dependencies: AC uses AV; AR uses AMo; and Rails always ↵ | Jeremy Kemper | 2010-02-04 | 1 | -1/+1 |
| | | | | uses AS. | ||||
* | require 'action_controller' added on a test that uses it | Santiago Pastorino and José Ignacio Costa | 2010-02-04 | 1 | -0/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Homogenize gemspecs and remove the deprecated autorequire | David Heinemeier Hansson | 2010-02-03 | 1 | -16/+16 |
| | |||||
* | Move to 3.0.0.beta | David Heinemeier Hansson | 2010-02-03 | 2 | -3/+3 |
| | |||||
* | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-02-02 | 6 | -41/+29 |
|\ | |||||
| * | Make AM test suite green. | José Valim | 2010-02-01 | 2 | -2/+3 |
| | | |||||
| * | Convert to class_attribute | Jeremy Kemper | 2010-02-01 | 5 | -31/+25 |
| | | |||||
| * | Get rails tests running on bundler 0.9 | Carl Lerche | 2010-01-31 | 1 | -8/+1 |
| | | |||||
* | | Updating copyright dates on all licenses | Mikel Lindsaar | 2010-02-01 | 2 | -2/+2 |
|/ | |||||
* | Updating Action Mailer documentation | Mikel Lindsaar | 2010-01-31 | 3 | -45/+58 |
| | |||||
* | Add transfer_encoding= setter deprecation. | José Valim | 2010-01-30 | 2 | -1/+17 |
| | |||||
* | Fix some backward incompatible behavior on AM. | José Valim | 2010-01-30 | 1 | -0/+1 |
| | |||||
* | Automatically configure generators if application is defined. | José Valim | 2010-01-29 | 1 | -1/+3 |
| | |||||
* | ActionMailer should depend just on AbstractController. | José Valim | 2010-01-29 | 5 | -23/+33 |
| | |||||
* | Add a failing test case for render :layout | Mikel Lindsaar | 2010-01-29 | 6 | -0/+20 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Added tests for rendering different template for new API | Mikel Lindsaar | 2010-01-29 | 1 | -0/+14 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Rename 'defaults' class method to 'default' to reflect that it's a declaration | Jeremy Kemper | 2010-01-27 | 4 | -26/+26 |
| | |||||
* | Fix time comparison. Mail#date returns DateTime not Time. | Jeremy Kemper | 2010-01-27 | 1 | -1/+1 |
| | |||||
* | Expected attachment encoding is binary | Jeremy Kemper | 2010-01-27 | 1 | -2/+4 |
| | |||||
* | Remove unbundle changelogs | Jeremy Kemper | 2010-01-27 | 1 | -2/+0 |
| | |||||
* | Unvendor'd text-format, now requires text-format gem | Mikel Lindsaar | 2010-01-28 | 5 | -1478/+4 |
| | |||||
* | Updated mail requirement to 2.1.2 | Mikel Lindsaar | 2010-01-28 | 1 | -1/+1 |
| | |||||
* | Fixed bug on HTML only emails getting set to text/plain | Mikel Lindsaar | 2010-01-28 | 4 | -1/+21 |
| | |||||
* | 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 |