diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-09-08 08:12:43 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-09-08 08:12:43 -0500 |
| commit | f373599bd745b7afa58013c4b6a17d1c59769cdb (patch) | |
| tree | 077aeb3825a2cad6871874d0cfa03bcfcd62fba7 /mediagoblin/db/models.py | |
| parent | 34fddf47f0b4f7cfa9fbd865bd9eb8ae96913ce4 (diff) | |
| parent | f7ab66707c4d5ef5941e13131dbf9ce2a8c7a875 (diff) | |
| download | mediagoblin-f373599bd745b7afa58013c4b6a17d1c59769cdb.tar.lz mediagoblin-f373599bd745b7afa58013c4b6a17d1c59769cdb.tar.xz mediagoblin-f373599bd745b7afa58013c4b6a17d1c59769cdb.zip | |
Merge branch 'gullydwarf-cfdv-f357_lost_password_functionality'
Conflicts:
mediagoblin/auth/routing.py
Diffstat (limited to 'mediagoblin/db/models.py')
| -rw-r--r-- | mediagoblin/db/models.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 792a515e..bbddada6 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -78,6 +78,8 @@ class User(Document): 'url' : unicode, 'bio' : unicode, # May contain markdown 'bio_html': unicode, # May contain plaintext, or HTML + 'fp_verification_key': unicode, # forgotten password verification key + 'fp_token_expire': datetime.datetime } required_fields = ['username', 'created', 'pw_hash', 'email'] |