Changeset 355a16a


Ignore:
Timestamp:
Apr 3, 2012 12:47:16 PM (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
security
Children:
ba683be
Parents:
3b50bb3 (diff), d36c84a (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@…> (03/04/2012 12:47:16)
git-committer:
yomguy <yomguy@…> (03/04/2012 12:47:16)
Message:

Merge branch 'master' into security

Location:
telemeta
Files:
2 added
4 edited

Legend:

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

    r8a5b1b5 rd36c84a  
    1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
     1<!DOCTYPE html> 
    22{% load i18n %} 
    33{% load telemeta_utils %} 
  • 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.