Merge branch 'master' of github.com:ZeusWPI/Foodbot

This commit is contained in:
Feliciaan De Palmenaer 2015-04-02 12:56:38 +02:00
commit 43b8a4f028
4 changed files with 11 additions and 10 deletions

View file

@ -34,4 +34,3 @@ if not app.debug:
logger = logging.getLogger('werkzeug')
logger.addHandler(timedFileHandler)
app.logger.addHandler(timedFileHandler)

View file

@ -9,5 +9,4 @@ from forms import *
from utils import *
from views import *
if __name__ == '__main__':
app.run()

View file

@ -7,6 +7,7 @@ INTERP = os.path.expanduser("~/env/bin/python")
if sys.executable != INTERP:
os.execl(INTERP, INTERP, *sys.argv)
sys.path.append(os.path.join(os.getcwd(), "app"))
sys.path.append(os.getcwd())
from james import app as application

View file

@ -1,15 +1,17 @@
certifi==14.5.14
Flask==0.10.1
Flask-Admin==1.0.9
Flask-Bootstrap==3.3.2.1
Flask-Login==0.2.11
Flask-OAuthlib==0.8.0
Flask-SQLAlchemy==2.0
Flask-WTF==0.10.3
Flask-Bootstrap==3.3.2.1
itsdangerous==0.24
Jinja2==2.7.2
MarkupSafe==0.23
SQLAlchemy==0.9.8
WTForms==2.0
Werkzeug==0.9.6
itsdangerous==0.24
requests==2.4.0
Flask-OAuthlib==0.8.0
oauthlib==0.7.2
PyMySQL==0.6.6
requests==2.4.0
SQLAlchemy==0.9.8
Werkzeug==0.9.6
WTForms==2.0