Commit Graph

5044 Commits

Author SHA1 Message Date
Ramiro Morales 12fd6e1106 [1.1.X] Fixed #15306 -- Replaced 1.1.X implementation of admin changelist filtering security fix (r15031/r15033) with the one from trunk so another valid filter usage scenario (using model inheritance) is still possible. Thanks dbenamy for reporting this. Refs #15032.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-16 23:24:19 +00:00
James Bennett 24f2898b76 [1.1.X] Bump version number for impending security release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15474 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-09 03:06:37 +00:00
Carl Meyer 1966786d2d [1.1.X] Fixed security issue in AdminFileWidget. Release and disclosure forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15472 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-09 02:48:48 +00:00
Alex Gaynor 570a32a047 [1.1.X] Fixed a security issue in the file session backend. Disclosure and new release forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15469 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-09 02:14:24 +00:00
Alex Gaynor 408c5c873c [1.1.X] Fixed a security issue in the CSRF component. Disclosure and new release forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15466 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-09 02:07:35 +00:00
Luke Plant 274bd67c13 [1.1.X] Fixed #15103 - SuspiciousOperation with limit_choices_to and raw_id_fields
Thanks to natrius for the report.

This patch also fixes some unicode bugs in affected code.

Backport of [15347] from trunk. Backported to 1.1.X because this was
a regression caused by a security fix backported to 1.1.X.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15350 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-28 15:32:25 +00:00
Ramiro Morales 703dc82256 [1.1.X] Fixed #14999 -- Ensure that filters on local fields are allowed, and aren't caught as a security problem. Thanks to medhat for the report.
Backport of r15139 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-12 20:45:01 +00:00
James Bennett 334654fdf1 [1.1.X] Bump to 1.1.3 for security release.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15037 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 03:51:37 +00:00
Alex Gaynor 7f8dd9cbac [1.1.X] Fix a security issue in the auth system. Disclosure and new release forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@15036 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 03:47:58 +00:00
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
James Bennett 5d6b2966af [1.1.X] This branch is now 1.1.3 pre-alpha.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13257 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-14 05:56:34 +00:00
James Bennett 4333ca52fb [1.1.X] Bump to 1.1.2.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13256 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-14 05:45:12 +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
Jannis Leidel 8099fec855 [1.1.X] Fixed #12892 - Fixed unicode related bug in a utility function of the admindocs app that prevented it to be used in non-English environments together with certain versions of docutils.
Backport from trunk, r13192

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 11:24:16 +00:00
Jannis Leidel 868cf8093c [1.1.X] Fixed #13168 - Corrected the alignment of the admin inline headers for rtl languages. Thanks for the report and patch, benc.
Backport from trunk, r13191

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 11:23:59 +00:00
Russell Keith-Magee c7fc8891b1 [1.1.X] Fixed #13467 -- Corrected Japanese translation for password reset emails. Thanks to cdeyoung for the report.
Backport of r13084 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13086 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-04 08:16:06 +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
Nicola Larosa 0265a81449 [1.1.X] Updated the Italian translation
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-03 06:42:52 +00:00
Nicola Larosa 9c14f23946 [1.1.X] Italian translation updated by makemessages, to be fixed
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13075 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-03 05:57:16 +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
Karen Tracey ef0e10cccf [1.1.X] Fixed #13453: Corrected typo in template syntax error message. Thanks jheasly.
r13061 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13062 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-01 02:32:45 +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 868acb3a6c [1.1.X] Fixed #13431 -- Corrected a unicode literal in select widgets. Thanks to gutworth for the report.
Backport of r13036 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-30 14:12:36 +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 33f097e50b Python 2.3 compatibility: replaced rsplit with something that works on 2.3.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13030 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-27 13:40:52 +00:00
Russell Keith-Magee a43464d67e [1.1.X] Fixed #13404 -- Reworked module_has_submodule() to allow it to work under AppEngine. Thanks to Waldemar Kornewald for the report and testing help.
Backport of r13023 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-25 13:23:14 +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
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 2f6317f89c [1.1.X] Fixed #13387 -- Removed some duplicated departments in the French localflavor. Thanks to Pinaraf for the report.
Backport of r13006 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-20 15:07:14 +00:00
Russell Keith-Magee f282099832 [1.1.X] Fixed #13374 -- Corrected some more minor issues causing problems for PyPy. Thanks to Alex Gaynor for the report and patch.
Backport of r12998 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-19 11:57:04 +00:00
Justin Bronn be167b804d [1.1.X] Fixed #11810 -- Fixed typo and errors that prevented `modifiable` from working in the geographic admin. Thanks to Rob Coup for the bug report. Refs #12504.
Backport of r12995 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-16 16:45:59 +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 534dc44dba [1.1.X] Fixed #9427: Allow for autodiscover to load admin modules from apps in eggs. Thanks clint and metzen.
r12989 (and r12192 as a side-effect) from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 23:18:33 +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 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 65a9d73069 [1.1.X] Fixed #13332 -- Corrected the cleanup code in the test client to avoid a refcounting problem with signal handlers. This is a fix for the benefit of PyPy's hybrid GC. Thanks to Alex Gaynor for the report and patch.
Backport of r12964 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12965 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 02:43:03 +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 eca89ea9be [1.1.X] Fixed #12142 -- EmptyQuerySet.update() no longer updates all rows in the database
r12171 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12960 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 17:27:53 +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
Justin Bronn bf5d71f2a7 [1.1.X] Fixed #9437 -- Now close the connection after getting the PostGIS version during spatial backend initialization.
Backport of r12948 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-11 19:01:02 +00:00
Russell Keith-Magee dce7515bef [1.1.X] Fixed #13129 -- Corrected CSS on RTL layout when a changelist has admin actions and is filtered. Thanks to mksoft for the report and patch.
Backport of r12920 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 13:01:14 +00:00
Russell Keith-Magee 985c764a77 [1.1.X] Fixed #12260 -- Corrected CSS when using checkbox widgets on a ModelMultipleChoiceField in admin. Thanks to tiliv for the report and fix.
Backport of r12918 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 12:38:30 +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 17636ef999 [1.1.X] Fixed #12247 -- Corrected the way update queries are processed when the update only refers to attributes on a base class. Thanks to jsmullyan for the report, and matiasb for the fix.
Backport of r12910 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-03 11:47: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
Justin Bronn adfeb96227 [1.1.X] Fixed #13256 -- `OGRGeometry` no longer raises an exception when compared to instances of different types. Thanks, ninowalker for the bug report.
Backport of r12905 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-01 16:57:23 +00:00