Changeset 7d6cfb3


Ignore:
Timestamp:
May 2, 2012 4:33:40 PM (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, dj1.6, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, generic, lam, lam2, mapsv3, merge, nlivemulti, release/1.4.4, sabiod, server, storage, telecaster
Children:
733baa0
Parents:
d24c827 (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:40)
git-committer:
yomguy <yomguy@…> (02/05/2012 16:33:40)
Message:

Merge branch 'master' into develop

Files:
3 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, 
  • tools/dev/push.sh

    rcd6363d rd68b189  
    2222#echo "Update jimi.parisson.com:" 
    2323echo "Update angus.parisson.com:" 
    24 ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull origin master; \ 
    25                         cd /home/telemeta/telemeta-develop; git pull origin develop; \ 
     24ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull; \ 
     25                        cd /home/telemeta/telemeta-develop; git pull; \ 
    2626                        cd /home/telemeta/demo/; ./manage.py migrate telemeta --delete-ghost-migrations; 
    2727                        cd /home/telemeta/sandbox/; ./manage.py migrate telemeta --delete-ghost-migrations;  
Note: See TracChangeset for help on using the changeset viewer.