Changeset d559903


Ignore:
Timestamp:
Mar 21, 2012 3:09:11 PM (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
social
Children:
c0733aa
Parents:
24f8534 (diff), 98fa6e9 (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@…> (21/03/2012 15:09:11)
git-committer:
yomguy <yomguy@…> (21/03/2012 15:09:11)
Message:

Merge branch 'master' into social

Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/system.py

    rb707ce5 r98fa6e9  
    8484    user            = ForeignKey(User, unique=True, required=True) 
    8585    institution     = CharField(_('Institution')) 
    86     department      = CharField(_('Department')) 
    8786    function        = CharField(_('Function')) 
    8887    attachment      = CharField(_('Attachment')) 
  • example/sandbox_sqlite/settings.py

    r1c9efe4 r2c08ff6  
    8585    'django.contrib.messages.middleware.MessageMiddleware', 
    8686    'django.middleware.locale.LocaleMiddleware', 
     87    'pagination.middleware.PaginationMiddleware', 
     88    'django.contrib.auth.backends.ModelBackend', 
     89    'socialregistration.contrib.facebook.auth.FacebookAuth', 
    8790) 
    8891 
     
    106109    'jsonrpc', 
    107110    'south', 
     111    'postman', 
     112    'pagination', 
     113    'socialregistration', 
     114    'socialregistration.contrib.facebook', 
    108115) 
    109116 
     
    130137EMAIL_HOST = 'localhost' 
    131138DEFAULT_FROM_EMAIL = 'webmaster@parisson.com' 
     139 
     140POSTMAN_AUTO_MODERATE_AS=True 
     141 
     142FACEBOOK_APP_ID = '348560078520326' 
     143FACEBOOK_SECRET_KEY = 'f6204a5468be878bfce8f0007455c022' 
     144FACEBOOK_REQUEST_PERMISSIONS = '' 
  • telemeta/templates/telemeta/base.html

    rfabced9 r1f3e307  
    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.