Changeset d928813


Ignore:
Timestamp:
Apr 2, 2012 12:17:30 PM (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
social
Children:
d8ec473
Parents:
74a669d (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@…> (02/04/2012 12:17:30)
git-committer:
yomguy <yomguy@…> (02/04/2012 12:17:30)
Message:

Merge branch 'master' into social

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • telemeta/views/base.py

    r0d2f73e ra29e589  
    632632        previous, next = self.item_previous_next(item) 
    633633        mime_type = self.item_analyze(item) 
     634        #FIXME: use mimetypes.guess_type 
     635        if 'quicktime' in mime_type: 
     636            mime_type = 'video/mp4' 
     637 
    634638        playlists = get_playlists(request) 
    635639        public_access = get_public_access(item.public_access, str(item.recorded_from_date).split('-')[0], 
  • example/sandbox_sqlite/settings.py

    r47b7698 r74a669d  
    104104    'django.contrib.messages.middleware.MessageMiddleware', 
    105105    'django.middleware.locale.LocaleMiddleware', 
     106    'pagination.middleware.PaginationMiddleware', 
     107    'django.contrib.auth.backends.ModelBackend', 
     108    'socialregistration.contrib.facebook.auth.FacebookAuth', 
    106109) 
    107110 
     
    127130    'jsonrpc', 
    128131    'south', 
     132    'postman', 
     133    'pagination', 
     134    'socialregistration', 
     135    'socialregistration.contrib.facebook', 
    129136    'sorl.thumbnail', 
    130137) 
     
    152159EMAIL_HOST = 'localhost' 
    153160DEFAULT_FROM_EMAIL = 'webmaster@parisson.com' 
     161 
     162POSTMAN_AUTO_MODERATE_AS=True 
     163 
     164FACEBOOK_APP_ID = '348560078520326' 
     165FACEBOOK_SECRET_KEY = 'f6204a5468be878bfce8f0007455c022' 
     166FACEBOOK_REQUEST_PERMISSIONS = '' 
  • telemeta/templates/telemeta/base.html

    r8a5b1b5 rddaaf4c  
    6464<img src="{% url telemeta-images "logout.png" %}" alt="logout" style="vertical-align:middle" /></a> 
    6565{% else %} 
     66<div style="float: left;"> 
    6667<a href="{% url telemeta-flatpage "help" %}">{% trans "Help" %}</a> | 
    6768<a href="{% url telemeta-login %}?next={{ request.path|urlencode }}">{% trans "Sign in" %}</a> 
     69</div> 
     70<div style="float: right;;"> 
     71{% load facebook %} 
     72{% facebook_button %} 
     73</div> 
    6874{% endif %} 
    6975</div> 
Note: See TracChangeset for help on using the changeset viewer.