Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: django/django
...
head fork: django/django
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Mar 29, 2012
@aaugustin aaugustin Create 1.4 release branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
bbb2595
@claudep claudep [1.4.X] Bump the version in a docs example.
Backport of r17801 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
a815fd1
@claudep claudep [1.4.X] Fixed #17963 -- Fixed internal links in the 1.4 release notes.
Backport of r17802 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
ec2119e
@claudep claudep [1.4.X] Fix lintian error in manpages.
Backport of r17808 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17817 bcc190cf-cafb-0310-a4f2-bffc1f526a37
37c0e10
@claudep claudep [1.4.X] Fixed #17733 -- Discouraged setting TIME_ZONE to None when US…
…E_TZ is True. Thanks berdario for the report.

Backport of r17809 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
277661c
@claudep claudep [1.4.X] Make auth test pass even when LANGUAGE_CODE is not 'en'. Refs…
… #17980. Thanks wassup for the report.

Backport of r17811 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
6c5933d
@claudep claudep [1.4.X] Added missing indentation in models topic documentation.
Backport of r17812 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
515b3b8
@claudep claudep [1.4.X] Fixed #17993 -- Removed quotes around module parameter for wi…
…der compatibility. Thanks roberto@unbit.it for the report.

Backport of r17813 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17821 bcc190cf-cafb-0310-a4f2-bffc1f526a37
8143853
Commits on Mar 30, 2012
@claudep claudep [1.4.X] Fixed #17999 -- Restored the links to examples from models do…
…cumentation. Refs #17605.

Backport of r17832 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17833 bcc190cf-cafb-0310-a4f2-bffc1f526a37
35124ae
Commits on Mar 31, 2012
@aaugustin aaugustin [1.4.X] Removed documentation for SMTPConnection, which was removed a…
…t r15978. Backport of r17837 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1382297
@jphalip jphalip [1.4.X] Fixed #17972 -- Ensured that admin filters on a foreign key r…
…espect the to_field attribute. This fixes a regression introduced in [14674] and Django 1.3. Thanks to graveyboat and Karen Tracey for the report.

Backport of r17854 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17858 bcc190cf-cafb-0310-a4f2-bffc1f526a37
aafa73d
Commits on Apr 01, 2012
@claudep claudep [1.4.X] Fixed #18045 -- Corrected the documented default value of SES…
…SION_COOKIE_HTTPONLY setting. Missing bit of r17135.

Backport of r17862 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
456d4db
Commits on Apr 02, 2012
@claudep claudep [1.4.X] Fixed #18009 -- Cleaned up a comment about removal of the old…
… contrib.syndication Feed class. Thanks Keryn Knight for the report.

Backport of r17866 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
61b1344
Commits on Apr 06, 2012
@ramiro ramiro [1.4.X] Fixed #18074 -- Fixed description of dumpdata command --datab…
…ase option.

Thanks aruseni for the report.

Backport of r17873 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17874 bcc190cf-cafb-0310-a4f2-bffc1f526a37
9a3e9c2
Commits on Apr 09, 2012
@jphalip jphalip [1.4.X] Fixed #18086 -- Restored '-pk' as the default order in the ad…
…min changelist. This rectifies a slight change in behavior introduced in Django 1.4 and r17635.

Backport of r17881 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
a6ba67f
@claudep claudep [1.4.X] Fixed #17672 -- Precised MacPorts GeoDjango install instructi…
…ons to install gdal with geos support. Thanks chosak for the report and the patch.

Backport of r17883 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
8adfdf0
Commits on Apr 10, 2012
@aaugustin aaugustin [1.4.X] Fixed #18090 -- Applied filters when running prefetch_related…
… backwards through a one-to-one relation. Backport of r17888 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
01dfe35
@claudep claudep [1.4.X] Fixed #18095 -- Added missing 'cc' mention in EmailMessage re…
…cipients() description. Thanks Stéphane Raimbault for the report and the patch.

Backport of r17891 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
8ed9e90
Commits on Apr 11, 2012
@claudep claudep [1.4.X] Fixed #18104 -- Added missing parentheses around two-lines de…
…precation string. Thanks Roy Smith for the report.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
ee43524
@claudep claudep [1.4.X] Fixed #18027 -- Removed an HTMLParser test that doesn't raise…
… any more in recent Python versions. Thanks Arfever and Anssi Kaariainen for the report and the patch.

Backport of r17900 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
3f77b84
Commits on Apr 13, 2012
@claudep claudep [1.4.X] Fixed #18118 -- Improved documentation for contrib.auth.hashe…
…rs utility functions. Thanks Mathieu Agopian for the report and Ramiro Morales for the review.

Backport of r17905 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2fa8b3f
Commits on Apr 16, 2012
@claudep claudep [1.4.X] Fixed #18316 -- Fixed pre-1.3 PermWrapper? location in docs. …
…Thanks Adrien Lemaire for the patch.

Backport of r17913 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
64bbf51
Commits on Apr 20, 2012
@claudep claudep [1.4.X] Fixed #18156 -- Updated signature of ModelAdmin change_view i…
…n docs to reflect r17466. Thanks arthurprat for the report.

Backport of r17918 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1433051
Commits on Apr 21, 2012
@ramiro ramiro [1.4.X] Added documentation notes about lack of database savepoints s…
…upport when using MySQL+MyISAM.

Refs #15507 and r17341.

Backport of r17923.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17924 bcc190cf-cafb-0310-a4f2-bffc1f526a37
839a71b
Commits on Apr 22, 2012
@claudep claudep [1.4.X] Fixed #18186 -- Fixed ReportLab Web site links. Thanks pablog…
… for the report and the initial patch.

Backport of r17928 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
521fe47
Commits on May 08, 2012
@aaugustin aaugustin [1.4.x] Fixed #17976 -- Made forms.BooleanField pickleable.
Backport of 9350d1d from master.

This was a regression in Django 1.4.
Thanks bronger for the report and claudep for the patch.
a3c8201
Commits on May 10, 2012
@claudep claudep Fixed #18270 -- Corrected variable name in password reset example.
Thanks schnippi for the report.
Backport of ec5423d from master.
ffe620f
@jezdez jezdez [1.4.X] Set the post process cache when finished instead of one by one.
This should prevent a race condition if running collectstatic is
canceled or its cache is accessed from other processes, leaving the
cache in a corrupt state.
35423f6
Commits on May 11, 2012
@claudep claudep [1.4.x] Fixed #18301 -- Fixed url name in password reset example.
Thanks nicknnn for the report.
589af49
Commits on May 15, 2012
@claudep claudep [1.4.x] Fixed #18019 -- Use threaded runserver only when database sup…
…ports it.
6bb85d9
Commits on May 16, 2012
@adrianholovaty adrianholovaty [1.4.x] Updated docs/intro/whatsnext.txt to reference Git instead of SVN d3fa8d9
Commits on May 27, 2012
@newmaniese newmaniese [1.4.x] Fixed #18135 -- Close connection used for db version checking
On MySQL when checking the server version, a new connection could be
created but never closed. This could result in open connections on
server startup.

Backport of 4423757.
0f69a16
Commits on Jun 04, 2012
@jphalip jphalip [1.4.X] Fixed #18379 -- Made the sensitive_variables decorator work w…
…ith object methods.
4d2fdd4
@apollo13 apollo13 [1.4.x] readd imports deleted in 4d2fdd 1c13cc0
@kmtracey kmtracey Merge pull request #109 from apollo13/fix4d2fdd
Fix test error.
03f1d69
@spookylukey spookylukey [1.4.x] Rewrote security.txt SSL docs, noting SECURE_PROXY_SSL_HEADER.
Backport of 0199bdc from master
3bd937a
@spookylukey spookylukey [1.4.x] Noted that SECURE_PROXY_SSL_HEADER is needed by CSRF protection.
Both false positives and false negatives of HttpRequest.is_secure can be
dangerous.

Backport of 840ffd8 from master
0a8a6b9
Commits on Jun 06, 2012
@jacobian jacobian [1.4.X] Replaced documentation snippets using "gender" with less sens…
…itive examples.

Backport of [7edf231] from master.
45d4331
Commits on Jun 08, 2012
@spookylukey spookylukey [1.4.x] Added more explicit warnings about unconfigured reStructured …
…Text usage in docs.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17915 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Backport of 718f149 from master
ff6ee5f
Commits on Jun 27, 2012
Tim Graham [1.4.X] Fixed #18369 - Fixed argument name in render() function; than…
…ks qsolo825@ for the report.

Backport of 1cf8287 from master
3631a02
Tim Graham [1.4.X] Fixed #17511 - Removed reference to deprecated "reset" manage…
…ment command in FAQ; thanks voxpuibr@ for the report.

Backport of c8928b9 from master
9014b13
Commits on Jun 29, 2012
@claudep claudep [1.4.x] Fixed #18528 -- Fixed custom field value_to_string example
Thanks anuraguniyal for the report.
d92c38a
Commits on Jun 30, 2012
@timgraham timgraham [1.4.X] Fixed #17168 - Noted TransactionMiddleware only works with "d…
…efault" database alias.

Thanks codeinthehole for the draft patch.

Backport of 5d81ad1 from master
a89e76d
Raúl Cumplido [1.4.X] Fixed #18145 -- Improved documentation of unique_together typ…
…e fields

Backport of 55ffcf8 from master
342e8a6
@timgraham timgraham [1.4.X] Fixed #17705 - Updated TabularInline image and doc in tutoria…
…l 2.

Thanks xbito for the draft patch.

Backport of c5fb829 from master
fea5e0b
Commits on Jul 01, 2012
@timgraham timgraham [1.4.X] Fixed #18493 - Added instructions to locate the Django source…
… files to the t

Thanks Claude Paroz for the draft patch.

Backport of c68f4c5 from master
32bd77d
@timgraham timgraham [1.4.X] Fixed #16882 - Clarified why one should not use 'init_command…
…' after initial database creation.

Backport of 9974069 from master
8bea1a7
Tim Graham [1.4.X] Fixed #17436 - Added warning about overriding Model.__init__()
Thanks zsiciarz for the draft patch.

Backport of 7313468 from master
c5e35af
Commits on Jul 05, 2012
@timgraham timgraham [1.4.X] Fixed #17997 - Documented that the debug server is now multit…
…hreaded by default.

Thanks trey.smith@ for the report and vanessagomes for the patch.

Backport of e4a1407 from master
f5db3bd
Commits on Jul 07, 2012
@aaugustin aaugustin [1.4x] Fixed #18587 -- Typo in management command example
Thanks Frank Wiles.

Backport of 29ca3d3 from master.
f1e4165
@claudep claudep [1.4.x] Fixed #18164 -- Precised startapp template context content
Backport of 249c445 from master.
fd88fe6
@jphalip jphalip [1.4.x] Fixed #17978 -- Fixed a minor layout issue when an inline con…
…tains a filter horizontal widget. Thanks to Aymeric Augustin for the report.
9a2ca42
Commits on Jul 08, 2012
@timgraham timgraham [1.4.x] Fixed #18173 - Corrected ModelAdmin documentation for get_cha…
…ngelist.

Thanks Keryn Knight for the report and vanessagomes for the pckport of [d44aa98] from master.atch.

Backport of [d44aa98] from master.
dcede04
@timgraham timgraham [1.4.X] Fixed #18577 - Clarified middleware initialization.
Thanks Lukasz Balcerzak for the patch.

Backport of 590de18 from master
8ba78a0
Commits on Jul 16, 2012
@kevinlondon kevinlondon [1.4.x] Fixed #18614 -- Added imports and changed render_to_response …
…to render.
c6d06a9
Commits on Jul 22, 2012
@ramiro ramiro [1.4.x] Made LiveServerTestCase to restore state on exit.
The piece of state is DB connections' allow_thread_sharing attribute
which gets munged when test are run when in-memory SQLite databases.

Thanks Anssi for suggesting the possible root cause and Julien for
implementing the fix.

Backport of ea667ee from master.
c2ff027
Commits on Jul 25, 2012
@apollo13 apollo13 Merge pull request #212 from kevinlondon/ticket_18614_1_4
[1.4] Ticket 18614 -- Add Imports and change render_to_response to render
498bf5c
Commits on Jul 28, 2012
@timgraham timgraham [1.4.X] Fixed #18656 -- Fixed LocaleMiddleware link; thanks mitar for…
… the report.

Backport of 07d70e9 from master
94e91f7
Commits on Jul 30, 2012
@apollo13 apollo13 [1.4.x] Fixed a security issue in image uploading. Disclosure and rel…
…ease forthcoming.

Backport of dd16b17 from master.
da33d67
@apollo13 apollo13 [1.4.x] Fixed second security issue in image uploading. Disclosure an…
…d release forthcoming.

Backport of b1d4634 from master.
c14f325
@apollo13 apollo13 [1.4.x] Fixed a security issue in http redirects. Disclosure and new …
…release forthcoming.

Backport of 4129201 from master.
e346850
@ubernostrum ubernostrum [1.4.x] Bump version numbers for security release. 28a4d03
@timgraham timgraham Fixed #17131 - Added per object permission notes to docs.
Thanks dchandek for the suggestion and mateusgondim for the patch.

Backport of 8d3e501 from master
fa6577f
Commits on Aug 01, 2012
@timgraham timgraham [1.4.x] Fixed #18122 - Clarified section title regarding applying per…
…missions to generic views.

Backport of 964979e from master.
751a34e
@timgraham timgraham [1.4.X] Fixed #16168 - Added note regarding type requirements when ov…
…erridng ModelForm fields.

Thanks Pieter Swinkels for the patch.

Backport of ebbc414 from master
a276bde
Commits on Aug 02, 2012
@DrMeers DrMeers [1.4.x] Fixed #18472 - Added warning regarding set_language / i18n_pa…
…tterns.

Backport of d7816c5 from master.
68fd7f5
@timgraham timgraham [1.4.X] Fixed #18581 - Updated admin actions screenshots. Thanks Kevi…
…n London.

Backport of 39541be from master
445b966
@timgraham timgraham [1.4.X] Fixed #16941 - Clarified naturaltime output when the time is …
…more than a day old.

Thanks antoviaque for the patch.
Backport of 07e10fb from master
d1ae3c8
@timgraham timgraham [1.4.X] Fixed #17704 - Updated the StackedInline section in Tutorial …
…2; thanks xbito for the draft patch.

Backport of 2a16eb0 from master
e9f4581
Commits on Aug 03, 2012
@timgraham timgraham [1.4.X] Fixed #13904 - Documented how to avoid garbage collection mes…
…sages in GIS.

Thanks Claude Peroz for the patch.

Backport of 083a3a4 from master
c8e681f
@timgraham timgraham [1.4.X] Fixed #15932 - Documented how to supress multiple reverse rel…
…ations to the same model.

Thanks Claude Paroz for the patch.

Backport of b496be3 from master
1d28002
Commits on Aug 04, 2012
@claudep claudep [1.4.x] Fixed #18713 -- Fixed custom comment app name in comments docs
Thanks Pratyush for the report.
49f9bb2
@timgraham timgraham [1.4.X] Fixed #16980 - Misc updates to the auth docs. Thanks Preston …
…Holmes for the patch.

Backport of 865ff32 from master
c54034a
Commits on Aug 05, 2012
@timgraham timgraham [1.4.x] Merge pull request #233 from rafikdraoui/modeladmin-doc
Updated example of customized ModelAdmin in documentation for 1.4

Backport of a04f68b from master.
df8a2bf
Commits on Aug 06, 2012
@timgraham timgraham [1.4.X] Fixed #17053 - Added a note about USE_THOUSAND_SEPARATOR sett…
…ing to localizations docs.

Thanks shelldweller for the draft patch.
Backport of 4f3a6b8 from master
6536f75
Commits on Aug 10, 2012
@timgraham timgraham [1.4.X] Fixed #17016 - Added examples for file uploads in views.
Thanks Tim Saylor for the draft patch and Aymeric Augustin and Claude Paroz for feedback.

Backport of eff6ba2 from master
fba0149
@timgraham timgraham [1.4.X] Fixed #17680 - Clarified when logging is configured.
Backport of cb38fd9 from master
3264894
Commits on Aug 16, 2012
@rhertzog rhertzog [1.4.x] Fixed #18239 -- Subclassed HTMLParser only for selected Pytho…
…n versions

Only Python versions affected by http://bugs.python.org/issue670664
should patch HTMLParser.
57d9ccc
@timgraham timgraham [1.4.X] Fixed #18223 - Corrected default transaction behavior in post…
…gresql docs.

Thanks philipn for the report and mateusgondim for the patch.

Backport of 2079b73 from master
01b0231
@timgraham timgraham [1.4.X] Fixed #17183 - Added a note regarding LocaleMiddleware at the…
… top of the i18n docs. Thanks krzysiumed for the patch.

Backport of b1f18e9 from master
e4b7e7d
Commits on Aug 17, 2012
@tsaylor tsaylor [1.4.X] Fixed a documentation typo on the widget page.
Backport of f8ef93a from master
03e79c3
Commits on Aug 19, 2012
@timgraham timgraham [1.4.X] Fixed #17180 - Emphasized the need to load the i18n template …
…tag in each template that uses translations. Thanks stefan.freyr for the suggestion and buddylindsey for the draft patch.

Backport of 514a001 from master
232a308
@jcowgar jcowgar [1.4.X] Added load i18n code to the base wizard form template documen…
…tation as it uses the trans tag.

Backport of c23d306 from master
eaa6e4e
Commits on Aug 20, 2012
@timgraham timgraham [1.4.X] Fixed typo in form wizard docs.
Backport of 3631db8 from master
b05d2f5
Commits on Aug 21, 2012
@timgraham timgraham [1.4.x] Fixed #14885 - Clarified that ModelForm cleaning may not full…
…y complete if the form is invalid.

Thanks Ben Sturmfels for the patch.

Backport of 3fd89d9 from master.
42aee6f
@timgraham timgraham [1.4.x] Fixed #18637 - Updated some documentation for aspects of mode…
…ls that are ModelForm specific, not admin specific.

Thanks Ben Sturmfels for the patch.

Backport of 13d47c3 from master.
27c2ccc
Commits on Aug 23, 2012
@timgraham timgraham [1.4.x] Fixed #17069 -- Added log filter example to docs.
Backport of e06189f from master.
4b8c6c4
Commits on Aug 25, 2012
@timgraham timgraham [1.4.X] Updated doc for settings.MEDIA_ROOT based on what's generated…
… by settings.py; thanks ryan-blunden.

Backport of e6e01f6 from master
81bfe42
Commits on Aug 30, 2012
@timgraham timgraham [1.4.X] Fixed #18871 - Fixed typo in multi-db docs.
Backport of 141e6cd from master
f635185
@timgraham timgraham [1.4.X] Fixed #18647 - Removed link to Malcolm's blog which is gone.
Backport of 36df198 from master
fa8a09f
@claudep claudep [1.4.x] Updated obsolete links in the documentation
Backport of 8a5d1a6 from master.
b8340d2
Commits on Aug 31, 2012
@timgraham timgraham [1.4.X] Fixed #14556 - Documented how to use flatpages in URLconf; th…
…anks Claude Paroz for the draft patch.

Backport of 7235cc7 from master
df0c105
@claudep claudep [1.4.x] Added 1.4.1 and 1.3.2 release notes
Backport of 44f541a from master.
f6159d4
@timgraham timgraham [1.4.X] Fixed #16309 - Made ModelAdmin.list_filter versionchanged ann…
…otations more specific to the sections that changed; thanks akaihola for the suggestion and patch.

Backport of 7089638 from master
90fee02
Commits on Sep 01, 2012
@timgraham timgraham [1.4.X] Fixed #18642 - Added a note suggesting the use of render() ra…
…ther than render_to_response() if you need RequestContext in your template.

Backport of f99ecaf from master
c274a9c
@timgraham timgraham [1.4.X] Fixed #16936 - Updated javascript for CSRF protection.
Thanks Idan Gazit for the patch.

Backport of e376558 from master
c088a42
@timgraham timgraham [1.4.x] Fixed #13608 - Noted that template lookups use literal values.
Backport of 74c025d from master.
c2f1aa5
@claudep claudep [1.4.x] Fixed #18212 -- Standardized arguments of GenericIPAddressField
Unlike other model fields, the newly introduced (1.4)
GenericIPAddressField did not accept verbose_name and name as the
first positional arguments. This commit fixes it.
Thanks Dan McGee for the report and the patch.

Backport of 306d348 from master.
92f7af3
@timgraham timgraham [1.4.X] Fixed #18840 - Added a mentioned of the upload_to parameter t…
…o the ModelForm example in file uploads.

Backport of c6088bc from master
c9f1a13
@timgraham timgraham [1.4.x] Merge pull request #315 from streeter/auth-docs-cleanup-patch
Clarify some of the password reset docs

Backport of 03ad7d3 from master.
f0c469c
Commits on Sep 02, 2012
@akaariai akaariai [1.4.x] Fixed #17788 -- Added batch_size argument to qs.bulk_create()
The qs.bulk_create() method did not work with large batches together
with SQLite3. This commit adds a way to split the bulk into smaller
batches. The default batch size is unlimited except for SQLite3 where
the batch size is limited to 999 SQL parameters per batch.

Thanks to everybody who participated in the discussions at Trac.

Backpatch of 29132eb from master (with
documentation changes removed).
2326860
Commits on Sep 05, 2012
@timgraham timgraham [1.4.X] Fixed #18904 - Typo in MySQL link; thanks Johie Anderson for …
…the report.

Backport of e5983af from master
53f533f
Commits on Sep 07, 2012
@aaugustin aaugustin [1.4.x] [py3] Added forwards-compatible aliases.
Related documentation will go to the master branch, since there's
no Python 3 documentation in the 1.5 branch.
376a189
@timgraham timgraham [1.4.X] Fixed #18490 - Updated DateField input formats; thanks dloewe…
…nherz for the draft patch.

Backport of fa8fb2b from master
7e8483e
Commits on Sep 08, 2012
@timgraham timgraham [1.4.X] Fixed #15566 - Documented that update() doesn't honor DateFie…
…ld.auto_now

Thanks Shabda Raaj for the draft patch.

Backport of dc01e41 from master
b0e2cb8
@timgraham timgraham [1.4.X] Fixed #18478 - Documented how to use a mutable default in a m…
…odel field.

Backport of 6e2bb34 from master
cd5181f
@timgraham timgraham [1.4.x] Fixed some broken links in 1.4 docs 7c66309
Commits on Sep 15, 2012
@timgraham timgraham [1.4.x] Fixed #11185 - Expanded docs on customizing widgets; thanks f…
…adeev for the draft patch.

Backport of a73838f from master.
1b5b8b8
@timgraham timgraham [1.4.X] Added an example of using a form wizard with different templa…
…tes; thanks Lorin Hochstein for the patch.

Backport of 5535839 from master
81c77d2
@timgraham timgraham [1.4.x] Fixed #16929 - Documented how to extend UserAdmin with UserPr…
…ofile fields; thanks charettes for the draft example.

Backport of 22242c5 from master.
18d88a1
@timgraham timgraham [1.4.x] Fixed #18131 - Documented ContentTypeManager.get_for_id; than…
…ks sir_sigurd for the report.

Backport of 93e6733 from master.
421ce44
@jphalip jphalip [1.4.X] Fixed #18530 -- Fixed a small regression in the admin filters…
… where wrongly formatted dates passed as url parameters caused an unhandled ValidationError. Thanks to david for the report.
336dfc3
Commits on Sep 19, 2012
@timgraham timgraham [1.4.X] Fixed #13586 - Added an example of how to connect a m2m_chang…
…ed signal handler.

Backport of 1360bd4 from master
3a64ade
@timgraham timgraham [1.4.X] Fixed #14829 - Added references to CBVs in the URLConf docs; …
…thanks Andrew Willey for the suggestion.

Backport of acd74ff from master
57cdbf3
@timgraham timgraham [1.4.X] Fixed #15325 - Added a link to RelatedManager in the ManytoMa…
…nyField docs; thanks jammon for the suggestion.

Backport of 0fdfcee from master
1189dca
Commits on Sep 22, 2012
@timgraham timgraham [1.4.X] Fixed #18057 - Documented that caches are not cleared after e…
…ach test; thanks guettli for the suggestion.

Backport of 2aaa467 from master
bd514f2
Commits on Sep 27, 2012
@akaariai akaariai [1.4.x] Fixed #18979 -- Avoid endless loop caused by "val in PermLook…
…upDict"

Fixed by defining __iter__ which raises TypeError. This was done to
PermWrapper earlier.

Backport of 50d573d
1f53733
Commits on Sep 30, 2012
@akaariai akaariai [1.4.x] -- Fixed Python 2.5 compatibility issues 4dba4ed
@timgraham timgraham [1.4.X] Fixed #15338 - Documented django.utils.decorators
Backport of d0345b7 from master
cf482d6
Commits on Oct 03, 2012
@timgraham timgraham [1.4.X] Fixed #18413 - Noted that a model's files are not deleted whe…
…n the model is deleted. Thanks lawgon for the report.

Backport of 1c03b23 from master
b1462e0
@timgraham timgraham [1.4.X] Fixed #19006 - Quoted filenames in Content-Disposition header.
Backport of 234ca6c from master
8868a06
Commits on Oct 04, 2012
@timgraham timgraham [1.4.X] Fixed #19051 - Fixed Selenium tearDownClass method; thanks gl…
…arrain for the report.

Backport of a1a5c08 from master
a35d7fd
Commits on Oct 05, 2012
@claudep claudep Fixed #19072 -- Corrected an external file path in GeoIP docs
Thanks Flavio Curella for the report and the initial patch.
0636c95
Commits on Oct 06, 2012
@timgraham timgraham [1.4.X] Fixed #17435 - Clarified that QuerySet.update returns the num…
…ber of rows matched

Backport of 6d46c74 from master
c06b724
Commits on Oct 11, 2012
@timgraham timgraham [1.4.x] Fixed #4501 - Documented how to use coverage.py with Django t…
…ests.

Thanks krzysiumed for the draft patch.

Backport of 7ef2781 from master.
1be0515
@timgraham timgraham [1.4.X] Fixed #16817 - Added a guide of code coverage to contributing…
… docs.

Thanks Pedro Lima for the draft patch.

Backport of 06f5da3 from master
3ac70a5
@timgraham timgraham [1.4.X] Fixed #14165 - Documented that TransactionMiddleware only app…
…lies to the default database.

Backport of 938ee7cd36 from master
cf17d5e
@timgraham timgraham [1.4.X] Fixed #16588 - Warned about field names that conflict with th…
…e model API

Backport of dd0cbc6 from master
a1d21c0
Commits on Oct 12, 2012
@timgraham timgraham [1.4.X] Fixed #10936 - Noted that using SQLite for development is a g…
…ood idea

Backport of 470deb5 from master
8139a79
@timgraham timgraham [1.4.X] Fixed #18256 - Added a potential pitfall when upgrading to My…
…SQL 5.5.5

Backport of c870cb4 from master
e2dea54
@timgraham timgraham [1.4.x] Fixed #18996 - Clarified overriden model methods not called o…
…n bulk operations

Backport of 443999a from master.
d2891d1
Commits on Oct 13, 2012
@claudep claudep [1.4.x] Fixed #19119 -- Corrected default date input formats in docs
Thanks henrik@aisti.fi for the report.
Backport of 10dc479 from master.
4cdc416
@jphalip jphalip [1.4.x] Fixed #18881 -- Made the context option in {% trans %} and {%…
… blocktrans %} accept literals wrapped in single quotes. Thanks to lanyjie for the report.
cc04786
Commits on Oct 15, 2012
@timgraham timgraham [1.4.X] Fixed #10936 - Tempered recommendation of SQLite - thanks Kar…
…en Tracey for the feedback.

Backport of 9190d89 from master
8102070
Commits on Oct 17, 2012
@timgraham timgraham [1.4.X] Fixed #18548 - Clarified note regarding reusing model instanc…
…es when form validation fails.

Backport of fd02bcf from master
6ebb6f9
@timgraham timgraham [1.4.x] Fixed a couple links that didn't backport cleanly 33d1146
@timgraham timgraham [1.4.X] Fixed #18473 - Fixed a suggestion that GZipMiddleware needs t…
…o be first in the list of middleware.

Backport of 3e08570 from master
73991b0
@ptone ptone Fixed a security issue related to password resets
Full disclosure and new release are forthcoming

backport from master
92d3430
@ptone ptone Fixed an error in the set cookie documentation 58806ce
@ubernostrum ubernostrum [1.4.x] Bump version numbers for security release. 0f54fed
@ubernostrum ubernostrum [1.4.x] Bump ALL the version numbers. 8c46ead
Commits on Oct 18, 2012
@ptone ptone Added missed poisoned host header test changes 773a292
@timgraham timgraham [1.4.X] Fixed #18046 - Documented that an index is created by default…
… for ForeignKeys; thanks jbauer for the suggestion.

Backport of db598dd from master
fd90a90
Commits on Oct 19, 2012
@timgraham timgraham [1.4.X] Fixed #17388 - Noted in the custom model field docs that fiel…
…d methods need to handle None if the field may be null.

Backport of 4cef9a0 from master
700717d
Commits on Oct 20, 2012
@timgraham timgraham [1.4.X] Fixed #17006 - Documented ModelAdmin get_form() and get_forms…
…ets()

Backport of eed4faf from master
e7685b8
@timgraham timgraham [1.4.x] Fixed arguments for get_inline_instances; refs #17006. 13bbe91
@timgraham timgraham [1.4.X] Fixed #13869 - Warned that QuerySet.iterator() doesn't affect…
… DB driver caching; thanks jtiai for the suggestion.

Backport of 2f722d9 from master
6c1c490
Commits on Oct 21, 2012
@ptone ptone Added 1.4.2 release notes e86e4ce
Commits on Oct 23, 2012
@carljm carljm [1.4.x] Fix an HTML-parser test that's failed in Python 2.6.8 since 5…
…c79dd5.

The problem description in #18239 asserted that
http://bugs.python.org/issue670664 was fixed in Python 2.6.8, but based on
http://bugs.python.org/issue670664#msg146770 it appears that's not correct; the
fix was only applied in 2.7, 3.2, and Python trunk. Therefore we must use our
patched HTMLParser subclass in all Python 2.6 versions.

Backport of fcec904 from master. Fixes #19148.
ce168bb
Commits on Oct 24, 2012
@timgraham timgraham [1.4.X] Fixed #9471 - Expanded ModelAdmin.raw_id_fields docs; thanks …
…adroffne for the suggestion.

Backport of da958eb from master
baf1f1d
Commits on Oct 28, 2012
@akaariai akaariai [1.4.x] Fixed #18823 -- Ensured m2m.clear() works when using through+…
…to_field

There was a potential data-loss issue involved -- when clearing
instance's m2m assignments it was possible some other instance's
m2m data was deleted instead.

This commit also improved None handling for to_field cases.

Backpatch of 611c4d6
37c87b7
Commits on Oct 29, 2012
@claudep claudep [1.4.x] Fixed #19172 -- Isolated poisoned_http_host tests from 500 ha…
…ndlers

Thanks bernardofontes for the report.

Backport of b774c59 from master.
ad2d57a
@aaugustin aaugustin [1.4.x] Fixed #19208 -- Docs for mod_wsgi daemon mode
Thanks Graham Dumpleton for the patch.

Backport of bc00075 from master.
2733253
Commits on Nov 02, 2012
@aaugustin aaugustin Fixed #19225 -- Typo in shortcuts docs.
Thanks SunPowered for the report.
f8c005b
Commits on Nov 13, 2012
@nippo nippo [1.4.X] Typo in comments doc
Backport of 17b14d4 from master
fdb855e
Commits on Nov 15, 2012
@akaariai akaariai [1.4.x] Fixed #19058 -- Fixed Oracle GIS crash
The problem is the same as in #10888 which was reintroduced when
bulk_insert was added. Thanks to Jani Tiainen for report, patch and
also testing the final patch on Oracle GIS.

Backpatch of 92d7f54
25e041f
Commits on Nov 17, 2012
@timgraham timgraham [1.4.X] Fixed #13997 - Added an example of constructing a MultiWidget…
… and documented the value_from_datadict method.

Backport of 04775b4 from master
06c14a6
Commits on Nov 20, 2012
@spookylukey spookylukey [1.4.x] Corrected docs about default value of MESSAGE_STORAGE
Backport of a32f30c from master
9003d6f
Commits on Nov 22, 2012
@ptone ptone [1.4.x] Added examples of using startproject/app with URLs
thanks to Brent O'Connor for the idea and intial docs
1971095
@timgraham timgraham [1.4.X] Fixed #19317 - Added an image for warning blocks in the docs
Thanks tome for the suggestion and patch.

Backport of 3587991 from master
9ee9a72
Commits on Nov 23, 2012
@akaariai akaariai [1.4.x] Fixed SQLite's collapsing of same-valued instances in bulk_cr…
…eate

SQLite used INSERT INTO tbl SELECT %s UNION SELECT %s, the problem
was that there should have been UNION ALL instead of UNION.

Refs #19351

Backpatch of a275824
c7dcb1d
Commits on Nov 24, 2012
@aaugustin aaugustin [1.4.x] Restored Python 2.5 compatibility in m2m_through_regress tests.
Refs #18823.
046300c
@akaariai akaariai [1.4.x] Fixed ordering-related failure in m2m_through_regress tests
Backpatch of dc569c8
3e4058b
Commits on Dec 04, 2012
@sebasmagri sebasmagri [1.4.x] Fixed #19318 -- Ensured that the admin's SimpleListFilter opt…
…ions can be displayed as selected even if the lookup's first element is not a string.

Backport of 88e1715
c721722
@jphalip jphalip [1.4.x] Fixed the admin_filters tests for Postgres.
Backport of c196e01
8c9a8fd
Commits on Dec 10, 2012
@apollo13 apollo13 [1.4.X] Fixed #18856 -- Ensured that redirects can't be poisoned by m…
…alicious users.
b2ae0a6
@apollo13 apollo13 [1.4.X] Fixed a security issue in get_host.
Full disclosure and new release forthcoming.
319627c
@ubernostrum ubernostrum [1.4.x] Bump version numbers for security release. 1f0af3c