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

7448 Commits

Author SHA1 Message Date
James Tauber 2ea5e4c743 [1.1.X] Added myself to committers list 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-19 21:56:22 +00:00
Russell Keith-Magee 55b6f3cf21 Corrected an inconsistency in the documentation regarding the way to specify the locmem and dummy cache backend. Thanks to Jens Diemer for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-19 11:20:06 +00:00
Russell Keith-Magee 47f1330be1 [1.1.X] Fixed #12242 -- Corrected a problem with masking extra selects() in a DateQuerySet. Thanks to Alex Gaynor for his help debugging this one. 
Backport of r11748 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-19 04:37:26 +00:00
Brian Rosner 4cba436269 [1.1.X] Fixed #5034 -- honor request.urlconf in reverse and resolve. 
This enables {% url %} to honor request.urlconf set from process_request
middleware methods.

Thanks SmileyChris for the initial patch work.

Backport of [11740] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11741 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-16 01:59:54 +00:00
Russell Keith-Magee 7f2f6bc863 [1.1.X] Fixed #12204 -- Corrected the use of :djadmin: links in the testing docs, plus updated a lot of old-style markup in the django-admin docs. Thanks to Art_S for the report. 
Backport of r11734 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-12 13:59:35 +00:00
Russell Keith-Magee 6ec45f3cb4 [1.1.X] Fixed #12163 -- Corrected the unpickling of non-deferred models. Thanks to rfugger for the report and test case. 
Backport of r11732 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-11 13:08:33 +00:00
Russell Keith-Magee abd4344efe [1.1.X] Fixed #11144 -- When a to/from/cc header contains unicode, make sure the email addresses are parsed correctly (especially with regards to commas). Thanks to rmt for the patch. 
Backport of r11719 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-04 11:28:56 +00:00
Russell Keith-Magee 9a38c1cdb2 [1.1.X] Fixed #11849 -- Corrected handling of use_tls in the SMTP mail handler. Thanks to aromano for the report. 
Backport of r11714 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-04 02:01:54 +00:00
Justin Bronn a9c816c41b [1.1.X] Fixed #12101 -- `OGRGeometry` does not need to create a clone of the `SpatialReference` object upon assignment. 
Backport of r11707 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-03 06:18:52 +00:00
Russell Keith-Magee e3f07d2b4c [1.1.X] Fixed #12127 -- Corrected teardown of dateformat tests. Thanks to apollo13 for the report, and Karen Tracey for the debugging help. 
Backport of r11705 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-02 08:27:00 +00:00
Justin Bronn 30ebd268be [1.1.X] Fixed #12093 -- `LayerMapping` now takes into account model inheritance when looking for the geometry column; forgot to diable extent regression test on MySQL. 
Backport of r11703 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-02 02:24:01 +00:00
Karen Tracey e114f4403a [1.1.X] Repeat the setUp/tearDown changes made in r11699 for the tests 
converted in r11694. This allows the dateformat tests to pass
on Windows. 


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-01 23:52:31 +00:00
Karen Tracey 13d83908a4 [1.1.X] Changed setUp and tearDown for the tests converted from doctests in r11695 
to not assume TZ absolutely will be set in the environment. That environment
variable does not necessarily exist on Windows, it seems. 

r11699 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11700 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-01 23:13:59 +00:00
Karen Tracey 8061665c27 [1.1.X] (In [11697]) Fixed #12125 -- Fixed a typo in the generic views date_based test that caused it to fail in November. Thanks brutasse. 
r11697 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11698 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-01 22:16:14 +00:00
Russell Keith-Magee e109de3b7e [1.1.X] Fixed #12123 -- Updated the utils.dateformat test to be a unittest too, due to a dependency on the old dateformat test. 
Backport of r11695 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11696 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-01 04:54:56 +00:00
Russell Keith-Magee 801a8925fa [1.1.X] Fixed #12123 -- Refactored dateformat tests to use unittest. This is needed so that we have a reliable teardown that can reset the timezone at the end of the test. 
Backport of r11693 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-01 04:21:37 +00:00
Russell Keith-Magee fe9a45e514 [1.1.X] Fixed #12121 -- Modified __reduce__ on a model to avoid an infinite recursion problem that occurs on Python 2.4. Thanks to emulbreh for the report. 
Backport of r11691 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-01 03:06:44 +00:00
Karen Tracey 9e02b4a0e1 [1.1.X] Updated svnmerge metadata: block CSRF changesets, include those that have been backported in svnmerge-integrated. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-31 14:41:51 +00:00
Brian Rosner 53275a4775 [1.1.X] Fixed #11872 -- Instantiate the correct model in BaseInlineFormSet.__init__ when instance is None. Thanks tobias. 
Backport of [11688] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-30 09:12:52 +00:00
Brian Rosner a429943467 [1.1.X] Fixed #12115 -- Corrected typo in admin documentation. Thanks encinas. 
Backport of [11686] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-30 08:49:56 +00:00
Brian Rosner d45096437b [1.1.X] Updated INSTALL file 
setup.py does not require an Internet connection nor setuptools. That was
fixed in [3906].

Backport of [11684] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11685 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-30 08:24:45 +00:00
Russell Keith-Magee 72933294d2 [1.1.X] Fixed #12057 -- Corrected regression of caching performance when a model contained a callable default. Thanks to Michael Thornhill for the excellent assistance tracking this problem. 
Backport of r11681 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-29 14:36:10 +00:00
Jannis Leidel b1151bc2b3 [1.1.X] Added bio for myself 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-28 10:01:38 +00:00
Luke Plant ebe5405282 Added a no-op {% csrf_token %} tag to 1.1.X, to ease transition of apps to 1.2 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-27 21:50:58 +00:00
Jacob Kaplan-Moss 1ab0b23df6 [1.1.X] Fixed #11057: having no actions in the admin (`actions=None`) no longer messes up the layout. Thanks, rvdrijst. 
Backport of [11670] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-27 20:57:13 +00:00
Luke Plant 97ee7a3baf [1.1.X] Fixed #10996 - documented login CSRF vulnerabilities in the CsrfMiddleware 
1.1.X branch only fix - trunk is completely different now.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-27 00:38:28 +00:00
Karen Tracey d2b6f6c948 [1.1.X] Fixed #11961: Corrected a few typos in docs/testing.txt. Thanks to timo for the patch. 
Merge of r11599 from trunk.
Also updated svnmerge-integrated to reflect other changesets already backported,
and added a couple more that should not be merged to svnmerge-blocked.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-26 15:31:47 +00:00
Karen Tracey 88ec9d97cb [1.1.X] Block new features and fixes from svnmerge to 1.1.X branch. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-26 15:15:17 +00:00
Jacob Kaplan-Moss bf33627c63 [1.1.X] Fixed #11371: Made `django.test.Client.put()` work for non-form-data PUT (i.e. JSON, etc.). Thanks, phyfus. Backport of [11656] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-26 15:04:32 +00:00
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