Merge remote-tracking branch 'origin/master' into rustedbuilds

Conflicts:
	data/database.py
	endpoints/api.py
	endpoints/common.py
	test/data/test.db
This commit is contained in:
jakedt 2014-02-21 14:52:40 -05:00
commit d5304f7db0
128 changed files with 845 additions and 207343 deletions

View file

@ -47,6 +47,10 @@ def get_route_data():
return route_data
def truthy_param(param):
return param not in {False, 'false', 'False', '0', 'FALSE', '', 'null'}
@login_manager.user_loader
def load_user(username):
logger.debug('Loading user: %s' % username)
@ -108,4 +112,4 @@ def render_page_template(name, **kwargs):
resp = make_response(render_template(name, route_data=get_route_data(),
**kwargs))
resp.headers['X-FRAME-OPTIONS'] = 'DENY'
return resp
return resp