mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity
8,604 Commits 29 Branches 451 Tags
Commit Graph

8604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Russell Keith-Magee
38813c4bbd [1.2.X] Fixed #13740 -- Added documentation for the can_delete InlineModelAdmin option. Thanks to Alex Gaynor for the patch. 
Backport of r13458 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-30 04:16:20 +00:00
Russell Keith-Magee
dc449e9664 [1.2.X] Fixed #13882 -- Removed an unnecessary nested where clause introduced on __isnull queries. Thanks to Alex Gaynor for the report and patch. 
Backport of r13456 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13457 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-30 04:07:27 +00:00
Russell Keith-Magee
c61811a8f2 [1.2.X] Fixed #13730 -- Removed the hard-coding of the requirement that ForeignKeys have an index. Thanks to Suor for the report. 
Backport of r13452 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-30 02:59:14 +00:00
Russell Keith-Magee
3227cc5951 [1.2.X] Fixed #13773 -- Passed in the current connection in a call to db_type(). Thanks to Suor for the report and patch. 
Backport of r13451 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13453 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-30 02:58:51 +00:00
Jannis Leidel
953f4be201 [1.2.X] Fixed #14005 - Removed a few unneeded workarounds in the Sphinx extension. Thanks for the report and patch, Ramiro Morales. 
Backport of r13447 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13448 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-25 20:58:58 +00:00
Jannis Leidel
acbf74a721 [1.2.X] Fixed #13616 - Updated the documentation to be compatible with Sphinx 1.0. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13445 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-24 10:19:39 +00:00
Justin Bronn
8c87622f8b [1.2.X] Fixed #13967 -- MySQL spatial backend now respects when spatial_index=False. Thanks, Simon Law, for bug report and patch. 
Backport of r13443 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-21 15:28:06 +00:00
Justin Bronn
5dc560636b [1.2.X] Fixed #13934 -- GeoSQLCompiler.get_default_columns was missing local_only keyword argument. Thanks, Simon Law, for bug report and initial patch. 
Backport of r13439 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13440 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-20 19:14:23 +00:00
Karen Tracey
48dd139e54 [1.2.X] Fixed import example code for NON_FIELD_ERRORS. 
r13434 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13436 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-17 09:33:27 +00:00
Karen Tracey
ab693cea80 [1.2.X] Set svnmerge-integrated for 1.2.X branch. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13435 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-17 09:31:09 +00:00
Luke Plant
1fed500337 [1.2.X] Doc updates missed in [13424] 
Refs #13880

Backport of [13425] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-05 17:22:29 +00:00
Luke Plant
a84a390c7a [1.2.X] Fixed #13880 - added 2.7 to list of supported versions of Python 
Thanks Alex

Backport of [13423] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-05 17:10:58 +00:00
Luke Plant
b9f085a9de [1.2.X] Added missing module directive for validators documentation. 
Backport of [13421] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-05 16:54:37 +00:00
Luke Plant
558732c37b [1.2.X] Small corrections/improvements to DB optimization docs. 
Bakport of [13419] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-07-05 16:43:51 +00:00
Luke Plant
867d690752 [1.2.X] Fixed error in AnonymousUser docs since [12316] 
Backport of [13401] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-24 11:21:10 +00:00
Justin Bronn
90380b8fcf [1.2.X] Fixed #13671, #13748 -- Fixed errata and minor updates to GeoDjango docs. 
Backport of r13398 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-23 17:38:47 +00:00
Justin Bronn
1b5f812aad [1.2.X] Fixed #13779 -- Can now discover GDAL 1.7 from debian-based packages. Thanks to Leo for bug report and patch. 
Backport of r13396 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13397 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-23 17:19:56 +00:00
Luke Plant
71cecc4952 [1.2.X] Fixed #12803 - Added styling for 'error' and 'warning' messages in admin. 
Thanks to bboli and sebastian_noack for the report, DrMeers for the patch.

Backport of [13393] from trunk.  Considered a bug (and therefore backported)
due to error and warning messages being styled with green tick previously.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13394 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-23 13:20:38 +00:00
Russell Keith-Magee
8f5236fa35 [1.2.X] Fixed #13747 -- Reverted documentation suggesting the use of self.stdout/err in management commands in 1.2. Thanks to metamemetics for the report. 
Strictly, self.stdout/err is a feature addition; however, it's a
feature that is required in order to achieve a massive speedup in the
tests and to maintain parity between 1.2.X and trunk tests. However,
the feature is completely transparent -- the old technique will work
fine, it just isn't as testable. Therefore, we'll treat this as an
undocumented feature in the 1.2 branch.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13364 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-21 12:01:37 +00:00
Jacob Kaplan-Moss
b1b172114a Created 1.2.X release branch. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13361 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-19 21:12:12 +00:00
Jacob Kaplan-Moss
90ce8b0c99 Fixed #10843: the textile tests now pass against the latest textile library. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13360 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-19 21:07:33 +00:00
Karen Tracey
308ca6d8d5 Fixed #13785: Corrected some misplaced and missing parentheses. Thanks LucianU. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13356 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-17 23:50:51 +00:00
Karen Tracey
fc33b8e953 Fixed #13778: Removed a stray colon in a code example. Thanks canassa. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13355 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-17 18:29:27 +00:00
Russell Keith-Magee
ab908685fb Fixed #13739 -- Updated release notes to make a note of the changes to Field.db_type. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13350 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-11 01:37:10 +00:00
Russell Keith-Magee
2597f31ed4 Refs #8901 -- Reverted r13328 because the patch imposes a minimum version requirement of Postgres 8.0; we can't impose that on Django 1.2, so we need to wait until the 1.3 is branched before we can apply this change. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13348 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-10 11:45:29 +00:00
Luke Plant
ac8b7ff021 Fixed #13716 - the CSRF get_token function stopped working for views with csrf_view_exempt 
This was a regression caused by the the CSRF changes in 1.2.

Thanks to edevil for the report.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@13336 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-08 14:35:48 +00:00
Russell Keith-Magee
21a690fcfe Fixed #8901 -- Corrected the PostgreSQL sequence reset code when field identifiers exceed the maximum identifier length. Thanks to adam@zuerchertech.com for the report, and Matt Hoskins for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13328 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-07 15:47:19 +00:00
Jarek Zgoda
9ebf411f26 Fixed #13577 - wrong thousands separator in Polish formats file. Thanks sero for report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13327 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-07 14:47:10 +00:00
Karen Tracey
454622c6f9 Fixed #13676: Corrected some links into the Python docs. Thanks carljm and Tryphon. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-07 03:08:33 +00:00
Karen Tracey
42a751206f Fixed #13657: Moved global declaration before assignments to avoid a syntax warning. Thanks Alex. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13325 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-07 03:01:06 +00:00
Russell Keith-Magee
1a6da249c3 Fixed #13700 -- Converted m2m_through_regress tests to unittests, removing another flush call. Thanks to Alex Gaynor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13324 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-07 02:11:58 +00:00
Russell Keith-Magee
be63b3ca54 Fixed #13698 -- Removed trailing whitespace from regressiontests/utils/timesince. Officially, I'm doing this because trailing whitespace is bad, but apparently it also causes test failures for some people (for reasons we can't narrow down), so there's a double win. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-05 13:07:21 +00:00
Russell Keith-Magee
4290b0d26a Corrected pre-Python 2.6 syntax incompatibility from r13319. Thanks to Karen Tracey for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13322 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-05 12:53:51 +00:00
Russell Keith-Magee
289f41921e Fixed #13697 -- Modified multiple_database test to avoid a failure observed under Python 2.6. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13321 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-05 06:37:52 +00:00
Russell Keith-Magee
45e5fb1ee2 Migrated multiple_database tests to use new stdout argument on management commands, rather than monkeypatching stdout. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13320 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-05 05:32:05 +00:00
Russell Keith-Magee
5da6aeba17 Fixed #13636 -- Migrated fixtures tests to use unittests, eliminating another set of expensive flush calls. Thanks to Eric Holscher for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-05 05:26:04 +00:00
Luke Plant
3e1e04d6d0 Fixed #10758 - sys.exc_info() should not be stored on a local variable 
Thanks piotr.findeisen for report, kevinh for patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@13318 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-03 18:50:04 +00:00
Karen Tracey
887da3154a Fixed #13685: Correct the default value for EMAIL_BACKEND listed in the settings ref. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-06-02 17:57:10 +00:00
Jacob Kaplan-Moss
2311bcbd01 Fixed #13624: added SIGNATURE to the list of settings to hide on debug pages. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13315 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-28 17:25:43 +00:00
Jacob Kaplan-Moss
3180f93236 Fixed #13572: copies of QueryDicts now have their encoding set correctly. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13314 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-28 16:39:52 +00:00
Jacob Kaplan-Moss
8a10078a03 Converted httpwrappers tests to unittest. 
We have always been at war with doctests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13313 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-28 16:27:09 +00:00
Jacob Kaplan-Moss
1b04cb2348 Fixed #13597, a small typo in the admin docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-28 15:03:12 +00:00
Russell Keith-Magee
c4e0dc6b5e Fixed #13656 -- Ensure that the management commands use the right database for transaction start/end commands. Thanks to Alex Gaynor for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13311 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-28 13:46:12 +00:00
Karen Tracey
adc9458541 Fixed #13653: Fixed django.utils.hashcompat to support running on Python 2.4 with standalone hashlib. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13310 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-28 11:46:03 +00:00
Russell Keith-Magee
526a4410d7 Fixed #13634 -- Migrated aggregation tests to use unittest. This removes a flush, which speeds up the tests overall. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13309 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-28 11:15:36 +00:00
Russell Keith-Magee
eedf16d12b Fixed #13638 -- Refactored the serializers_regress tests to avoid the use of flush, and make better use of the transactional capabilities of django.test.TestCase. Thanks to Alex Gaynor for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13308 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-28 09:52:24 +00:00
James Bennett
6cffb9b880 Bump to 1.2.1. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13302 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1.2.1 		2010-05-24 19:10:30 +00:00
Jannis Leidel
e6ec07dc1f Fixed #13592 -- Make sure the SelectDateWidget works with dates before 1900 when localization is enabled. Thanks for the report and patch, magnus. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13301 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-23 10:38:23 +00:00
Luke Plant
6b2d6e1833 Fixed #13590 - Made CSRF failure page styling consistent with Django's default error page styling. 
Thanks to alefteris for suggestion.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@13300 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-22 18:42:16 +00:00
Russell Keith-Magee
84060a1f7a Refs #13573 -- Modified the key technique added in r13295 to be more robust against potential key collisions while keeping key names human-readable. Thanks to Alex for being finicky. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13299 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-21 14:25:26 +00:00