Merge branch 'mysql'

Author: Konstantin Heil

.gitignore

@@ -3,4 +3,5 @@
 *.swp
 muesli.sqlite
 muesli.yml
+alembic.ini
 TODO

alembic.ini renamed to alembic.ini.example

@@ -26,7 +26,7 @@
 import sqlalchemy
 import sqlalchemy as sa
 import sqlalchemy.ext.declarative
-from sqlalchemy import Column, ForeignKey, CheckConstraint, Text, Integer, Boolean, Unicode, DateTime, Date, Numeric, func, Table, text
+from sqlalchemy import Column, ForeignKey, CheckConstraint, Text, String, Integer, Boolean, Unicode, DateTime, Date, Numeric, func, Table, text
 from sqlalchemy.orm import relationship, sessionmaker, backref, column_property
 from muesli.types import *
 from muesli.utils import DictOfObjects, AutoVivification, editOwnTutorials, listStrings
@@ -83,7 +83,7 @@ def connect(self, con, rec):
 class User(Base):
 	__tablename__ = 'users'
 	id = Column(Integer, primary_key=True)
-	email = Column(Text, unique=True, nullable=False)
+	email = Column(String(100), unique=True, nullable=False)
 	first_name = Column(Text, nullable=False)
 	last_name = Column(Text, nullable=False)
 	password = Column(Text)

muesli/models.py

@@ -34,7 +34,7 @@ body {
 }
 
 #header {
-    background-color:#B8860B;
+    background-color: #3E727F;
     margin: 1em 1em 0em 1em;
     padding: 1em 1em 1em 3em;
     border: 1px solid gray;