http://geodjango.orghttp://geodjango.com/hg/gis-multi-db/ en-us gis-multi-db Changelog gis-multi-db Changelog Merged with latest upstream changes (git rev 93feb6b91caf0865743b1f3a10f68d1deff43aba). http://geodjango.orghttp://geodjango.com/hg/gis-multi-db/rev/802a89178dd2 Justin Bronn <jbronn@geodjango.org> Fri, 11 Dec 2009 17:11:04 -0600 Resolved merge conflicts http://geodjango.orghttp://geodjango.com/hg/gis-multi-db/rev/755e8678a99a Alex Gaynor <alex.gaynor@gmail.com> Wed, 09 Dec 2009 18:06:03 -0500 Merge commit 'django/master' http://geodjango.orghttp://geodjango.com/hg/gis-multi-db/rev/7bad72d94e5f Alex Gaynor <alex.gaynor@gmail.com> Wed, 09 Dec 2009 18:05:30 -0500 Implemented 'smart if' template tag, allowing filters and various operators to be used in the 'if' tag http://geodjango.orghttp://geodjango.com/hg/gis-multi-db/rev/cb918de289e8
Thanks to Chris Beaven for the initial patch, Fredrik Lundh for the basis
of the parser methodology and Russell Keith-Magee for code reviews.

There are some BACKWARDS INCOMPATIBILITIES in rare cases - in particular, if
you were using the keywords 'and', 'or' or 'not' as variable names within
the 'if' expression, which was previously allowed in some cases.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11806 bcc190cf-cafb-0310-a4f2-bffc1f526a37]]> lukeplant <lukeplant@bcc190cf-cafb-0310-a4f2-bffc1f526a37> Wed, 09 Dec 2009 22:40:36 +0000 Resolve merge conflicts. http://geodjango.orghttp://geodjango.com/hg/gis-multi-db/rev/9b663d38ae55 Alex Gaynor <alex.gaynor@gmail.com> Wed, 09 Dec 2009 12:04:46 -0500 Merge commit 'django/master' http://geodjango.orghttp://geodjango.com/hg/gis-multi-db/rev/3481f0821c29 Alex Gaynor <alex.gaynor@gmail.com> Wed, 09 Dec 2009 12:03:27 -0500 Fixed #4604 - Configurable message passing system, supporting anonymous users http://geodjango.orghttp://geodjango.com/hg/gis-multi-db/rev/fdd725ed9892
This deprecates User.message_set in favour of a configurable messaging
system, with backends provided for cookie storage, session storage and
backward compatibility.

Many thanks to Tobias McNulty for the bulk of the work here, with
contributions from Chris Beaven (SmileyChris) and lots of code review from
Russell Keith-Magee, and input from many others. Also credit to the authors
of various messaging systems for Django whose ideas may have been pinched
:-)



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11804 bcc190cf-cafb-0310-a4f2-bffc1f526a37]]> lukeplant <lukeplant@bcc190cf-cafb-0310-a4f2-bffc1f526a37> Wed, 09 Dec 2009 16:57:23 +0000 Optimised use of 'in' operator on QuerySet using an explicit __contains__ method. http://geodjango.orghttp://geodjango.com/hg/gis-multi-db/rev/762b1e3a5fef
Without this change, use of 'in' on a QuerySet resulted in ._result_cache
being fully populated, which sometimes is unnecessary work.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@11803 bcc190cf-cafb-0310-a4f2-bffc1f526a37]]> lukeplant <lukeplant@bcc190cf-cafb-0310-a4f2-bffc1f526a37> Wed, 09 Dec 2009 16:07:21 +0000 Added section info on top-level use of django.conf.settings to 'contributing' documentation http://geodjango.orghttp://geodjango.com/hg/gis-multi-db/rev/a1dae372aac2


git-svn-id: http://code.djangoproject.com/svn/django/trunk@11802 bcc190cf-cafb-0310-a4f2-bffc1f526a37]]> lukeplant <lukeplant@bcc190cf-cafb-0310-a4f2-bffc1f526a37> Wed, 09 Dec 2009 12:47:50 +0000 Fixed #12340 -- `BaseGenericInlineFormSet.get_queryset` now returns an ordered queryset. http://geodjango.orghttp://geodjango.com/hg/gis-multi-db/rev/487163bb810b

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11800 bcc190cf-cafb-0310-a4f2-bffc1f526a37]]> jbronn <jbronn@bcc190cf-cafb-0310-a4f2-bffc1f526a37> Wed, 09 Dec 2009 03:49:25 +0000