Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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