Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/admin.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from flask.ext.admin import Admin
from flask.ext.admin.contrib.sqla import ModelView
from flask.ext import login
from flask_admin import Admin
from flask_admin.contrib.sqla import ModelView
import flask_login as login


from app import app, db
Expand Down
4 changes: 2 additions & 2 deletions app/app.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import logging
from logging.handlers import TimedRotatingFileHandler
from flask import Flask
from flask.ext.bootstrap import Bootstrap, StaticCDN
from flask.ext.sqlalchemy import SQLAlchemy
from flask_bootstrap import Bootstrap, StaticCDN
from flask_sqlalchemy import SQLAlchemy
from flask_debugtoolbar import DebugToolbarExtension

from airbrake import Airbrake, AirbrakeHandler
Expand Down
1 change: 1 addition & 0 deletions app/config.example.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

class Configuration(object):
SQLALCHEMY_DATABASE_URI = 'sqlite:///haldis.db'
SQLALCHEMY_TRACK_MODIFICATIONS = False
DEBUG = True
SECRET_KEY = '<change>'
SLACK_WEBHOOK = '<add url>'
Expand Down
6 changes: 4 additions & 2 deletions app/forms.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
from datetime import datetime, timedelta
from flask import session
from flask.ext.login import current_user
from flask_wtf import Form
from flask_login import current_user
from flask_wtf import FlaskForm as Form
from wtforms import SelectField, DateTimeField, validators, SubmitField, StringField


from models import User, Location
from utils import euro

Expand Down
4 changes: 2 additions & 2 deletions app/haldis.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
from forms import *
from utils import *
from views import *
from flask.ext.migrate import Migrate, MigrateCommand
from flask.ext.script import Manager
from flask_migrate import Migrate, MigrateCommand
from flask_script import Manager

if __name__ == '__main__':
# do it here, because make accessing db changes only possible when executing the program directly
Expand Down
2 changes: 1 addition & 1 deletion app/login.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from flask import redirect, abort, session, url_for
from flask.ext.login import LoginManager, current_user, logout_user
from flask_login import LoginManager, current_user, logout_user


from app import app
Expand Down
2 changes: 1 addition & 1 deletion app/views/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from datetime import datetime, timedelta

from flask import url_for, render_template, abort
from flask.ext.login import login_required
from flask_login import login_required

from app import app
from models import Order, Location
Expand Down
2 changes: 1 addition & 1 deletion app/views/order.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from threading import Thread
import requests
from flask import url_for, render_template, abort, redirect, Blueprint, flash, session, request
from flask.ext.login import current_user, login_required
from flask_login import current_user, login_required
import random
from datetime import datetime

Expand Down
2 changes: 1 addition & 1 deletion app/zeus.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from flask import redirect, url_for, session, jsonify, flash, request
from flask.ext.login import login_user
from flask_login import login_user
from flask_oauthlib.client import OAuth, OAuthException
import json
import requests
Expand Down
42 changes: 21 additions & 21 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
Flask==0.10.1
Flask-Admin==1.1.0
Flask-Bootstrap==3.3.4.1
Flask==0.12
Flask-Admin==1.4.2
Flask-Bootstrap==3.3.7.0
Flask-DebugToolbar==0.10.0
Flask-Login==0.2.11
Flask-Migrate==1.4.0
Flask-OAuthlib==0.9.1
Flask-SQLAlchemy==2.0
Flask-Login==0.4.0
Flask-Migrate==2.0.2
Flask-OAuthlib==0.9.3
Flask-SQLAlchemy==2.1
Flask-Script==2.0.5
Flask-WTF==0.11
Jinja2==2.7.3
Mako==1.0.1
Flask-WTF==0.13.1
Jinja2==2.8.1
Mako==1.0.6
MarkupSafe==0.23
PyMySQL==0.6.6
SQLAlchemy==1.0.4
WTForms==2.0.2
Werkzeug==0.10.4
airbrake==1.1.4
alembic==0.7.6
blinker==1.3
PyMySQL==0.7.9
SQLAlchemy==1.1.4
WTForms==2.1
Werkzeug==0.11.15
airbrake==1.3.3
alembic==0.8.9
blinker==1.4
itsdangerous==0.24
oauthlib==0.7.2
requests==2.7.0
requests-oauthlib==0.5.0
six==1.9.0
oauthlib==2.0.1
requests==2.12.4
requests-oauthlib==0.7.0
six==1.10.0