From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Tue, 24 Aug 2010 13:10:33 +0000 (-0400)
Subject: Merge branch 'melinath'
X-Git-Tag: philo-0.9~34
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/d1fa7611b6254a03dc07979b28f66aa3439efffb

Merge branch 'melinath'

* melinath:
  Corrected get_subpath on blogs and newsletters to fit the new paradigm.
  Implemented feeds for NewsletterView. Corrected BlogView/NewsletterView urlpatterns.
  Moved feed-related methods to a generic mixin.
  Added feeds to blogs.
  Implemented object deletion on null values. Added ModelChoiceWidget to ContentReferences.
  Display of current values functional.
  Display of ContainerFormSets functional; display of their values is not; saving of values, however, is.
  Initial new page admin commit. Working on faking the admin out through inlines instead of ModelAdmin methods.
  Implemented email change confirmation.
  Implemented EmailTokenGenerator and added password changing to the LoginMultiView.
  Implemented password resetting. Improved redirection on login.
  Implemented one-time login on account confirm.
  Token-based User registration functional
  WIP: Implementation of pended user creation using tokens. Needs some testing.
  Initial waldo commit. Implements abstract LoginMultiView and AccountMultiView to generically handle login situations for philo.
---

d1fa7611b6254a03dc07979b28f66aa3439efffb