Mercurial Mercurial > tralalere / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
virtualenv/web/res/patch/piston.diff
author veltr
Mon, 11 Jun 2012 15:10:18 +0200
changeset 55 f2befea2c2d1
parent 16 e37a29d23c86
permissions -rw-r--r--
Merge with b4b226944789aab5c07ccb3e476d03edae6d0e95
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
16
e37a29d23c86 First version of tralalere platform
ymh <ymh.work@gmail.com>
parents:
diff changeset 
     1
 
diff -r 278:c4b2d21db51a piston/models.py
e37a29d23c86 First version of tralalere platform
ymh <ymh.work@gmail.com>
parents:
diff changeset 
     2
 
@@ -118 +118 @@
e37a29d23c86 First version of tralalere platform
ymh <ymh.work@gmail.com>
parents:
diff changeset 
     3
 
    timestamp = models.IntegerField()
e37a29d23c86 First version of tralalere platform
ymh <ymh.work@gmail.com>
parents:
diff changeset 
     4
 
    is_approved = models.BooleanField(default=False)
e37a29d23c86 First version of tralalere platform
ymh <ymh.work@gmail.com>
parents:
diff changeset 
     5
 












e37a29d23c86
First version of tralalere platform



ymh <ymh.work@gmail.com>


parents: 

diff
changeset




     6


-   user = models.ForeignKey(User, null=True, blank=True, related_name='tokens')












e37a29d23c86
First version of tralalere platform



ymh <ymh.work@gmail.com>


parents: 

diff
changeset




     7


+   user = models.ForeignKey(User, null=True, blank=True, related_name='piston_tokens')












e37a29d23c86
First version of tralalere platform



ymh <ymh.work@gmail.com>


parents: 

diff
changeset




     8


    consumer = models.ForeignKey(Consumer)














tralalere