Changeset 498c472


Ignore:
Timestamp:
Apr 2, 2012 12:27:38 PM (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
security
Children:
a5ab1ae
Parents:
e7240c8 (diff), bfc6b5f (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@…> (02/04/2012 12:27:38)
git-committer:
yomguy <yomguy@…> (02/04/2012 12:27:38)
Message:

Merge branch 'master' into security

Location:
telemeta
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • telemeta/views/base.py

    ra29e589 rbfc6b5f  
    931931            return render(request, 'telemeta/messages.html', {'description' : description}) 
    932932 
     933        #FIXME: MP4 handling in TimeSide 
     934        if 'mp4' in extension: 
     935            mime_type = 'video/mp4' 
     936            video = item.file.path 
     937            response = HttpResponse(stream_from_file(video), mimetype = mime_type) 
     938            response['Content-Disposition'] = 'attachment' 
     939            return response 
     940 
    933941        for encoder in self.encoders: 
    934942            if encoder.file_extension() == extension: 
  • telemeta/admin.py

    rbfa68c2 rf83d820  
    66from telemeta.models.system import * 
    77from django.contrib import admin 
     8<<<<<<< HEAD 
     9from django.forms import CheckboxSelectMultiple 
     10======= 
     11>>>>>>> master 
    812from django.contrib.auth.models import User 
    913from django.contrib.auth.admin import UserAdmin 
  • telemeta/models/system.py

    rbfa68c2 rf83d820  
    4242import django.db.models as models 
    4343from django.forms import ModelForm 
     44from django.contrib.sessions.models import Session 
    4445 
    4546 
     
    8889    telephone       = CharField(_('Telephone')) 
    8990    expiration_date = DateField(_('Expiration_date')) 
     91    last_session_key = CharField(blank=True, null=True, max_length=40) 
    9092    init_password   = BooleanField(_('Password initialization')) 
    9193 
  • telemeta/templates/telemeta/inc/collection_related.html

    r28fa06b r5a09eb7  
    7878                                 {% endif %} 
    7979                                {% endif %} 
    80                                 {% endif %} 
     80                              {% endif %} 
    8181                            </td> 
    8282                        </tr> 
Note: See TracChangeset for help on using the changeset viewer.