{"ref":"refs/heads/master","commits":[{"author":{"name":"Stephen Burrows","email":"b5b0f42cbd0e70186a1daa88977913a3dfed264b@gmail.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/24e2fb6a7c76c9a62dd6932f63b5dcfcbc1281ee","message":"Added ordering to NavigationItemInline and removed the extra form a) because it's unnecessary, and b) to avoid grappelli issue #337.","sha":"24e2fb6a7c76c9a62dd6932f63b5dcfcbc1281ee"},{"author":{"name":"Joseph Spiros","email":"754a23d23627182f97b81163eae632d59dfb1a52@ithinksw.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/148d23c4d83c672dfde4bd23d27b46857be8339f","message":"Merge branch 'master' of git://github.com/lapilofu/philo into develop\n\n* 'master' of git://github.com/lapilofu/philo:\n  Small correction to a bug that was raising an error on the account_required method of AccountMultiView in instances where no manage_account_page is specified. 'node' should be instead 'request.node'.","sha":"148d23c4d83c672dfde4bd23d27b46857be8339f"},{"author":{"name":"Joseph Spiros","email":"754a23d23627182f97b81163eae632d59dfb1a52@ithinksw.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/93eac03cfd379525b6cf41825b14a5d37cd03505","message":"Merge branch 'develop' of git://github.com/melinath/philo into develop\n\n* 'develop' of git://github.com/melinath/philo:\n  Added ordering to NavigationItemInline and removed the extra form a) because it's unnecessary, and b) to avoid grappelli issue #337.\n  Added memoization to TargetURLModel.get_target_url.\n  Removed unnecessary foreign key evaluations from MultiView subclass urlpatterns and get_reverse_params().\n  Cleaned up shipherd docs.\n  Added philo-root reversal caching to Node.construct_url.\n  Pre-fetching the contentreference content may have been premature optimization. Switched to a simple fetch, as it seems to run slightly faster.\n  Minor correction to ContainerContext.get_references().\n  Moved caching of contentlets/contentreferences so that (for example) a page with only contentlets will not fetch content references. Set up content references to pre-fetch all related pieces of content to save queries.\n  Removed template container discovery in favor of (potentially) larger queries.\n  Moved container finding code into philo/utils/templates, along with template utils from philo/utils. Moved initial container fetching code for container template tags from ContainerContext.__init__ to ContainerNode.get_container_content and cleaned things up a little.\n  Removed automatic interpretation of contentlets as templates as per issue #168.\n  Tweaked the FeedView API slightly to pass the object from get_object into the get_items callback. This allows for FeedViews that do not have FK relationships to the object.\n  A fair amount of effort is wasted getting container content. Initial commit of a branch to fix that. There's a large speedup on container fetching, but the container detection algorithm is prohibitively slow. Should be sped up or bypassed.\n  Added link generation example, and fixed a typo.\n  Note about context processor in Shipherd tutorial.","sha":"93eac03cfd379525b6cf41825b14a5d37cd03505"},{"author":{"name":"Harris Lapiroff","email":"e98350fc5a1cde501fd67e78f2faacfd41c21dde@chromamine.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/a47d033050dd245899d82b11da731a0de551264b","message":"Made the embed widget javascript work by overloading the dismissRelatedLookupPopup function.","sha":"a47d033050dd245899d82b11da731a0de551264b"},{"author":{"name":"Harris Lapiroff","email":"e98350fc5a1cde501fd67e78f2faacfd41c21dde@chromamine.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/759d24d246282fe358a867b4f98fed36308c9a30","message":"Updated styles to work in the original admin. Updated the javascript to overload the dismissAddAnotherPopup function as well.","sha":"759d24d246282fe358a867b4f98fed36308c9a30"},{"author":{"name":"Harris Lapiroff","email":"e98350fc5a1cde501fd67e78f2faacfd41c21dde@chromamine.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/24364abd46e52742e4a97af90ee6ed7dbf53ebd5","message":"Updated the grappelli styles to override the default styles.","sha":"24364abd46e52742e4a97af90ee6ed7dbf53ebd5"},{"author":{"name":"Stephen Burrows","email":"b5b0f42cbd0e70186a1daa88977913a3dfed264b@gmail.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/c927b03ad4dbc6fca8dfbbc59d378435208d2fdd","message":"Moved to a more flexible BlogView method arrangement which leverages the general presence of the results of get_object to better provide certain functionality.","sha":"c927b03ad4dbc6fca8dfbbc59d378435208d2fdd"},{"author":{"name":"Joseph Spiros","email":"754a23d23627182f97b81163eae632d59dfb1a52@ithinksw.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/6dc154ec98d58159b3e75447ce7b7fe5642acec4","message":"Merge branch 'embed-widget' of git://github.com/lapilofu/philo into develop\n\n* 'embed-widget' of git://github.com/lapilofu/philo:\n  Updated the grappelli styles to override the default styles.\n  Updated styles to work in the original admin. Updated the javascript to overload the dismissAddAnotherPopup function as well.\n  Made the embed widget javascript work by overloading the dismissRelatedLookupPopup function.\n  Made the embed widget automatically generate URLs based on the ADMIN_URL global, which is provided by Grappelli. Unfortunately, this introduces a dependency on Grappelli. I'll return to this branch at a later date when my thinking is clearer.\n  Initial work on a widget for TemplateFields that allows javascript selection of an object to embed.","sha":"6dc154ec98d58159b3e75447ce7b7fe5642acec4"},{"author":{"name":"Stephen Burrows","email":"b5b0f42cbd0e70186a1daa88977913a3dfed264b@gmail.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/d0dbd3635a4c1d1c47040fd17f5a8d2bec08a7e9","message":"Merge remote-tracking branch 'ithinksw/develop' into develop","sha":"d0dbd3635a4c1d1c47040fd17f5a8d2bec08a7e9"},{"author":{"name":"Stephen Burrows","email":"b5b0f42cbd0e70186a1daa88977913a3dfed264b@gmail.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/949db689dc364fbff5384cd24dc8c1a9892369ab","message":"Initial philo commit to use django-taggit instead of native tags.","sha":"949db689dc364fbff5384cd24dc8c1a9892369ab"},{"author":{"name":"Stephen Burrows","email":"b5b0f42cbd0e70186a1daa88977913a3dfed264b@gmail.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/2e6ad400272d774b72f682bc9f843379b03382b2","message":"Removed references to oberlin-specific models.","sha":"2e6ad400272d774b72f682bc9f843379b03382b2"},{"author":{"name":"Stephen Burrows","email":"b5b0f42cbd0e70186a1daa88977913a3dfed264b@gmail.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/5629695bf0cb97b135eb076caf92e0382b2d8290","message":"Merge branch 'hotfix/oberlin_references' into taggit","sha":"5629695bf0cb97b135eb076caf92e0382b2d8290"},{"author":{"name":"Stephen Burrows","email":"b5b0f42cbd0e70186a1daa88977913a3dfed264b@gmail.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/f5ef756179b62eb9a87983936c2576586632d8d7","message":"Removed oberlin references.","sha":"f5ef756179b62eb9a87983936c2576586632d8d7"},{"author":{"name":"Stephen Burrows","email":"b5b0f42cbd0e70186a1daa88977913a3dfed264b@gmail.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/d72b83ef71cdd8234a9ed5c149577e29a685f42f","message":"Added django-taggit extra requirement to setup.py.","sha":"d72b83ef71cdd8234a9ed5c149577e29a685f42f"},{"author":{"name":"Stephen Burrows","email":"b5b0f42cbd0e70186a1daa88977913a3dfed264b@gmail.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/d918e1993166047a20e3f8babd538afda214f7c0","message":"Removed TagCreation.js and the admin widget that used it.","sha":"d918e1993166047a20e3f8babd538afda214f7c0"},{"author":{"name":"Stephen Burrows","email":"b5b0f42cbd0e70186a1daa88977913a3dfed264b@gmail.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/a6694613ce70707661b795a121ef126b11c1777a","message":"Reverted TemplateField parent to models.TextField and moved EmbedWidget into philo.admin.widgets. Added EmbedWidget use on the appropriate ModelAdmins. Cleaned up ContentletAdmin and ContentReferenceAdmin.","sha":"a6694613ce70707661b795a121ef126b11c1777a"},{"author":{"name":"Stephen Burrows","email":"b5b0f42cbd0e70186a1daa88977913a3dfed264b@gmail.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/40ec2b268e9746ac1c4f878cf13f7bece1d8e2a1","message":"Overrides TemplateField widget on admin container forms instead of on the ModelAdmin.","sha":"40ec2b268e9746ac1c4f878cf13f7bece1d8e2a1"},{"author":{"name":"Stephen Burrows","email":"b5b0f42cbd0e70186a1daa88977913a3dfed264b@gmail.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/b1edf55e0d8cf076f4caddd78ea21575f72c23cf","message":"Minor correction to EmbedWidget.js to handle window names with dashes.","sha":"b1edf55e0d8cf076f4caddd78ea21575f72c23cf"},{"author":{"name":"Stephen Burrows","email":"b5b0f42cbd0e70186a1daa88977913a3dfed264b@gmail.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/37f95f6fd3e1da107a0eaf28c516e71206100bf4","message":"Corrections to Blog.entry_tags to use taggit APIs. Tweaks to penfield migration 0005 because of South issue 428 (and some incorrect filters obscured by that issue.)","sha":"37f95f6fd3e1da107a0eaf28c516e71206100bf4"},{"author":{"name":"Stephen Burrows","email":"b5b0f42cbd0e70186a1daa88977913a3dfed264b@gmail.com"},"url":"https://api.github.com/repos/lapilofu/philo/commits/c79bb6f20ff4100201f23a5d521aaa39dfc1c291","message":"Added a 'contributing' page to the philo docs. This is meant primarily as an initial effort, which can be expanded upon more later.","sha":"c79bb6f20ff4100201f23a5d521aaa39dfc1c291"}],"head":"61b73fe068172f02d6c47e2b5387161919ec9618","size":40,"push_id":49665591}