Changeset bb79eb5


Ignore:
Timestamp:
04/06/12 10:14:34 (2 years 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:
4 added
7 edited

Legend:

Unmodified
Added
Removed
  • telemeta/templates/telemeta/base.html

    rd36c84a r2c4c2e5b  
    6565{% else %} 
    6666<a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> | 
    67 <a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a> 
     67<a href="{% url telemeta-login %}">{% trans "Sign in" %}</a> 
    6868{% endif %} 
    6969</div> 
  • telemeta/views/base.py

    r4fa6f4b r2c4c2e5b  
    102102 
    103103def stream_from_file(__file): 
    104     chunk_size = 0x10000 
     104    chunk_size = 0x100000 
    105105    f = open(__file, 'r') 
    106106    while True: 
     
    683683        previous, next = self.item_previous_next(item) 
    684684        mime_type = self.item_analyze(item) 
     685        #FIXME: use mimetypes.guess_type 
     686        if 'quicktime' in mime_type: 
     687            mime_type = 'video/mp4' 
    685688 
    686689        if request.method == 'POST': 
     
    975978                    pass 
    976979            response = HttpResponse(stream_from_file(audio), mimetype = mime_type) 
     980#            fsock = open(audio, 'r') 
     981#            response = HttpResponse(fsock, mimetype = mime_type) 
    977982        else: 
    978983            media = self.cache_export.dir + os.sep + file 
  • 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

    r2592b8e r3b50bb3  
    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 
    9193    class Meta(MetaCore): 
  • 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.