Merge branch 'waldo' of git://github.com/melinath/philo into melinath
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Tue, 24 Aug 2010 13:10:07 +0000 (09:10 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Tue, 24 Aug 2010 13:10:07 +0000 (09:10 -0400)
commitce7194d135941083c798194614a7f2c2e2bad5cc
treedb4b1ea081adbe352a2194aaa6f7faeafaf7e878
parente06925fc9be46b2c07863440212600b2e7ecb597
parent4f879ac556e18e95115681613d7e8d9b1e6b5333
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.