Changeset e7240c8

Timestamp:

04/02/12 12:17:30 (14 months ago)

Author:

yomguy <yomguy@…>

Branches:

security

Children:

498c472

Parents:

2073f16 (diff), a29e589 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

yomguy <yomguy@…> (04/02/12 12:17:30)

git-committer:

yomguy <yomguy@…> (04/02/12 12:17:30)

Message:

Merge branch 'master' into security

Location:

telemeta

Files:

• views/base.py (modified) (1 diff)
• admin.py (modified) (1 diff)
• middleware.py (added)
• migrations/0009_auto__add_field_userprofile_last_session_key.py (added)
• models/system.py (modified) (2 diffs)
• templates/telemeta/inc/collection_related.html (modified) (1 diff)

telemeta/views/base.py

@@ -632 +632 @@
         previous, next = self.item_previous_next(item)
         mime_type = self.item_analyze(item)
+        #FIXME: use mimetypes.guess_type
+        if 'quicktime' in mime_type:
+            mime_type = 'video/mp4'
+
         playlists = get_playlists(request)
         public_access = get_public_access(item.public_access, str(item.recorded_from_date).split('-')[0],

telemeta/admin.py

@@ -6 +6 @@
 from telemeta.models.system import *
 from django.contrib import admin
+<<<<<<< HEAD
+from django.forms import CheckboxSelectMultiple
+=======
+>>>>>>> master
 from django.contrib.auth.models import User
 from django.contrib.auth.admin import UserAdmin

telemeta/models/system.py

@@ -42 +42 @@
 import django.db.models as models
 from django.forms import ModelForm
+from django.contrib.sessions.models import Session
 
 
@@ -88 +89 @@
     telephone       = CharField(_('Telephone'))
     expiration_date = DateField(_('Expiration_date'))
+    last_session_key = CharField(blank=True, null=True, max_length=40)
     init_password   = BooleanField(_('Password initialization'))
 

telemeta/templates/telemeta/inc/collection_related.html

@@ -78 +78 @@
                                  {% endif %}
                                 {% endif %}
-                                {% endif %}
+                              {% endif %}
                             </td>
                         </tr>