From: Joseph Spiros Date: Wed, 9 Feb 2011 15:35:36 +0000 (-0500) Subject: Merge branch 'master' of git://github.com/melinath/philo X-Git-Tag: philo-0.9~20 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/a79b7c9e4f8038db3795b482c78b2c6d7f64bebb Merge branch 'master' of git://github.com/melinath/philo * 'master' of git://github.com/melinath/philo: Added db_index to Contentlet/ContentReference names, AttributeValue fields, and Navigation keys. Added related_lookup_fields to shipherd admins and corrected its use on NodeAdmin/RedirectAdmin. Corrected TargetURLModel.get_target_url call of get_reverse_params. Corrected typo in BlogView feed creation. Minor fixes and additions to better_feeds following testing. Moved FeedMultiViewMixin to models.py and renamed to FeedView. Improved feed type support and clarified the API (based heavily on django.contrib.syndication.views.Feed). Adjusted NewsletterView and BlogView to use the new API. --- a79b7c9e4f8038db3795b482c78b2c6d7f64bebb