diff options
| author | Nathan Yergler <nathan@yergler.net> | 2011-10-01 12:08:58 -0700 |
|---|---|---|
| committer | Nathan Yergler <nathan@yergler.net> | 2011-10-01 12:08:58 -0700 |
| commit | 6bfbe0242653678c09258b7a642514d706153eac (patch) | |
| tree | d3e0c7f94f566886a6b80ce98d8a003465f4368f /mediagoblin/db/models.py | |
| parent | 0a8a3fc1571100aba3bd3a3dec98f5e9e252780b (diff) | |
| parent | 573aba86b58c2ab064d0d57ed0bbae6bdf9a2819 (diff) | |
| download | mediagoblin-6bfbe0242653678c09258b7a642514d706153eac.tar.lz mediagoblin-6bfbe0242653678c09258b7a642514d706153eac.tar.xz mediagoblin-6bfbe0242653678c09258b7a642514d706153eac.zip | |
Merge remote-tracking branch 'refs/remotes/upstream/master' into 569-application-middleware
Conflicts:
mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
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'] |