mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 01:25:32 +00:00
Code Issues 32 Releases Wiki Activity
28,451 Commits 30 Branches 460 Tags
bdad2adb26c08353ef1d77a823d95db1377152f2
Commit Graph

71 Commits

Author SHA1 Message Date
Nick Pope
345fa40cb5 [3.1.x] Used :mimetype: role in various docs. 
Backport of feb91dbda1 from master
 2020-05-13 09:38:49 +02:00
Adrian D'Alessandro
235b681351 Doc'd send_email() behavior when from_email is None. 2020-04-30 12:45:43 +02:00
Adam Johnson
f344c75fb0 Added additional note that tests use locmem email backend. 2020-03-25 15:01:39 +01:00
Jon Dufresne
fbbff7f808 Refs #29983 -- Added pathlib.Path support to the file email backend. 2019-11-06 09:33:07 +01:00
Tobias Kunze
4a954cfd11 Fixed #30573 -- Rephrased documentation to avoid words that minimise the involved difficulty. 
This patch does not remove all occurrences of the words in question.
Rather, I went through all of the occurrences of the words listed
below, and judged if they a) suggested the reader had some kind of
knowledge/experience, and b) if they added anything of value (including
tone of voice, etc). I left most of the words alone. I looked at the
following words:

- simply/simple
- easy/easier/easiest
- obvious
- just
- merely
- straightforward
- ridiculous

Thanks to Carlton Gibson for guidance on how to approach this issue, and
to Tim Bell for providing the idea. But the enormous lion's share of
thanks go to Adam Johnson for his patient and helpful review.
 2019-09-06 13:27:46 +02:00
Joachim Jablon
0c2ffdd526 Fixed an example of email with display name in EmailMessage.from_email. 2019-06-13 16:22:15 +02:00
José L. Patiño
b5dd6ef3d5 Fixed #29535 -- Updated email.MIME* references for Python 3. 2018-06-29 08:06:37 -04:00
Subhav Gautam
085ebc5f1a Fixed #29430 -- Clarified send_mail()'s fail_silently docs. 2018-06-02 10:50:15 -04:00
Mariusz Felisiak
35319bf12c Alphabetized imports in various docs. 
Follow-up of d97cce3409 and 7d3fe36c62.
 2018-05-12 19:37:42 +02:00
Tim Graham
5446b72003 Removed versionadded/changed annotations for 1.11. 2017-09-22 12:51:18 -04:00
Michael Schwarz
72d541b61c Fixed #27007 -- Handled non-UTF-8 bytes objects for text/* attachments. 
The fallback logic which allows non-UTF-8 encoded files to be passed to
attach_file() even when a `text/*` mime type has been specified is
moved to attach(). Both functions now fall back to a content type of
`application/octet-stream`.

A side effect is that a file's content is decoded in memory instead of
opening it in text mode and reading it into a string.

Some mimetype-related logic in _create_attachment() has become
obsolete as the code moved from attach_file() to attach() already
handles this.
 2016-08-12 16:35:09 -04:00
Ed Henderson
4a4d7f980e Fixed #26021 -- Applied hanging indentation to docs. 2016-06-03 11:44:34 -04:00
Camilo Nova
a6f856df52 Added import in docs/topics/email.txt example. 2016-02-12 13:44:38 -05:00
rowanv
a6ef025dfb Fixed #26124 -- Added missing code formatting to docs headers. 2016-02-01 10:42:05 -05:00
Agnieszka Lasyk
1f8dad6915 Fixed #25755 -- Unified spelling of "website". 2015-11-16 06:44:14 -05:00
Tim Graham
54848a96dd Removed versionadded/changed annotations for 1.8. 2015-09-23 19:31:11 -04:00
Tim Graham
87d55081ea Fixed #25159 -- Removed brackets from class/function/method signatures in docs. 
Thanks hellbeast for the initial patch.
 2015-07-27 10:32:47 -04:00
Tim Graham
ffe83d16bd Fixed #24659 -- Clarified docs of smtp.EmailBackend parameters. 2015-04-20 15:46:31 -04:00
Tim Graham
c79faae761 Removed versionadded/changed notes for 1.7. 2015-02-01 21:02:40 -05:00
Martin Blech
e023ceb453 Fixed #23910 -- Added reply_to parameter to EmailMessage 
Thanks to Berker Peksag and Tim Graham for the review and suggestions.
 2014-11-28 06:00:06 -05:00
Kevin Ndung'u
0d74209ef6 Fixed #23900 -- Added missing imports in code example. 
The Preventing header injection example included
classes that are not imported.

Thanks to Collin Anderson and Berker Peksağ for the
reviews.
 2014-11-23 23:03:58 +01:00
Berker Peksag
5c517ec218 Fixed versionchanged indentation in docs/. 2014-11-03 21:40:26 -05:00
José Padilla
5472d18e31 Fixed #23461 -- Added EMAIL_TIMEOUT setting 2014-09-13 09:33:21 -04:00
Andi Albrecht
00535e8e6b Fixed #20743 -- Added support for keyfile/certfile in SMTP connections. 
Thanks jwmayfield, serg.partizan, and Wojciech Banaś for work on the patch.
 2014-09-10 11:14:20 -04:00
Iain Dawson
ef8ef2a42d Fixed an instance of 'an' before a word beginning with a consonant. 2014-09-10 09:44:12 +01:00
oromero
0f0a5c07f9 Fixed #22161 -- Documented send() with no recipients won't raise an exception. 2014-09-05 20:38:50 -04:00
Mariano Rezk
7cd74fc96e Fixed #22455 -- Documented return values for send_mail and send_mass_mail 2014-04-16 17:35:17 -04:00
Mariano Rezk
4e3d8ae610 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.
 2014-04-15 17:47:51 -04:00
Daniel Neuhäuser
4aa80149e7 Fixed #22327 -- Turned BaseEmailBackend into a context manager 
Changed the BaseEmailBackend to allow usage as context manager to open
and close connections.
 2014-03-31 14:08:51 -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