mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-06 02:39:12 +00:00
Code Issues 32 Releases Wiki Activity
7,863 Commits 29 Branches 451 Tags
Commit Graph

1156 Commits

Author SHA1 Message Date
Alex Gaynor
17084839fd [1.1.X] Fix a security issue in the admin. Disclosure and new release forthcoming. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15035 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-23 03:47:38 +00:00
Russell Keith-Magee
c179bd5cfb [1.1.X] Fixed #13514 -- Corrected the process of loading multiple javascript translation catalogs. Thanks to jtiai for the report, to Ramiro Morales for working out the test case, and to Ramiro and Jannis for their help on the fix. 
Backport of r13250 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-13 13:44:32 +00:00
Russell Keith-Magee
5a43a33161 [1.1.X] Fixed #13509 -- Modified the comment tests so that signal cleanup doesn't rely on garbage collection. Thanks to Alex Gaynor for the report and patch. 
Backport of r13204 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-10 12:43:05 +00:00
Russell Keith-Magee
125ea947df [1.1.X] Fixed #13469 -- Cleaned up the test case from r13085, and added some cache cleanup that matters for Python 2.3. Thanks to Karen and Alex for their help. 
Backport of r13095 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13096 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-04 14:55:04 +00:00
Karen Tracey
e28c0edbee [1.1.X] Fixed some Python 2.3 incompatibilities in new tests. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13093 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-04 13:31:25 +00:00
Russell Keith-Magee
bc9708735f [1.1.X] Fixed #13464 -- Reworked module_has_submodule to break the requirement for loader and finder to be the same class. Thanks to Alex Gaynor for the report and patch, and Brett Cannon for suggesting the approach. 
Backport of r13082 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-04 08:15:34 +00:00
Jannis Leidel
99a512300c [1.1.X] Fixed #13388 - Refined changes made in r12384 in the JavaScript i18n admin view. 
Backport of r13069 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13070 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-02 19:48:17 +00:00
Russell Keith-Magee
fe3b75e276 [1.1.X] Fixed #12851 -- Another attempt at fixing select_related() with inherited models, this time with only(). Thanks to phxx for the test case. 
Backport of r13059 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-30 16:37:54 +00:00
Russell Keith-Magee
2eb832a7e6 [1.1.X] Fixed #12851 -- Corrected the loading of values when select_related() is used on inherited models. Thanks to phxx for the report and test case. 
Backport of r13054 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-30 14:12:12 +00:00
Ian Kelly
6f4563aced [1.1.X] Fixed a bug preventing cursor variables from being passed as bind parameters in the oracle backend. Backport of r13042 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13043 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-28 17:15:11 +00:00
Karen Tracey
5f1ecdc51a Python 2.3 compatibility: Fixed a test to only run under 2.4+, since it fails due to a Ptyhon problem under 2.3. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13032 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-27 15:01:54 +00:00
Russell Keith-Magee
5226525736 [1.1.X] Fixed #13362 -- Disabled the test for bug #8245 under Python 2.3 due to differences in exception handling. 
Backport of r13021 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-24 07:10:15 +00:00
Russell Keith-Magee
58c1a67ff1 [1.1.X] Fixed #11764 -- Added a missing set of parentheses in a call calculating the select_related tables. Thanks to aurelio for the report and original patch, and wogan for the updated patch. 
Backport of r13019 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13020 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-23 14:30:29 +00:00
Karen Tracey
c8576fa674 [1.1.X] Python 2.3 compatibility: we still need the special sets import here. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-22 00:00:19 +00:00
Russell Keith-Magee
af48cad39e [1.1.X] Fixed #13396 -- Modified the SQLite introspection code to avoid a problem with unconsumed cursors on PyPy. Thanks to Alex Gaynor for the report and fix. 
Backport of r13016 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-21 23:50:00 +00:00
Russell Keith-Magee
0e996983d5 [1.1.X] Fixed #13389 -- Ensured that the app_loading test clears out the app cache at the end of each test, so that it doesn't interact badly with flush and other introspected database commands. Thanks to Karen for the report, and Ramiro Morales for the debugging hints. 
Backport of r13011 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-21 12:07:36 +00:00
Karen Tracey
1982c8b73e [1.1.X] Adjust the fr.py localflavor tests to account for r13007. 
Merge of applicable part of r13008.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13009 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-20 20:43:17 +00:00
Russell Keith-Magee
4807b02a83 [1.1.X] Fixed #13382 -- Modified a message used for testing purposes to allow test passes under PyPy. Thanks to Alex Gaynor for the report and patch. 
Backport of r13003 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-20 12:22:10 +00:00
Karen Tracey
f6b6e0f1d9 [1.1.X] Fixed #13360: For Python2.3 compatbility, don't pass iterators to sorted. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-16 15:47:06 +00:00
Russell Keith-Magee
e7ef1b220e [1.1.X] Fixed #13357 -- Minor changes to get Django running under PyPy. Thanks to Alex Gaynor for the patch. 
Backport of r12991 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-16 11:15:21 +00:00
Karen Tracey
8092d3b23f [1.1.X] Fixed #13353: Corrected a couple of tests that were dependent on dictionary ordering. Thanks Alex. 
r12984 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 19:14:52 +00:00
Karen Tracey
ce8367f1c8 [1.1.X] Fixed #13348: Restored ability to load models from apps in eggs. Thanks Ramiro and metzen for pointers on how to find out if a module loaded from an egg has a particular submodule. 
r12982 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 18:49:37 +00:00
Karen Tracey
a33c7673e4 [1.1.X] Fixed Python 2.4 incompatibility introduced in r12973. 
r12947 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-14 21:27:21 +00:00
Karen Tracey
ef6308db01 [1.1.X] Fixed #13335: Adjusted the r12950 fix to properly handle import errors resulting from nested calls to load_app. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-14 19:14:23 +00:00
Russell Keith-Magee
cf08ea496e [1.1.X] Refs #13227 -- Partial backport of r12865; backported the changes to Where tree cloning logic to ensure that unclonable objects in a where() clause don't break querying. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12963 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-13 02:00:46 +00:00
Karen Tracey
ee2b07c7fc [1.1.X] Added Pyton 2.3 compatibility import for use of set by some new tests. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12961 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-12 21:11:56 +00:00
Brian Rosner
f45e39ba8e Fixed #11957 -- exceptions in admin.py are no longer hidden after second request 
Before you had to restart runserver for the correct exception message to show
up again. Reverts fix in r9680 which has this side-affect.

Thanks to jarrow, carljm and ramiro for their work on the patch and tickets.

Backport of r12956 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-12 14:55:45 +00:00
Russell Keith-Magee
38056e82d7 [1.1.X] Fixed #13309 -- Ensure that delete() deletes everything it should delete(). Thanks to craig.kimerer@gmail.com for the report 
Backport of r12941 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-12 14:22:16 +00:00
Karen Tracey
46b9dd3048 [1.1.X] Fixed #11696: Changed app loading code so that it does not swallow import errors that used to be (prior to r10088) raised. 
r12950 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-12 12:43:39 +00:00
Russell Keith-Magee
c01735dee7 [1.1.X] Fixed #11949 -- Added a hook to allow ModelAdmin customization of the delete selected template. Thanks to bendavis78 for the report and patch, and Ramiro Morales for his cleanup work. 
Backport of r12916 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-05 12:08:45 +00:00
Russell Keith-Magee
0d6a776ccd [1.1.X] Fixed #12328 -- Corrected the handling of subqueries with ordering and slicing, especially when used in delete subqueries. Thanks to Walter Doekes for the report. 
This fixes a feature that isn't available under MySQL and Oracle (Refs #10099).

Backport of r12912 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-04 17:17:46 +00:00
Russell Keith-Magee
ac0aea8910 [1.1.X] Fixed #11956 -- Modified the handling of m2m relationships between subclasses. Thanks to nidi for the report, and astoneman for the suggestion on how to fix the problem. 
Backport of r12908 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-02 15:52:58 +00:00
Russell Keith-Magee
33052458c5 [1.1.X] Fixed #13259 -- Ensure that multiple calls to message() don't corrupt any extra message headers. Thanks to canburak for the report, and Andi Albrecht for the fix. 
Backport of r12901 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-01 15:25:54 +00:00
Russell Keith-Magee
7a7b9a0428 [1.1.X] Fixed #11916 -- Corrected handling of aggregation when there is a subquery provided in an extra(select=) clause. Thanks to jaklaassen@gmail.com for the report, and to tobias, paluh, Karen Tracey and Ian Kelly for their work on the fix. 
Backport of r12896 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-31 13:51:20 +00:00
Jannis Leidel
5a6446b443 [1.1.X] Fixed #12778 - Added media handling abilities to admin inlines. Thanks for the patch, pmclanahan. 
Backport from trunk, r12825.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-27 12:35:59 +00:00
Russell Keith-Magee
7733895382 [1.1.X] Fixed #12594 -- Ensured that a meaningful exception is raised when the urlconf_module is None. Thanks to buriy for the report and patch. 
Backport of r12854 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-26 15:15:55 +00:00
Karen Tracey
f0ed1ce683 [1.1.X] Fixed #13173: Made the admin_scripts tests pass when the running python executable has a space in its pathname. Thanks gabrielhurley. 
r12842 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-23 18:56:37 +00:00
Russell Keith-Magee
752856530f [1.1.X] Fixed #12612 -- Corrected handling of parameter formatting in SQLite backend so that executemany raises exceptions when bad parameter counts are provided. Thanks to Niels <niels@pythonheads.nl> for the report, and Gabriel Hurley for the help narrowing down the problem. 
Backport of r12836 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12837 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-23 14:08:31 +00:00
Karen Tracey
ef41bd405e [1.1.X] Fixed #12554 again: Corrected regression in silencing attribute lookups introduced in r12824, plus added a test for this so it doesn't regress again. 
r12834 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-22 19:16:31 +00:00
Karen Tracey
c2267602cb [1.1.X] Fixed #12764: Avoid exceeding psycopg1 limits in the views tests. 
r12832 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12833 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-22 13:29:26 +00:00
Karen Tracey
740c974541 [1.1.X] Fixed #12822: Don't copy the _aggregate_select_cache when cloning a query set, 
as that can lead to incorrect SQL being generated for the query. Thanks to mat
for the report and test, tobias for the fix, and Alex for review. 

r12830 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-21 20:54:24 +00:00
Karen Tracey
df010f0a1f [1.1.X] Fixed #12554: Silence exceptions that have specified silent_variable_failure=True. Thanks Thomas Steinacher, copelco, mlavin. 
r12823 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-20 20:31:57 +00:00
Karen Tracey
8badb75876 [1.1.X] Fixed #12239: Fixed results of gte and lt queries when comparing floats to integer field values. 
Thanks waverider, aroy, SmileyChris, and pmclanahan. 


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-20 18:04:10 +00:00
Russell Keith-Magee
4d00ac86ee [1.1.X] Fixed #12851 -- Corrected the interaction of defer() with select_related(). Thanks to ruosteinen for the report. 
Backport of r12817 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-20 15:42:18 +00:00
Karen Tracey
eb1c7b033d [1.1.X] Fixed #12707. Admin action messages are no longer displayed when submitting list_editable content. Thanks, copelco. 
and 

Fixed #12962: Made admin delete action work again. Thanks ptone, skevy, mlavin and anyone else I've missed. 

r12525 and r12813 from trunk, together to avoid the regression introduced by r12525 alone.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-20 15:23:10 +00:00
Russell Keith-Magee
9d5fb83b09 [1.1.X] Fixed #13152 -- Ensure the test client saves the session before writing the session key to the cookie, in case the session engine changes the session key. 
Backport of r12806 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12807 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-19 05:43:32 +00:00
Karen Tracey
16850856f5 [1.1.X] Changed the comments post view code to avoid raising an exception if handed invalid data for the object pk. Thanks to Leo for the test. 
r12800 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-16 22:45:42 +00:00
Karen Tracey
e15c850f1b [1.1.X] Fixed #12105: Corrected handling of isnull=False lookups in admin. Thanks marcob, Travis Cline, gabrielhurley. 
r12795 backport from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-16 19:08:49 +00:00
Russell Keith-Magee
c64669a614 [1.1.X] Fixed #13114 -- Modified escapejs to produce output that is JSON compliant. Thanks to David Danier for the report. 
Backport of r12780 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-15 08:06:47 +00:00
Karen Tracey
ef92f4fdd9 [1.1.X] Made a Python 2.3 compatibility test fix. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-14 20:30:18 +00:00