Merge branch 'master' into umask

2014-01-20 17:35:05 -05:00 · 2014-01-20 17:35:05 -05:00 · b1b315d86c
commit b1b315d86c
parent f612f5c290 0bfa172543
14 changed files with 416 additions and 17 deletions
--- a/data/database.py
+++ b/data/database.py
@ -166,6 +166,7 @@ class EmailConfirmation(BaseModel):
  code = CharField(default=random_string_generator(), unique=True, index=True)
  user = ForeignKeyField(User)
  pw_reset = BooleanField(default=False)
+  new_email = CharField(null=True)
  email_confirm = BooleanField(default=False)
  created = DateTimeField(default=datetime.now)