Changeset eb1356d


Ignore:
Timestamp:
02/05/2012 16:33:41 (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
social
Parents:
4afba25 (diff), 57305a5 (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/05/2012 16:33:41)
git-committer:
yomguy <yomguy@…> (02/05/2012 16:33:41)
Message:

Merge branch 'master' into social

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • telemeta/models/format.py

    rc8cdfbe r57305a5  
    8383 
    8484    def __unicode__(self): 
    85         return self.original_code 
     85        return self.original_format 
    8686 
    8787    @property 
  • telemeta/views/base.py

    r03ca023 r57305a5  
    660660            last_revision = None 
    661661 
    662         physical_format = item.original_format.original_format 
     662        physical_format = item.original_format 
    663663 
    664664        return render(request, template, 
  • example/sandbox_sqlite/settings.py

    re12b60a8 r0edb535  
    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) 
     
    158165DEFAULT_FROM_EMAIL = 'webmaster@parisson.com' 
    159166 
     167POSTMAN_AUTO_MODERATE_AS=True 
     168 
     169FACEBOOK_APP_ID = '348560078520326' 
     170FACEBOOK_SECRET_KEY = 'f6204a5468be878bfce8f0007455c022' 
     171FACEBOOK_REQUEST_PERMISSIONS = '' 
  • telemeta/templates/telemeta/base.html

    r2c4c2e5b rb166a2e  
    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> | 
    67 <a href="{% url telemeta-login %}">{% trans "Sign in" %}</a> 
     68<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.