From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Thu, 17 Jun 2010 08:05:44 +0000 (-0400)
Subject: Merge git://github.com/melinath/philo into melinath
X-Git-Tag: philo-0.9~78^2~2
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/0c94e37b081bc3aa3a903af6ad0b5eb76def7924

Merge git://github.com/melinath/philo into melinath

* git://github.com/melinath/philo:
  Fixed collapse classes
  Added contentlet unicode and fixed container context bug.
  Made referencing containers optional on pages. Fixes a bug.
  Added File unicode.
  Last random entry before more organized approach. Added documentation/admin display information and membersof templatetag. Fixed minor admin/template bugs.
  Reopened treechanges. Moved validation language to validators.py. Abstracted NodeForm to TreeForm.
  Added admin form validation to prevent: 1. a treemodel being its own parent (uses a validate_parents method added to the model.) 2. a node having the same path (i.e. parent+slug) as another Also added a ModelAdmin for the File model.
  Went back and fixed spacing issues with last cleanup. Also added some list display options to the redirect, template and page models to improve the admin site.
  Last random entry before more organized approach. Added documentation/admin display information and membersof templatetag. Fixed minor admin/template bugs.
  Reopened treechanges. Moved validation language to validators.py. Abstracted NodeForm to TreeForm.
  Added admin form validation to prevent: 1. a treemodel being its own parent (uses a validate_parents method added to the model.) 2. a node having the same path (i.e. parent+slug) as another Also added a ModelAdmin for the File model.
  Went back and fixed spacing issues with last cleanup. Also added some list display options to the redirect, template and page models to improve the admin site.
---

0c94e37b081bc3aa3a903af6ad0b5eb76def7924