Mercurial Mercurial > platform / 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 grandjoncl
Thu, 11 Oct 2012 16:39:05 +0200
changeset 842 ca38abd140b3
parent 56 125fc6df230d
permissions -rw-r--r--
Corrections of the code for the embed popup. Functions are now in the embed_popup.js With chrome the player used to play the video even when it wasn't supposed to be displayed and kept playing when we hid the player. When we changed between div and iframe the player started even when it was suppose to be hidden. It's now solved.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22
03d02cf0bea7 Added text API, test Clients and Testcases
wakimd
parents:
diff changeset 
     1
 
diff -r 278:c4b2d21db51a piston/models.py
03d02cf0bea7 Added text API, test Clients and Testcases
wakimd
parents:
diff changeset 
     2
 
@@ -118 +118 @@
03d02cf0bea7 Added text API, test Clients and Testcases
wakimd
parents:
diff changeset 
     3
 
    timestamp = models.IntegerField()
03d02cf0bea7 Added text API, test Clients and Testcases
wakimd
parents:
diff changeset 
     4
 
    is_approved = models.BooleanField(default=False)
03d02cf0bea7 Added text API, test Clients and Testcases
wakimd
parents:
diff changeset 
     5
 







56






125fc6df230d
fusionner



cavaliet


parents: 
22

diff
changeset




     6


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







22






03d02cf0bea7
Added text API, test Clients and Testcases



wakimd


parents: 

diff
changeset




     7


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












03d02cf0bea7
Added text API, test Clients and Testcases



wakimd


parents: 

diff
changeset




     8


    consumer = models.ForeignKey(Consumer)














platform