{"shas":[["3269dd0709806386523d7d3415d8eddc2d13644b","754a23d23627182f97b81163eae632d59dfb1a52@ithinksw.com","Merge branch 'master' of git://github.com/melinath/philo\n\n* 'master' of git://github.com/melinath/philo:\n  Added feed length limit to FeedView. Implements feature #111.\n  Corrected LazyNavigationRecurser to mark its return value as safe.\n  Switched back to setting a {{ children }} variable, but set it to a lazy recurser instead of a rendered result. Switched item and children to be set in the context directly for easy access. Improved/updated recursenavigation docstring.\n  Refactored the RecurseNavigationNode to have less repetition. Switched from {{ children }} to {% recurse %} because it makes more sense to collect recursion only if needed.\n  Added a number of counting variables to the context when rendering shipherd navigation. Designed to mirror the variables generated when using a for loop.\n  Minor corrections to shipherd recursenavigation docstring.\n  Added CSRF cookie js to TagCreation.js... apparently it isn't in the admin by default. Resolves issue 83.\n  Added an admin action to NewsletterArticleAdmin to handle creating a NewsletterIssue from a selection of articles. Resolves issue 82.\n  Minor LazyContainerFinder cleanup. It's not really that lazy in practice...\n  Removed nodelist_crawl since nothing is using it and I'm starting to question its usefulness in general.\n  Built a clearer algorithm for finding a template's containers; added support for template block overrides cancelling out containers in that block, which resolves issue #90.\n  Corrected FeedView handling of incorrect Accept headers. Will now actually return 406 errors.\n  Genericized nodelist_crawl to just pass each node to a callback function. Overloaded the Template.containers callback to create a blockcontext for handling containers in overridden blocks as per issue 90 and to handle contentreference/contentlet generation in a single sweep.\n  Refactored ContainerForms to reflect a more suitable structure by storing the containers internally as a SortedDict. By handling containers more consistently, this commit resolves issue #89.\n  Removed apparently-vestigial Entity.attribute property.","Joseph Spiros"],["faa929ce6af603e83247f3f5f8c6f6c22aff48bc","b5b0f42cbd0e70186a1daa88977913a3dfed264b@gmail.com","Merge branch 'search'","Stephen Burrows"],["08f6ca2120d8c01bdc32b4c271772bde77db3865","b5b0f42cbd0e70186a1daa88977913a3dfed264b@gmail.com","Added feed_length to BlogViewAdmin.","Stephen Burrows"]],"repo":"melinath/philo","actor":"melinath","ref":"refs/heads/master","size":3,"head":"08f6ca2120d8c01bdc32b4c271772bde77db3865","actor_gravatar":"9557b8bc3ab994086ec3fbc1c266684e","push_id":25978435}