aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
Commit message (Collapse)AuthorAgeFilesLines
* fix usage examples and more to use new invocationsRomD2010-02-061-1/+1
| | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
* Fix tiny version number from '3.0.0beta' to '3.0.0.beta1', so 'rake install' ↵Prem Sichanugrist2010-02-061-1/+1
| | | | | | will be run correctly [#3879 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* install ActionController::UrlFor before environment is parsed, to provide ↵Paul Rosania2010-02-051-5/+5
| | | | | | ActionMailer#default_url_options= Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Rationalize railtie dependencies: AC uses AV; AR uses AMo; and Rails always ↵Jeremy Kemper2010-02-041-1/+1
| | | | uses AS.
* Move to 3.0.0.betaDavid Heinemeier Hansson2010-02-031-1/+1
|
* Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-02-023-15/+11
|\
| * Convert to class_attributeJeremy Kemper2010-02-013-15/+11
| |
* | Updating copyright dates on all licensesMikel Lindsaar2010-02-011-1/+1
|/
* Updating Action Mailer documentationMikel Lindsaar2010-01-313-45/+58
|
* Add transfer_encoding= setter deprecation.José Valim2010-01-301-1/+7
|
* Fix some backward incompatible behavior on AM.José Valim2010-01-301-0/+1
|
* ActionMailer should depend just on AbstractController.José Valim2010-01-293-7/+13
|
* Rename 'defaults' class method to 'default' to reflect that it's a declarationJeremy Kemper2010-01-273-21/+21
|
* Unvendor'd text-format, now requires text-format gemMikel Lindsaar2010-01-283-1478/+1
|
* Fixed bug on HTML only emails getting set to text/plainMikel Lindsaar2010-01-281-1/+1
|
* Fix failing tests on AM about render(:body => Hash).José Valim2010-01-262-8/+6
|
* Also include translation in ActionMailer.José Valim2010-01-261-0/+1
|
* Tidy up tests and docs.José Valim and Mikel Lindsaar2010-01-261-2/+2
|
* Fixing up tests and docs to use defaults :from => 'name' instead of ↵Mikel Lindsaar2010-01-271-1/+2
| | | | defaults({:from => 'name'})
* Merge branch 'master' of github.com:mikel/railsMikel Lindsaar2010-01-274-26/+43
|\ | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb
| * Deprecate old defaults API.José Valim and Mikel Lindsaar2010-01-264-32/+43
| |
* | Fixed up documentation to reflect code change and cleaned up tests of ↵Mikel Lindsaar2010-01-271-21/+19
| | | | | | | | spurious #deliver calls
* | Fixed up being able to pass random headers in with headers, or mail. Also, ↵Mikel Lindsaar2010-01-271-11/+20
|/ | | | undeprecated headers(hash) as this works now too
* Make defaults accept a hash.José Valim and Mikel Lindsaar2010-01-261-37/+41
|
* Implementing class level :defaults hash, instead of delivers_from et alMikel Lindsaar2010-01-261-13/+26
|
* Merge remote branch 'mikel/master'José Valim2010-01-2616-598/+844
|\
| * Merge branch 'master' of github.com:mikel/railsJosé Valim and Mikel Lindsaar2010-01-261-9/+22
| |\
| | * Refactor content type setting, added tests to ensure boundary exists on ↵José Valim and Mikel Lindsaar2010-01-261-9/+22
| | | | | | | | | | | | multipart and fixed typo
| * | Remove old files, add some information to docs and improve test suite.José Valim and Mikel Lindsaar2010-01-261-14/+34
| |/
| * We don't support enriched yetJosé Valim and Mikel Lindsaar2010-01-261-1/+0
| |
| * Added initial documentation for the new APIJosé Valim and Mikel Lindsaar2010-01-251-98/+159
| |
| * Got AM working with Mail yield on delivery_handler and updated testsJosé Valim and Mikel Lindsaar2010-01-252-10/+3
| |
| * Added delivery_handler method to mail and implemented in ActionMailer to ↵José Valim and Mikel Lindsaar2010-01-252-3/+12
| | | | | | | | deliver inside of instrumentation
| * Added delivers_from.José Valim and Mikel Lindsaar2010-01-251-2/+12
| |
| * Merge branch 'master' of github.com:mikel/railsJosé Valim and Mikel Lindsaar2010-01-241-7/+1
| |\
| | * Merge branch 'master' of git://github.com/rails/railsJosé Valim and Mikel Lindsaar2010-01-251-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 Lindsaar2010-01-241-0/+5
| |/ /
| * | Add tests to mail helper.José Valim and Mikel Lindsaar2010-01-242-3/+2
| | |
| * | Move old tests to a specific folder and add some delivery method tests.José Valim and Mikel Lindsaar2010-01-243-12/+16
| | |
| * | Handle some TODOs and deprecations.José Valim and Mikel Lindsaar2010-01-245-38/+41
| | |
| * | Finish cleaning up delivery methods implementation.José Valim and Mikel Lindsaar2010-01-242-70/+55
| | |
| * | Maintain old_api and deprecated_api in different files.José Valim and Mikel Lindsaar2010-01-244-243/+261
| | |
| * | Add new class delivery method API.José Valim and Mikel Lindsaar2010-01-242-11/+32
| | |
| * | Some refactoring.José Valim and Mikel Lindsaar2010-01-244-164/+164
| | |
| * | Adding failing tests for calling just the action, instead of ↵José Valim and Mikel Lindsaar2010-01-241-1/+3
| | | | | | | | | | | | :create_action_name and :deliver_action_name
| * | Moving AS::Notifications call to one location in baseJosé Valim and Mikel Lindsaar2010-01-241-9/+7
| | |
| * | Delegated ActionMailer::Base.deliveries to Mail.deliveries, added callback ↵José Valim and Mikel Lindsaar2010-01-243-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 sequenceJosé Valim and Mikel Lindsaar2010-01-241-4/+8
| | |
| * | Add some tests to collector with templates and any.José Valim and Mikel Lindsaar2010-01-232-3/+2
| | |
| * | Make implicit and explicit templates pass through the same part creation ↵José Valim and Mikel Lindsaar2010-01-232-72/+79
| | | | | | | | | | | | process.