mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-14 11:20:46 +00:00
Code Issues 32 Releases Wiki Activity
12,111 Commits 29 Branches 437 Tags
Commit Graph

12111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Kaplan-Moss
45d43317b7 [1.4.X] Replaced documentation snippets using "gender" with less sensitive examples. 
Backport of [7edf231] from master.
 2012-06-06 13:55:09 +02:00
Luke Plant
0a8a6b92b2 [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 840ffd80ba from master
 2012-06-04 21:49:42 +01:00
Luke Plant
3bd937aec2 [1.4.x] Rewrote security.txt SSL docs, noting SECURE_PROXY_SSL_HEADER. 
Backport of 0199bdc0b from master
 2012-06-04 21:46:37 +01:00
Karen Tracey
03f1d69f1e Merge pull request #109 from apollo13/fix4d2fdd 
Fix test error.
 2012-06-04 04:31:28 -07:00
Florian Apolloner
1c13cc023f [1.4.x] readd imports deleted in 4d2fdd 2012-06-04 13:24:05 +02:00
Julien Phalip
4d2fdd4185 [1.4.X] Fixed #18379 -- Made the sensitive_variables decorator work with object methods. 2012-06-03 23:59:01 -07:00
Michael Newman
0f69a16785 [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 4423757c0c50afbe2470434778c8d5e5b4a70925.
 2012-05-27 21:51:03 +03:00
Adrian Holovaty
d3fa8d92ea [1.4.x] Updated docs/intro/whatsnext.txt to reference Git instead of SVN 2012-05-16 23:19:09 +02:00
Claude Paroz
6bb85d98b0 [1.4.x] Fixed #18019 -- Use threaded runserver only when database supports it. 2012-05-15 09:23:52 +02:00
Claude Paroz
589af4971e [1.4.x] Fixed #18301 -- Fixed url name in password reset example. 
Thanks nicknnn for the report.
 2012-05-11 20:19:32 +02:00
Jannis Leidel
35423f6fb1 [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.
 2012-05-10 18:30:46 +02:00
Claude Paroz
ffe620f203 Fixed #18270 -- Corrected variable name in password reset example. 
Thanks schnippi for the report.
Backport of ec5423df05dedeee6651c36dd4d90fec0d8cca7c from master.
 2012-05-10 08:40:39 +02:00
Aymeric Augustin
a3c8201b77 [1.4.x] Fixed #17976 -- Made forms.BooleanField pickleable. 
Backport of 9350d1d59c1a4e6a9ac246a808f55da35de0df69 from master.

This was a regression in Django 1.4.
Thanks bronger for the report and claudep for the patch.
 2012-05-08 23:20:05 +02:00
Claude Paroz
521fe472e5 [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
 2012-04-22 17:20:39 +00:00
Ramiro Morales
839a71b0a5 [1.4.X] Added documentation notes about lack of database savepoints support 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
 2012-04-21 22:57:32 +00:00
Claude Paroz
143305126b [1.4.X] Fixed #18156 -- Updated signature of ModelAdmin change_view in 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
 2012-04-20 13:01:04 +00:00
Claude Paroz
64bbf5187c [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
 2012-04-16 11:40:25 +00:00
Claude Paroz
2fa8b3f143 [1.4.X] Fixed #18118 -- Improved documentation for contrib.auth.hashers 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
 2012-04-13 11:40:44 +00:00
Claude Paroz
3f77b84489 [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
 2012-04-11 21:27:18 +00:00
Claude Paroz
ee43524e22 [1.4.X] Fixed #18104 -- Added missing parentheses around two-lines deprecation 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
 2012-04-11 17:20:59 +00:00
Claude Paroz
8ed9e9074c [1.4.X] Fixed #18095 -- Added missing 'cc' mention in EmailMessage recipients() 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
 2012-04-10 20:02:56 +00:00
Aymeric Augustin
01dfe35b38 [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
 2012-04-10 06:06:14 +00:00
Claude Paroz
8adfdf08de [1.4.X] Fixed #17672 -- Precised MacPorts GeoDjango install instructions 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
 2012-04-09 10:03:31 +00:00
Julien Phalip
a6ba67ffd1 [1.4.X] Fixed #18086 -- Restored '-pk' as the default order in the admin 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
 2012-04-09 04:32:42 +00:00
Ramiro Morales
9a3e9c27c2 [1.4.X] Fixed #18074 -- Fixed description of dumpdata command --database 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
 2012-04-06 18:59:06 +00:00
Claude Paroz
61b13444c5 [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
 2012-04-02 19:52:32 +00:00
Claude Paroz
456d4db251 [1.4.X] Fixed #18045 -- Corrected the documented default value of SESSION_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
 2012-04-01 17:17:21 +00:00
Julien Phalip
aafa73db54 [1.4.X] Fixed #17972 -- Ensured that admin filters on a foreign key respect 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
 2012-03-31 18:46:18 +00:00
Aymeric Augustin
13822974dd [1.4.X] Removed documentation for SMTPConnection, which was removed at 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
 2012-03-31 12:12:12 +00:00
Claude Paroz
35124ae3e2 [1.4.X] Fixed #17999 -- Restored the links to examples from models documentation. 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
 2012-03-30 18:03:54 +00:00
Claude Paroz
814385321b [1.4.X] Fixed #17993 -- Removed quotes around module parameter for wider 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
 2012-03-29 15:14:08 +00:00
Claude Paroz
515b3b85ed [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
 2012-03-29 15:12:43 +00:00
Claude Paroz
6c5933d175 [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
 2012-03-29 15:11:14 +00:00
Claude Paroz
277661c2af [1.4.X] Fixed #17733 -- Discouraged setting TIME_ZONE to None when USE_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
 2012-03-29 15:09:52 +00:00
Claude Paroz
37c0e10e8c [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
 2012-03-29 15:08:38 +00:00
Claude Paroz
ec2119e194 [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
 2012-03-29 15:07:09 +00:00
Claude Paroz
a815fd1652 [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
 2012-03-29 15:05:31 +00:00
Aymeric Augustin
bbb2595f89 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
 2012-03-29 06:18:26 +00:00
James Bennett
658ca67d9f Minor correction in the version tuple. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 16:58:48 +00:00
James Bennett
2591fb8d4c Bump trunk to 1.4. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1.4 		2012-03-23 16:53:23 +00:00
Jacob Kaplan-Moss
a033d4992c Edited Django 1.4 release notes: 
* Remove the "UNDER DEVELOPMENT" parts.
* Added an overview, explicitly mentioning time zone support.
* Spell/grammar check.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17798 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 16:51:01 +00:00
Aymeric Augustin
f356a2e52f Fixed #17810 (again). Catch session key errors. 
The previous commit didn't work with PyLibMC.
This solution appears to be the best compromise
at this point in the 1.4 release cycle.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 16:14:46 +00:00
Jannis Leidel
46871eb1bb Fixed an incompatibility with Python 2.5 in the changes done in r17795. Refs #17810. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 09:32:11 +00:00
Paul McMillan
2ca9801956 Fixed #17810. Catch session key errors. 
Catches memcached session key errors related to overly long session keys.
This is a long-standing bug, but severity was exacerbated by the addition
of cookie-backed session storage, which generates long session values. If
an installation switched from cookie-backed session store to memcached,
users would not be able to log in because of the server error from overly
long memcached keys.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@17795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 05:31:11 +00:00
Jannis Leidel
38061221c3 Pulled sites translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 03:29:30 +00:00
Jannis Leidel
5b3721b067 Pulled sessions translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17793 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 03:24:45 +00:00
Jannis Leidel
c6ba0b54b7 Pulled redirects translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 03:20:36 +00:00
Jannis Leidel
07f6054cd5 Pulled messages translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 03:17:00 +00:00
Jannis Leidel
6e76389c22 Pulled localflavor translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17790 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 03:12:58 +00:00
Jannis Leidel
6017c9fd2d Pulled humanize translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 03:09:42 +00:00