Changeset 7d6cfb3

Timestamp:

05/02/12 16:33:40 (13 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, generic, lam, nlivemulti, release/1.4.4, storage

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@…> (05/02/12 16:33:40)

git-committer:

yomguy <yomguy@…> (05/02/12 16:33:40)

Message:

Merge branch 'master' into develop

Files:

• telemeta/models/format.py (modified) (1 diff)
• telemeta/views/base.py (modified) (1 diff)
• tools/dev/push.sh (modified) (1 diff)

telemeta/models/format.py

@@ -83 +83 @@
 
     def __unicode__(self):
-        return self.original_code
+        return self.original_format
 
     @property

telemeta/views/base.py

@@ -660 +660 @@
             last_revision = None
 
-        physical_format = item.original_format.original_format
+        physical_format = item.original_format
 
         return render(request, template,

tools/dev/push.sh

@@ -22 +22 @@
 #echo "Update jimi.parisson.com:"
 echo "Update angus.parisson.com:"
-ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull origin master; \
-                        cd /home/telemeta/telemeta-develop; git pull origin develop; \
+ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull; \
+                        cd /home/telemeta/telemeta-develop; git pull; \
                         cd /home/telemeta/demo/; ./manage.py migrate telemeta --delete-ghost-migrations;
                         cd /home/telemeta/sandbox/; ./manage.py migrate telemeta --delete-ghost-migrations;