Changeset bb79eb5

Timestamp:

04/06/12 10:14:34 (14 months ago)

Author:

yomguy <yomguy@…>

Branches:

security

Children:

f3ef7df

Parents:

ba683be (diff), e5778ef (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/06/12 10:14:34)

git-committer:

yomguy <yomguy@…> (04/06/12 10:14:34)

Message:

Merge branch 'master' into security

Location:

telemeta

Files:

• htdocs/images/item.png (modified) (previous)
• htdocs/images/item_title.png (modified) (previous)
• htdocs/images/tw_hd_bg.png (added)
• htdocs/images/user_tr.png (added)
• templates/telemeta/base.html (modified) (1 diff)
• views/base.py (modified) (3 diffs)
• 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/templates/telemeta/base.html

@@ -65 +65 @@
 {% else %}
 <a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> |
-<a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a>
+<a href="{% url telemeta-login %}">{% trans "Sign in" %}</a>
 {% endif %}
 </div>

telemeta/views/base.py

@@ -102 +102 @@
 
 def stream_from_file(__file):
-    chunk_size = 0x10000
+    chunk_size = 0x100000
     f = open(__file, 'r')
     while True:
@@ -683 +683 @@
         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'
 
         if request.method == 'POST':
@@ -975 +978 @@
                     pass
             response = HttpResponse(stream_from_file(audio), mimetype = mime_type)
+#            fsock = open(audio, 'r')
+#            response = HttpResponse(fsock, mimetype = mime_type)
         else:
             media = self.cache_export.dir + os.sep + file

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)
 
     class Meta(MetaCore):

telemeta/templates/telemeta/inc/collection_related.html

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