mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-18 07:26:04 +00:00
Code Issues 24 Releases Wiki Activity
11,772 Commits 28 Branches 423 Tags 636 MiB
2591fb8d4c
Commit Graph

11772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Bennett
2591fb8d4c Bump trunk to 1.4. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 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
Jannis Leidel
5370b94d41 Pulled gis translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17788 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 03:06:20 +00:00
Jannis Leidel
32734ca27d Pulled formtools translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 03:03:11 +00:00
Jannis Leidel
122086032b Pulled flatpages translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 02:59:34 +00:00
Jannis Leidel
987eecb02d Pulled contenttypes translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17785 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 02:56:00 +00:00
Jannis Leidel
565fad7693 Pulled comments translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17784 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 02:52:11 +00:00
Jannis Leidel
ab0617b69b Pulled auth translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17783 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 02:48:24 +00:00
Jannis Leidel
4cf8f40f91 Pulled admindocs translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 02:44:50 +00:00
Jannis Leidel
45a5bd8b9b Pulled admin translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 02:41:04 +00:00
Jannis Leidel
1fe7155823 Pulled core translations updates from Transifex. Refs #17822. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 02:35:22 +00:00
Jannis Leidel
ae1b7e9699 Reverted the introduction of a translation string in r17775 as it happened after string freeze. Refs #17944. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 02:31:29 +00:00
Jannis Leidel
b3d0d8552a Added a language mapping for Serbian (Latin) to the Transifex configuration file. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17778 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-23 02:31:12 +00:00
Aymeric Augustin
ce7113ccbe Used SortedDict instead of dict to avoid random errors that may occur when dict randomization is enabled in Python. Refs #17758. Thanks Łukasz Rekucki. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-22 18:09:22 +00:00
Aymeric Augustin
e78d6b406b Reverted parts of r16963 to fix a regression on the creation of permissions on proxy models. Refs #17904. Thanks koenb for the report and claudep for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-22 08:49:48 +00:00
Aymeric Augustin
a8d0fc1001 Fixed #17944 -- Prevented an error in the user change page of the admin when the content of the password field doesn't match the expected format. Thanks saxix for the report and initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-22 08:10:19 +00:00
Aymeric Augustin
1e28567e0d Fixed #17937 -- Avoided an error in the timeuntil filter when it receives a date object. Thanks Dmitry Guyvoronsky for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17774 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-22 07:29:39 +00:00
Jannis Leidel
4219e2b7f8 Fixed #17920 -- Actually pass the full path of a newly created project or app in the template context as mentioned in the startproject docs. Many thanks to Preston Holmes for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-21 22:29:32 +00:00
Julien Phalip
1101739668 Fixed #17936 -- Fixed a code sample in the admin SimpleListFilter documentation. Thanks to anonymous for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17772 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-21 05:57:22 +00:00
Aymeric Augustin
86f9ab20b0 Fixed a typo in my previous commit. Apologies. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-20 21:04:57 +00:00
Aymeric Augustin
ed27ae071f Fixed #17940 -- Enforced USE_TZ = False in contrib apps tests that use fixtures containing datetimes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-20 20:51:16 +00:00
Claude Paroz
163c8def82 Fixed an indentation issue in GeoDjango installation docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-19 21:02:35 +00:00
Claude Paroz
6afc1d1a6b Fixed #17893 -- Added GeoDjango installation instructions for Ubuntu 11.10. Thanks jpaulett for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-19 20:44:51 +00:00
Aymeric Augustin
358c5a1c2a Fixed #17932 -- Tweaked the admin_changelist tests because Oracle doesn't like columns named 'number'. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-19 12:52:15 +00:00
Aymeric Augustin
c8e2f7591d Fixed #17931 -- Accepted aware datetimes to set cookies expiry dates. Thanks jaddison for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-18 20:58:22 +00:00
Claude Paroz
c7cc4cfb9e Fixed #16138 -- Made FormMixin get_initial return a copy of the 'initial' class variable. Thanks hanson2010, wilfred@potatolondon.com and agriffis for their work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17765 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-17 22:31:03 +00:00
Claude Paroz
f13328f776 Fixed #17926 -- Removed mention of XMLField in docs (missing deletion from r15982). Thanks aburgel for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-17 22:13:20 +00:00
Julien Phalip
1ff9be1144 Fixed #17828 -- Ensured that when a list filter's queryset() method fails, it does so loudly instead of getting swallowed by a IncorrectLookupParameters exception. This also properly fixes #16705, which hadn't been addressed correctly in [16705]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17763 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-17 21:45:36 +00:00
Claude Paroz
b452439a6e Fixed #17915 -- Switched GeoModelAdmin default WMS layer URL from Metacarta to OSGeo. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17762 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-17 20:13:06 +00:00
Claude Paroz
f0b9bb2ef9 Do not unconditionally add extra_tests when testing geodjango. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-17 17:44:42 +00:00
Claude Paroz
6974886435 Fixed #10625 -- Fixed a Javascript regex in openlayers.js. Thanks timlinux for the report and Aymeric Augustin for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-17 16:20:04 +00:00
Aymeric Augustin
8d71734f15 Fixed #17923 -- Added missing import in the MySQL and Oracle backends. Thanks aldaran for the report. Also removed two duplicate imports. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-17 09:11:24 +00:00
Carl Meyer
e57bedee78 Fixed #17909 - ensure GeoDjango tests have the templates they need. Thanks Nate Bragg for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-17 04:39:23 +00:00
Carl Meyer
ddd53dafb5 Fixed #17918 - Handle proxy models correctly when sorting deletions for databases without deferred constraints. Thanks Nate Bragg for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17756 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-17 01:24:39 +00:00
Carl Meyer
edcaf8b7ff Reorganized proxy-delete tests for easier addition of new tests. Refs #16128. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17755 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-16 23:27:40 +00:00
Claude Paroz
c8c59c812c Fixed #13267 -- Updated GeoDjango tutorial for the 1.4 release. Thanks samueladam for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-16 21:41:19 +00:00
Claude Paroz
ecf75e5957 Fixed #17841 -- Clarified caching note about authentication backends. Thanks auzigog for the proposal and lukegb for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17752 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-16 19:30:00 +00:00
Claude Paroz
232c99cee1 Added Django-Python version matching table in FAQ. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-16 18:41:31 +00:00
Julien Phalip
49e7f4a229 Fixed #17908 -- Made some contrib.markup tests be skipped so they don't fail on old versions of Markdown. Thanks to Preston Holmes for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-16 00:36:52 +00:00
Julien Phalip
a395e531de Ensured that some staticfiles tests get properly cleaned up on teardown. Thanks to Claude Paroz for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-16 00:29:11 +00:00
Julien Phalip
ea9d96739f Added a with_statement import to a test for Python 2.5 compatibility. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17746 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-15 18:55:08 +00:00