mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 11:06:07 +00:00
Code Issues 27 Releases Wiki Activity
17,477 Commits 28 Branches 426 Tags 667 MiB
71c8ae543f
Commit Graph

43 Commits

Author SHA1 Message Date
Mariano Rezk
5672b29d57 [1.7.x] Fixed #22443 -- Document smtp.EmailBackend.timeout default value 
Django 1.7 introduces a new timeout parameter for the SMTP email backend:
http://docs.djangoproject.com/en/dev/topics/email/#django.core.mail.backends.smtp.EmailBackend.timeout

However, there was no mention of the default value for this parameter.

Backport of 4e3d8ae610 from master.
 2014-04-15 17:48:45 -04:00
Tim Graham
9953e98e6a Fixed #21701 -- Improved testing doc titles and added testing/tools.txt. 
Thanks cjerdonek for the suggestion.
 2013-12-31 08:14:09 -05:00
Chris Jerdonek
d599b590eb Fixed #21614 -- improved docs on configuring email for development. 2013-12-14 11:20:38 -05:00
Tom Scholl
cab72a439b Fixed docs for EmailMessage extra_headers attribute 
The EmailMessage documentation describes the initialization parameters
and states they 'can be set at any time prior to calling the send()
method.'. However, the 'headers' parameter's corresponding attribute is
called 'extra_headers'.
 2013-11-08 18:38:45 -05:00
Tim Graham
43cfc652d2 Fixed doc typo in previous commit. 2013-10-24 21:25:51 -04:00
SusanTan
4e0a2fe59c Fixed #21271 -- Added timeout parameter to SMTP EmailBackend. 
Thanks Tobias McNulty and Tim Graham for discussions and code review.
Thanks Andre Cruz the suggestion and initial patch.
 2013-10-24 20:38:00 -04:00
Dan Loewenherz
43f213e475 Fix grammatical errors in email documentation 2013-10-08 09:21:45 -05:00
Ramiro Morales
f9d1d5dc13 Fixed #18967 -- Don't base64-encode message/rfc822 attachments. 
Thanks Michael Farrell for the report and his work on the fix.
 2013-08-20 22:17:26 -03:00
Tim Graham
d4dd55e78c Doc tweaks for html_message parameter to send_mail(); refs #20817 2013-07-30 08:06:49 -04:00
Justin Michalicek
ac09558760 Fixed #20817 -- Added html_message parameter to django.core.mail.send_mail() 2013-07-29 09:53:47 -04:00
Claude Paroz
59ebe39812 Fixed #17471 -- Added smtplib.SMTP_SSL connection option for SMTP backend 
Thanks dj.facebook at gmail.com for the report and initial patch
and Areski Belaid and senko for improvements.
 2013-07-11 22:00:08 +02:00
Tim Graham
837425b425 Fixed #18934 - Removed versionadded/changed annotations for Django 1.3 2012-09-20 19:06:55 -04:00
Claude Paroz
8a5d1a6b93 Updated obsolete links in the documentation 2012-06-28 10:49:07 +02:00
Aymeric Augustin
c28e700c7e Removed references to changes made in 1.2. 
Thanks Florian Apolloner for the patch.
 2012-06-07 15:02:35 +02:00
Claude Paroz
916d705538 Fixed #18095 -- Added missing 'cc' mention in EmailMessage recipients() description. Thanks Stéphane Raimbault for the report and the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17891 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-10 20:00:18 +00:00
Aymeric Augustin
d66035c4a6 Removed documentation for SMTPConnection, which was removed at r15978. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17837 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-31 12:08:39 +00:00
Luke Plant
d1e5c55258 Fixed many more ReST indentation errors, somehow accidentally missed from [16955] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-14 00:12:01 +00:00
Ramiro Morales
932b1b8d6d Converted links to external topics so they use intersphinx extension markup. 
This allows to make these links more resilent to changes in the target URLs.
Thanks Jannis for the report and Aymeric Augustin for the patch.

Fixes #16586.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-04 21:17:30 +00:00
Jannis Leidel
49f57a5d28 Fixed #15992 -- Added more references to settings. Thanks, aaugustin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-29 17:41:04 +00:00
Adrian Holovaty
9a279edc1c Fixed some ReST errors from e-mail -> email change in docs, and changed some docs that shouldn't have been changed (because translation strings haven't been converted yet) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-01 16:18:23 +00:00
Adrian Holovaty
94af19c43f Changed e-mail to email throughout documentation and codebase. The one exception is translation strings, which I didn't want to disrupt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-01 16:10:22 +00:00
Timo Graham
a981f5b988 Fixed #15163 - typo in email docs; thanks metal for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15311 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-26 00:37:08 +00:00
Timo Graham
2ea93f9327 Fixed #14000 - remove versionadded/changed tags for Django 1.0 and 1.1 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-26 00:37:14 +00:00
Russell Keith-Magee
29c4a578af Fixed #10863 -- Added HTML support to mail_managers() and mail_admins(), and used this to provide more and prettier detail in error emails. Thanks to boxed for the suggestion, and to Rob Hudson and Brodie Rao for their work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14844 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-06 14:21:51 +00:00
Timo Graham
750325505e Fixed #14783 - Links + style improvements to docs/topics/email.txt. Thanks adamv for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14723 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-27 12:19:21 +00:00
Alex Gaynor
3d650b4913 Fixed #14619 -- corrected a typo in the email docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14463 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-04 21:09:51 +00:00
Russell Keith-Magee
a904e55859 Fixed #11509 -- Modified usage of "Web" to match our style guide in various documentation, comments and code. Thanks to timo and Simon Meers for the work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 08:12:50 +00:00
Luke Plant
0aa438a3df Fixed #7722 - added support for CC in EmailMessage. 
Thanks to roberto.digirolamo for the report and initial patch, and
dougvanhorn and SmileyChris for further work on the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14000 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-07 23:36:02 +00:00
Jacob Kaplan-Moss
728effcfbd Fixed #14141: docs now use the :doc: construct for links between documents. 
Thanks, Ramiro Morales.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-19 19:27:44 +00:00
Russell Keith-Magee
14fa3b7e24 Fixed #13594 -- Corrected typo in email docs. Thanks to mostrovsky for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13526 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-07 02:42:50 +00:00
Russell Keith-Magee
0e6ff67ba2 Fixed #13471 -- Added example of send_mass_mail usage. Thanks to gtaylor for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13127 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-08 07:31:18 +00:00
Russell Keith-Magee
0f6555bce2 Fixed #13420 -- Clarified grammar in the email docs. Thanks to Dominic Rodger for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13104 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-06 01:17:29 +00:00
James Bennett
9a67543c3e Fixed #13048: Corrected typo in email documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-07 00:51:29 +00:00
Russell Keith-Magee
e07560a88e Modified the way EMAIL_BACKEND is specified to make it consistent with the new "use the class name" policy for backends. 
This is a BACKWARDS-INCOMPATIBLE CHANGE for anyone using a manually
specified EMAIL_BACKEND setting. If you have manually specified
EMAIL_BACKEND, you will need to append ".EmailBackend" to your
existing EMAIL_BACKEND setting. See the django-dev mailing list for
details.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12084 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-04 12:05:04 +00:00
Luke Plant
2552599800 Corrected spelling of e-mail (according to our standard). 
Also fixed an incorrect link in release notes.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-03 14:55:28 +00:00
Russell Keith-Magee
6bf98c4400 Fixed #12267 -- Corrected a typo in the Email docs. Thanks to Thejaswi Puthraya for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-26 11:17:53 +00:00
Russell Keith-Magee
cf169d9e12 Cleaned up the release notes index page, and added some stub 1.1.2 and 1.2 release notes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 13:44:24 +00:00
Russell Keith-Magee
aba5389326 Fixed #10355 -- Added an API for pluggable e-mail backends. 
Thanks to Andi Albrecht for his work on this patch, and to everyone else that contributed during design and development.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-03 12:53:26 +00:00
Russell Keith-Magee
9a03c21a18 Fixed #8638 -- Added documentation on how to redirect email to a dummy server for testing purposes. Thanks to Rob Hudson and Marc Fargas for their work on the draft for this change. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9793 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-29 12:31:11 +00:00
Karen Tracey
d4f4ab8535 Fixed #9487 -- Corrected several links into the Python docs that were broken by the recent Python docs refactor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-01 19:02:09 +00:00
Jacob Kaplan-Moss
64a9469127 Fixed #8753: converted "new in ..." callouts to proper Sphinx "versionadded/versionchanged" directives. Thanks to Marc Fargas for all the heavy lifting here. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 03:40:42 +00:00
James Bennett
a72eae0be7 Fixed #8728: Corrected some broken links in the documentation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 09:45:30 +00:00
Jacob Kaplan-Moss
97cb07c3a1 Massive reorganization of the docs. See the new docs online at http://docs.djangoproject.com/. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8506 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-23 22:25:40 +00:00