aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-191-0/+7
|\ | | | | | | | | | | Conflicts: railties/guides/source/ajax_on_rails.textile railties/guides/source/generators.textile
| * brings a #:nodoc: backXavier Noria2011-04-191-1/+1
| |
| * Undocumented :openssl_verify_mode option for smtp_settingsFlorent Piteau2011-04-191-0/+4
| |
| * docs for ActionMailer::Base.default_i18n_subjectSebastian Martinez2011-04-181-1/+4
| |
* | Updating mail to 2.2.16Mikel Lindsaar2011-04-161-1/+1
| |
* | Fix missing requires in Action MailerPrem Sichanugrist2011-04-131-0/+1
|/ | | | | | This made the isolated test failed on CI server. Signed-off-by: Xavier Noria <fxn@hashref.com>
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-121-0/+13
|\
| * Made the defaults section a little more readable and more to the point, ↵simply-phi2011-04-041-71/+3
| | | | | | | | giving a overview of the possibilities.
| * Added information about default valuessimply-phi2011-04-041-0/+81
| |
* | AM register_interceptor and register_observer only constantize if the ↵Josh Kalderimis2011-04-061-2/+2
| | | | | | | | argument is a String
* | remove AM delegating register_observer and register_interceptor to Mail and ↵Josh Kalderimis2011-04-043-5/+73
|/ | | | | | instead implement smarter versions allowing for string class names, also added proper Railtie support with tests. Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-031-1/+1
|\
| * s/ERb/ERB/g (part II)Akira Matsuda2011-04-031-1/+1
| |
* | Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0Santiago Pastorino2011-04-021-2/+0
|/
* Fix typoSantiago Pastorino2011-03-091-1/+1
|
* publicise ActionMailer::MailHelper.format_paragraphDiego Carrion2011-03-092-1/+21
| | | | | | [#6550 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Rename conflicting ActionMailer::MailHelper#simple_format methodMat Brown2011-03-091-2/+2
| | | | | This was conflicting with ActionView::Helpers::TextHelper#simple_format from within email templates.
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-071-2/+2
|\
| * "SSL everywhere" for GitHub URLsAkira Matsuda2011-03-071-1/+1
| | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere
| * s/a/an/Akira Matsuda2011-03-071-1/+1
| |
* | Fixed indentation in actionmailer base_test [#6538 state:committed]Dalibor Nasevic2011-03-071-2/+2
|/ | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
* Revert "Fixed identation in actionmailer base_test"Xavier Noria2011-03-061-2/+2
| | | | | | | | | Please excuse the revert. Albeit the commit is totally innocent, docrails has a strong no-code policy we need to enforce. Please feel free to submit the fix as a patch and assign it to me, I'll apply right away. This reverts commit d8462510c5378f9204778ffb9df4fdbece7dccd0.
* style changesJudeArasu2011-03-061-3/+5
|
* Revert "style changes"JudeArasu2011-03-061-3/+3
| | | | This reverts commit 1d4826937e438ebcd6a2f9e29d2e466a43fef7a8.
* style changesJudeArasu2011-03-061-3/+3
|
* styles applied for usageJudeArasu2011-03-061-3/+4
|
* Fixed identation in actionmailer base_testDalibor Nasevic2011-03-061-2/+2
|
* typo changesJudeArasu2011-03-051-3/+4
|
* Correct spelling for Base64 in action_mailerDalibor Nasevic2011-03-051-1/+1
|
* No need of instance variableDalibor Nasevic2011-03-021-3/+3
| | | | | | [#6502 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Fixed typos in asset_host_testDalibor Nasevic2011-03-021-2/+2
| | | | | | [#6501 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* We're in 2011, let's update our licensePrem Sichanugrist2011-02-222-2/+2
| | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* merges docrailsXavier Noria2011-02-181-1/+1
|\
| * fix typoVijay Dev2011-02-171-1/+1
| |
* | removing text-format in favor of a more simple solutionAaron Patterson2011-02-092-12/+19
|/
* Bump mail version upSantiago Pastorino2011-01-281-1/+1
|
* Solve SystemStackError when changing locale inside ActionMailer [#5329 ↵José Valim2011-01-191-10/+6
| | | | state:resolved]
* Added a testcase for bug [#5329]Frank Fischer2011-01-192-0/+54
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Removing unused method argumentMikel Lindsaar2011-01-181-1/+1
|
* Cleaning up style, concat inside method calls is uglyMikel Lindsaar2011-01-181-9/+12
|
* Fixing redundant escape in regexMikel Lindsaar2011-01-181-1/+1
|
* Should use standard ruby signature for respond_toMikel Lindsaar2011-01-181-1/+1
|
* Fixing spellingMikel Lindsaar2011-01-181-2/+2
|
* sorry, the CI cannot lie to us anymore (Part II)Santiago Pastorino2011-01-131-1/+1
|
* turn off deprecation silencingAaron Patterson2011-01-121-1/+8
|
* A bunch of cleanup on the inherited template patchwycats2010-12-262-10/+3
|
* minor fixesin READMEsVijay Dev2010-12-201-1/+1
|
* Clean up asset_host and asset_path.José Valim2010-12-091-2/+2
|
* Merge branch 'master' of https://github.com/peterb/docrails into peterb-masterAditya Sanghi2010-11-291-1/+3
|\
| * Explain actionamailer authentication typesPeter Baker2010-10-141-1/+3
| |