diff options
| author | Zachary Sloan | 2013-06-13 22:45:01 +0000 |
|---|---|---|
| committer | Zachary Sloan | 2013-06-13 22:45:01 +0000 |
| commit | 78998b9400bba9ecc9fdd5e50eef1405bb3625c1 (patch) | |
| tree | 88da507baa1ccda96165a908257d891204259d3b /wqflask/cfg | |
| parent | aac1dd2f9c5b216b24c6e35676ba5d50f9d5d3c2 (diff) | |
| parent | 0e633460f37cb9b7c23805c4c31b1044e0704d1b (diff) | |
| download | genenetwork2-78998b9400bba9ecc9fdd5e50eef1405bb3625c1.tar.gz | |
Merge /home/sam/gene into flask
Conflicts:
wqflask/wqflask/templates/index_page.html
Merging the code on Sam's branch onto my own
Diffstat (limited to 'wqflask/cfg')
| -rw-r--r-- | wqflask/cfg/default_settings.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/wqflask/cfg/default_settings.py b/wqflask/cfg/default_settings.py index d0713e4d..96f7f1a5 100644 --- a/wqflask/cfg/default_settings.py +++ b/wqflask/cfg/default_settings.py @@ -3,7 +3,7 @@ LOGFILE = """/tmp/flask_gn_log""" SERVER_PORT = 5000 #This is needed because Flask turns key errors into a -#400 bad request response with no exception/log +#400 bad request response with no exception/log TRAP_BAD_REQUEST_ERRORS = True # http://pythonhosted.org/Flask-Security/configuration.html @@ -11,3 +11,5 @@ SECURITY_CONFIRMABLE = True SECURITY_TRACKABLE = True SECURITY_REGISTERABLE = True SECURITY_RECOVERABLE = True + +SECURITY_EMAIL_SENDER = "no-reply@genenetwork.org" |