diff options
| author | Lei Yan | 2014-07-14 16:23:12 +0000 |
|---|---|---|
| committer | Lei Yan | 2014-07-14 17:02:01 +0000 |
| commit | 214bf0128b8ecdda718983c5563cf34160743758 (patch) | |
| tree | 917e7a5ae78dc4ff65dc08d107a0e3ae3a47c67c /wqflask/other_config | |
| parent | 8de6fec18cd98a10c58702c448a1e01e147dc5f7 (diff) | |
| parent | fbdbf4b7410185e2a978ecc8e120ae56ff6da0ce (diff) | |
| download | genenetwork2-214bf0128b8ecdda718983c5563cf34160743758.tar.gz | |
Merge /home/zas1024/gene
Conflicts:
wqflask/wqflask/static/new/javascript/dataset_select_menu.js
wqflask/wqflask/templates/corr_scatter_plot_old.html
Diffstat (limited to 'wqflask/other_config')
| -rwxr-xr-x[-rw-r--r--] | wqflask/other_config/dot.pylintrc | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | wqflask/other_config/nginx-old.conf | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | wqflask/other_config/nginx_conf/gn2python.conf | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | wqflask/other_config/nginx_conf/gn2python_lei.conf | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | wqflask/other_config/nginx_conf/penguin.conf | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | wqflask/other_config/nginx_conf/sam.conf | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | wqflask/other_config/pylintrc | 0 |
7 files changed, 2 insertions, 0 deletions
diff --git a/wqflask/other_config/dot.pylintrc b/wqflask/other_config/dot.pylintrc index 2774300a..2774300a 100644..100755 --- a/wqflask/other_config/dot.pylintrc +++ b/wqflask/other_config/dot.pylintrc diff --git a/wqflask/other_config/nginx-old.conf b/wqflask/other_config/nginx-old.conf index 65ee768c..65ee768c 100644..100755 --- a/wqflask/other_config/nginx-old.conf +++ b/wqflask/other_config/nginx-old.conf diff --git a/wqflask/other_config/nginx_conf/gn2python.conf b/wqflask/other_config/nginx_conf/gn2python.conf index f23e325f..f23e325f 100644..100755 --- a/wqflask/other_config/nginx_conf/gn2python.conf +++ b/wqflask/other_config/nginx_conf/gn2python.conf diff --git a/wqflask/other_config/nginx_conf/gn2python_lei.conf b/wqflask/other_config/nginx_conf/gn2python_lei.conf index 981bda28..981bda28 100644..100755 --- a/wqflask/other_config/nginx_conf/gn2python_lei.conf +++ b/wqflask/other_config/nginx_conf/gn2python_lei.conf diff --git a/wqflask/other_config/nginx_conf/penguin.conf b/wqflask/other_config/nginx_conf/penguin.conf index 5c380da8..0a89072e 100644..100755 --- a/wqflask/other_config/nginx_conf/penguin.conf +++ b/wqflask/other_config/nginx_conf/penguin.conf @@ -1,5 +1,7 @@ server { # Modeled after http://flask.pocoo.org/docs/deploying/wsgi-standalone/ + + client_max_body_size 20M; listen 80; server_name gn2python.genenetwork.org; diff --git a/wqflask/other_config/nginx_conf/sam.conf b/wqflask/other_config/nginx_conf/sam.conf index 3cc443a8..3cc443a8 100644..100755 --- a/wqflask/other_config/nginx_conf/sam.conf +++ b/wqflask/other_config/nginx_conf/sam.conf diff --git a/wqflask/other_config/pylintrc b/wqflask/other_config/pylintrc index b23af7a4..b23af7a4 100644..100755 --- a/wqflask/other_config/pylintrc +++ b/wqflask/other_config/pylintrc |