innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
7,469 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

7469 Commits

Author SHA1 Message Date
Luke Plant 0ed09c8a73 [1.1.X] Fixed small error in deprecation policy. 
Backport of r11652


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-24 14:12:46 +00:00
Luke Plant 1f0266bd18 [1.1.X] Fixed #9163 - CsrfMiddleware needs to reset ETag header 
Thanks to carljm for report and patch.

Backport of r11650 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-24 11:27:59 +00:00
Luke Plant 84dac3aa82 [1.1.X] Fixed #12067 - check_dependencies in contrib.admin.sites not triggered using new style admin include 
Thanks to robhudson for report and patch.

Backport of r11648 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-24 10:17:25 +00:00
Brian Rosner b06d1be764 [1.1.X] Moved _get_foreign_key call after testing for fk_name fixing a broken test. 
Backport of [11643] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-23 20:48:52 +00:00
Luke Plant aaa9ccfe14 [1.1.X] Fixed #12060 - equality tests between User and SimpleLazyObject-wrapped User failed. 
Also added more tests for SimpleLazyObject
  
Thanks to ericholscher for report.

Backport of r11637 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-20 14:14:27 +00:00
Luke Plant c1b3808ec0 [1.1.X] Fixed #12049 - LazyObject-wrapped User breaks queries in template tags 
Thanks to chipx86 for the report and patch.

Backport of r11634 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-19 21:17:33 +00:00
Brian Rosner bde4c6d995 [1.1.X] Moved the call to _get_foreign_key to run in all cases catching incorrect inline setup sooner. 
Backport of [11631] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11633 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-19 19:21:08 +00:00
Brian Rosner fb8653ad0e [1.1.X] Fixed #11709 — Pass inline fk_name attribute when grabbing foreign key to test for exclusion. Thanks yishaibeeri for the report. 
Backport of [11630] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-19 19:20:52 +00:00
Justin Bronn 72bc0818dd [1.1.X] The `OGRGeometry.coord_dim` property may now be set; implemented a work-around for an OGR bug that changed geometries to 3D after transformation. Refs #11433. 
Backport of r11628 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-17 17:46:44 +00:00
Luke Plant bc3f59787f [1.1.X] Fixed a regression for Python 2.6 introduced in r11624 on this branch. 
Backport of r11625 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11626 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-15 14:18:52 +00:00
Luke Plant e2b83db9ef [1.1.X] Fixed #6552, #12031 - Make django.core.context_processors.auth lazy to avoid "Vary: Cookie" 
Thanks to olau@iola.dk, Suor for the report

Backport of r11623 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11624 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-14 18:14:19 +00:00
Russell Keith-Magee ec9b6f2616 [1.1.X] Fixed #11959 -- Updated the tutorial to ensure that the admin site continues to work after URLpatterns are introduced. Thanks to carljm for the report and draft patch. 
Backport of r11621 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-14 13:41:37 +00:00
Jacob Kaplan-Moss 66939c28b9 [1.1.X] Fixed #11993: fixed the the floatformat filter on NaN values in Python 2.6.3. Thanks, kklimonda. Backport if [11619] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-12 16:57:01 +00:00
James Bennett 68ac924bb3 [1.1.X] Reset 1.1 branch packaging data post-release. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-09 22:17:43 +00:00
James Bennett 8a65192562 [1.1.X] Really fix the download_url. We already manually tweaked it on pypi, so this is just my inner perfectionist complaining. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-09 22:07:49 +00:00
James Bennett fb5e58f82d [1.1.X] Update setup.py for security release. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-09 21:08:21 +00:00
James Bennett 347346159b [1.1.X] Bump version number for security release. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-09 21:06:09 +00:00
Jacob Kaplan-Moss e3e992e18b [1.1.X] SECURITY ALERT: Corrected regular expressions for URL and email fields. 
Certain email addresses/URLs could trigger a catastrophic backtracking
situation, causing 100% CPU and server overload. If deliberately triggered, this
could be the basis of a denial-of-service attack.

This security vulnerability was disclosed in public, so we're skipping our
normal security release process to get the fix out as soon as possible.

This is a security related update. A full announcement will follow.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-09 20:59:05 +00:00
Russell Keith-Magee 17173ac65a [1.1.X] Fixed #11995 -- Modified the admin site definition for comments so that users are shown as a raw id list. Thanks to James Bennett for the report and patch. 
Backport of r11601 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11602 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-08 13:32:23 +00:00
Luke Plant c557ea6c12 [1.1.X] Fixed #9674 - documented app_label. 
Thanks to andymckay for the report and jpaulett for the patch.

Backport for [11596] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11597 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-28 22:04:20 +00:00
James Bennett f8c97127bb [1.1.X] Fixed #11931: Removed mention of nonexistent get_sql() method for arguments to limit_choices_to. Since the correct reference involves undocumented ORM internals, this simply removes the reference entirely in favor of publicly-documented use of Q objects. Backport of [11591] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-23 23:41:35 +00:00
James Bennett 880a447497 [1.1.X] The 1.1.X branch has been created, so that needs to be past tense. Backport of [11588] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-22 21:21:45 +00:00
Russell Keith-Magee f6eb522a81 [1.1.X] Marked r11577 as merged 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11585 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-16 12:23:04 +00:00
Russell Keith-Magee a7dd69c079 [1.1.X] Fixed some ReST markup in admin installation docs. 
Merge of r11580 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-16 12:19:44 +00:00
Russell Keith-Magee 5074a43241 [1.1.X] Fixed counting error in admin installation overview docs. 
Merge of r11579 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-16 12:16:27 +00:00
Russell Keith-Magee a2c7fe52a8 [1.1.X] Fixed #11886 -- Corrected handling of F() expressions that use parentheses. Thanks to Brent Hagany for the report. 
Merge of r11581 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-16 12:12:54 +00:00
Justin Bronn 6febb7ef15 [1.1.X] Fixed #11827: Can now calculate extent in Oracle on tables with one point. 
Backport of r11577 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 17:46:44 +00:00
Russell Keith-Magee ba925def49 [1.1.X] Updated svnmerge properties 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 17:04:47 +00:00
Justin Bronn 5f68bf0182 [1.1.X] Fixed #11624: `render_to_kmz` no longer balks on non-ASCII data. 
Backport of r11527 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 16:14:58 +00:00
Russell Keith-Magee 0c222b61b4 [1.1.X] Fixed #11746 -- Marked a string for translation in the FR localflavor. Thanks to iapain for the report and patch. 
Merge of r11552 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:34:11 +00:00
Russell Keith-Magee e5b3ffcd37 [1.1.X] Fixed #11820 -- Corrected the spelling of Grace Hopper's name in a test. Thanks to shields@msrl.com for the report, and apologies to Admiral Hopper for the error. 
Merge of r11551 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:34:02 +00:00
Russell Keith-Magee db1768becd [1.1.X] Fixed #11862 -- Corrected an error in the Hebrew translation. Thanks to Adam Rimon for the fix. 
Merge of r11550 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:33:49 +00:00
Russell Keith-Magee d30dd3e9c9 [1.1.X] Fixed #11755 -- Added documentation for an edge case of FormSet usage. Thanks to ffualo for the suggestion. 
Merge of r11549 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:33:35 +00:00
Russell Keith-Magee 2075da3525 [1.1.X] Fixed #11740 -- Added extra detail on the behavior of ModelForms. Thanks to severian for the suggestion. 
Merge of r11548 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:33:18 +00:00
Russell Keith-Magee 05c087300c [1.1.X] Fixed #9414 -- Clarified the documentation on the permission decorators. Thanks to timo for the patch. 
Merge of r11547 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:33:09 +00:00
Russell Keith-Magee ceee67fba8 [1.1.X] Fixed #11873 -- Corrected typo in generic views docs. Thanks to Brett Cannon for the report. 
Merge of r11546 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:33:02 +00:00
Russell Keith-Magee e9d1a7e98a [1.1.X] Fixed #11073 -- Added documentation for SESSION_COOKIE_PATH. Thanks to liling for the report, and gsong for the patch. 
Merge of r11545 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11567 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:32:53 +00:00
Russell Keith-Magee b5ee4ad4ba [1.1.X] Fixed #10864 -- Clarified the role played by redirect_to_field in the login_required auth decorator. Thanks to trigeek38 for the suggestion, and SmileyChris for the draft. 
Merge of r11544 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:32:42 +00:00
Russell Keith-Magee 5312e7b40a [1.1.X] Fixed #9236 -- Added documentation on the dependencies of the admin. 
Merge of r11543 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11565 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:32:31 +00:00
Russell Keith-Magee 91bbfc57df [1.1.X] Added the SVN internal docs to the internal docs index. 
Merge of r11542 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:32:19 +00:00
Russell Keith-Magee 4d84513795 [1.1.X] Fixed #6047 -- Minor correction to the documentation regarding regex field lookups. Thanks to Richard D. Worth for the suggestion, and Steve Holden for the text. 
Merge of r11541 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:32:09 +00:00
Russell Keith-Magee bea1678a10 [1.1.X] Fixed #11359 -- Added a link to the signals topic guide in the signals reference. Thanks to tyson for the suggestion. 
Merge of r11540 and r11554 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:32:00 +00:00
Russell Keith-Magee 6988dad101 [1.1.X] Fixed #11592 -- Corrected the grammar in the queryset docs. Thanks to Shannon Bradshaw for the report. 
Merge of r11539 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11561 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:31:50 +00:00
Russell Keith-Magee d57f98b8e8 [1.1.X] Fixed #11628 -- Corrected the tutorial, removing instructions to update the year where that isn't required. Thanks to tommstein for the report. 
Merge of r11538 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:31:40 +00:00
Russell Keith-Magee 9815484905 [1.1.X] Fixed #11659 -- Corrected a minor typo in the v1.1 release notes. Thanks to agabel for the report. 
Merge of r11537 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:31:26 +00:00
Russell Keith-Magee 753d79a479 [1.1.X] Fixed #11728 -- Corrected a typo in a class name in the request/response docs. Thanks to Tommstein for the report. 
Merge of r11536 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11558 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:31:17 +00:00
Russell Keith-Magee 9908d7649f [1.1.X] Fixed #11780 -- Corrected a typo in the static file serving docs. 
Merge of r11535 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11557 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:31:04 +00:00
Russell Keith-Magee 1fde940414 [1.1.X] Fixed #11808 -- Corrected typo in admin docs. Thanks to kratorius for the patch. 
Merge of r11534 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11556 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:30:50 +00:00
Russell Keith-Magee 0fc36e4f91 [1.1.X] Fixed #11831 -- Corrected typo in comments docs. Thanks to gsf for the patch. 
Merge of r11533 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 06:30:36 +00:00
Russell Keith-Magee 10e3c9f1e0 [1.1.X] Fixed #11589 -- Corrected an argument in the shortcuts documentation. Thanks to tsaylor for the report. 
Merge of r11531 and r11532 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11553 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-09-13 04:54:48 +00:00