Merge remote-tracking branch 'upstream/master'

Conflicts:
	pyaggr3g470r/controllers/feed.py
	pyaggr3g470r/templates/home.html

1 files changed, 29 insertions, 0 deletions

diff --git a/migrations/versions/17dcb75f3fe_changed_the_type_of_the_column_last_.py b/migrations/versions/17dcb75f3fe_changed_the_type_of_the_column_last_.py
new file mode 100644
index 00000000..e7790b3f
--- /dev/null
+++ b/migrations/versions/17dcb75f3fe_changed_the_type_of_the_column_last_.py
@@ -0,0 +1,29 @@
+"""changed the type of the column 'last_modified' to string.
+
+Revision ID: 17dcb75f3fe
+Revises: cde34831ea
+Create Date: 2015-03-10 14:20:53.676344
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '17dcb75f3fe'
+down_revision = 'cde34831ea'
+
+from alembic import op
+import sqlalchemy as sa
+
+from datetime import datetime
+
+def upgrade():
+    unix_start = datetime(1970, 1, 1)
+    op.drop_column('feed', 'last_modified')
+    op.add_column('feed', sa.Column('last_modified', sa.String(),
+            nullable=True, default=unix_start, server_default=str(unix_start)))
+
+
+def downgrade():
+    unix_start = datetime(1970, 1, 1)
+    op.drop_column('feed', 'last_modified')
+    op.add_column('feed', sa.Column('last_modified', sa.DateTime(),
+            nullable=True, default=unix_start, server_default=unix_start))