Changeset 5a09eb7

Timestamp:

03/27/12 13:29:06 (14 months ago)

Author:

yomguy <yomguy@…>

Branches:

security

Children:

82a33d0

Parents:

f83d820 (diff), bf8dc4f (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@…> (03/27/12 13:29:06)

git-committer:

yomguy <yomguy@…> (03/27/12 13:29:06)

Message:

Merge branch 'master' into security

Files:

• doc/devel/telemeta-all.dot (added)
• doc/devel/telemeta-all.pdf (added)
• doc/devel/telemeta.dot (added)
• doc/devel/telemeta.pdf (added)
• example/sandbox_mysql/settings.py (modified) (1 diff)
• example/sandbox_sqlite/diag.sh (added)
• example/sandbox_sqlite/modelviz.py (added)
• example/sandbox_sqlite/settings.py (modified) (1 diff)
• telemeta/templates/telemeta/inc/collection_related.html (modified) (2 diffs)
• telemeta/templates/telemeta/inc/mediaitem_related.html (modified) (2 diffs)
• telemeta/templates/telemeta/inc/resource_related.html (modified) (2 diffs)
• tools/dev/make_doc.sh (modified) (1 diff)
• tools/dev/push.sh (modified) (2 diffs)
• telemeta/admin.py (modified) (1 diff)
• telemeta/middleware.py (added)
• telemeta/migrations/0009_auto__add_field_userprofile_last_session_key.py (added)
• telemeta/models/system.py (modified) (2 diffs)

example/sandbox_mysql/settings.py

@@ -103 +103 @@
     'jsonrpc',
     'south',
+    'sorl.thumbnail',
 )
 

example/sandbox_sqlite/settings.py

@@ -103 +103 @@
     'django.contrib.messages',
     'django.contrib.admin',
+    'django_extensions',
     'telemeta',
     'jsonrpc',

telemeta/templates/telemeta/inc/collection_related.html

@@ -61 +61 @@
                                 {% if media.file %}
                                 <a href="{% url telemeta-collection-related collection.public_id media.id %}">
-                                {% thumbnail media.file "420" as im %}
+                                {% thumbnail media.file "x200" as im %}
                                 <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
                                 {% endthumbnail %}
@@ -67 +67 @@
                                 {% else %}
                                 <a href="{{ media.url }}">
-                                {% thumbnail media.url "420" as im %}
+                                {% thumbnail media.url "x200" as im %}
                                 <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
                                 {% endthumbnail %}

telemeta/templates/telemeta/inc/mediaitem_related.html

@@ -61 +61 @@
                                 {% if media.file %}
                                 <a href="{% url telemeta-item-related item.public_id media.id %}">
-                                {% thumbnail media.file "420" as im %}
+                                {% thumbnail media.file "x200" as im %}
                                 <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
                                 {% endthumbnail %}
@@ -67 +67 @@
                                 {% else %}
                                 <a href="{{ media.url }}">
-                                {% thumbnail media.url "420" as im %}
+                                {% thumbnail media.url "x200" as im %}
                                 <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
                                 {% endthumbnail %}

telemeta/templates/telemeta/inc/resource_related.html

@@ -61 +61 @@
                                   {% if media.file %}
                                   <a href="{% url telemeta-resource-related type resource.code media.id %}">
-                                   {% thumbnail media.file "420" as im %}
+                                   {% thumbnail media.file "x200" as im %}
                                     <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
                                    {% endthumbnail %}
@@ -67 +67 @@
                                   {% else %}
                                   <a href="{{ media.url }}">
-                                  {% thumbnail media.url "420" as im %}
+                                  {% thumbnail media.url "x200" as im %}
                                    <img src="{{ im.url }}" style="max-width: 420px; max-height: 200px;" />
                                   {% endthumbnail %}

tools/dev/make_doc.sh

@@ -2 +2 @@
 # needs epydoc
 
-epydoc -n telemeta -u http://telemeta.org -o doc/html/ telemeta/
+app="telemeta"
+dir=/home/$USER/dev/$app/doc/
+server="doc.parisson.com"
 
+epydoc -n $app -u https://github.com/yomguy/DeeFuzzer -o $dir $app/
+rsync -a $dir $server:/var/www/files/doc/$app/
+

tools/dev/push.sh

@@ -8 +8 @@
     git push origin $branch
 
-    echo "Push $branch to web:"
-    git push web $branch
-
     if [[ $branch == *master* ]]; then
         echo "Push $branch to github:"
@@ -19 +16 @@
 
 git push --tags
-git push --tags web
 git push --tags github
 
 ssh vcs.parisson.com "cd /var/git/telemeta.git; git update-server-info"
-ssh vcs.parisson.org "cd /var/git/telemeta.git; git update-server-info"
 
 #echo "Update jimi.parisson.com:"
-#ssh jimi.parisson.com "cd /home/telemeta/telemeta; git pull origin production"
 echo "Update angus.parisson.com:"
 ssh angus.parisson.com "cd /home/telemeta/telemeta-prod; git pull origin production; \
                         cd /home/telemeta/telemeta; git pull origin master; \
                         cd /home/telemeta/demo/; ./manage.py migrate telemeta --delete-ghost-migrations;
-                        cd /home/telemeta/sandbox/; ./manage.py migrate telemeta --delete-ghost-migrations; "
+                        cd /home/telemeta/sandbox/; ./manage.py migrate telemeta --delete-ghost-migrations; 
+                        cd /home/telemeta/parisson/; ./manage.py migrate telemeta --delete-ghost-migrations; "
 
 echo "Done !"

telemeta/admin.py

@@ -6 +6 @@
 from telemeta.models.system import *
 from django.contrib import admin
+<<<<<<< HEAD
+from django.forms import CheckboxSelectMultiple
+=======
+>>>>>>> master
 from django.contrib.auth.models import User
 from django.contrib.auth.admin import UserAdmin

telemeta/models/system.py

@@ -42 +42 @@
 import django.db.models as models
 from django.forms import ModelForm
+from django.contrib.sessions.models import Session
 
 
@@ -88 +89 @@
     telephone       = CharField(_('Telephone'))
     expiration_date = DateField(_('Expiration_date'))
+    last_session_key = CharField(blank=True, null=True, max_length=40)
     init_password   = BooleanField(_('Password initialization'))