Malcolm Tredinnick e20f09c2d0 Fixed #10006 -- Avoid inadvertently using third-party "json" module. ... In r9707 we added a preference to use Python's standard json module (Python 2.6 and beyond). However, there is also a third-party module called json that was being picked up by accident if it was installed. It isn't API compatible, so bad things happened. This change avoids that problem. Patch from markmuetz. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9910 bcc190cf-cafb-0310-a4f2-bffc1f526a37		2009-02-27 05:14:11 +00:00
..
bin	Fixed #5522 -- Moved make-messages, compile-messages and daily-cleanup into django-admin.py.	2008-07-06 06:39:44 +00:00
conf	Closes #8836, Updated translation for Slovenian.	2009-02-13 11:04:19 +00:00
contrib	Invalidate the appropriate SITE_CACHE entry when saving a Site model.	2009-02-27 04:57:33 +00:00
core	Merge branch 'master' into upstream-trunk	2009-02-16 21:03:09 +00:00
db	Fixed #10290: do not use aliases when adding extra_selects to the GROUP BY clause, to generate compliant sql that will be accepted by Oracle.	2009-02-25 23:56:00 +00:00
dispatch	Fixed #8285: signal handlers that aren't functions work under DEBUG. This slightly loosens the sanity check, but things that are valid under production shouldn't fail under debug.	2008-08-25 18:24:05 +00:00
forms	Fixed 10075: Allowed saving of inline-edited models that use multi-table inheritance.	2009-02-03 14:02:09 +00:00
http	Fixed #8278: fixed `QueryDict.update(QueryDict)`. Thanks, julien.	2008-08-29 16:49:19 +00:00
middleware	Fixed #9199 -- We were erroneously only prepending "www" to the domain if we	2008-10-07 08:22:50 +00:00
shortcuts	Fixed #3511 -- Changed QuerySet.get() to return a MultipleObjectsReturned exception, rather than an assertion error. Thanks, Gary Wilson and cheeming.	2007-12-02 18:21:07 +00:00
template	Fixed #10014 -- Don't crash when using debug template tag inside a block node tag.	2009-01-16 08:59:02 +00:00
templatetags	Fixed #7460 -- Made the "cache" template tag always generate keys that can be	2008-08-25 04:52:55 +00:00
test	Fixed #9031 -- Clarified the error message when the label used to run a specific test case method doesn't name a valid test case class. Thanks to Thomas Guettler for the suggestion and patch.	2009-02-22 08:34:51 +00:00
utils	Fixed #10006 -- Avoid inadvertently using third-party "json" module.	2009-02-27 05:14:11 +00:00
views	Revised r9566 slightly to be backwards compatible with versions 1.0 - 1.0.2.	2009-01-09 12:41:07 +00:00
__init__.py	Bump version to 1.1 alpha 1 and add download_url for the eventual 1.1 alpha 1 packagee	2009-02-24 01:46:29 +00:00