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

Merge branch 'waldo' of git://github.com/melinath/philo into melinath

* 'waldo' of git://github.com/melinath/philo:
  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.
---

ce7194d135941083c798194614a7f2c2e2bad5cc