Commit 03b7d105 authored by Administrator's avatar Administrator

Merge branch 'prod-dev' into unstable

parents b78a4184 88ed67db
...@@ -49,8 +49,7 @@ CELERY_IMPORTS=("node.models","gargantext_web.celery") ...@@ -49,8 +49,7 @@ CELERY_IMPORTS=("node.models","gargantext_web.celery")
SECRET_KEY = 'bt)3n9v&a02cu7^^=+u_t2tmn8ex5fvx8$x4r*j*pb1yawd+rz' SECRET_KEY = 'bt)3n9v&a02cu7^^=+u_t2tmn8ex5fvx8$x4r*j*pb1yawd+rz'
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = False
MAINTENANCE = False MAINTENANCE = False
TEMPLATE_DEBUG = False TEMPLATE_DEBUG = False
...@@ -71,17 +70,17 @@ TEMPLATE_DIRS = ( ...@@ -71,17 +70,17 @@ TEMPLATE_DIRS = (
#ALLOWED_HOSTS = ['*',] #ALLOWED_HOSTS = ['*',]
ALLOWED_HOSTS = ['localhost', ALLOWED_HOSTS = ['localhost',
'gargantext.org', 'gargantext.org',
'stable.gargantext.org', 'stable.gargantext.org',
'dev.gargantext.org', 'dev.gargantext.org',
'iscpif.gargantext.org', 'iscpif.gargantext.org',
'gargantext.iscpif.fr', 'gargantext.iscpif.fr',
'mines.gargantext.org', 'mines.gargantext.org',
'pasteur.gargantext.org', 'pasteur.gargantext.org',
'beta.gargantext.org', 'beta.gargantext.org',
'garg-dev.iscpif.fr', 'garg-dev.iscpif.fr',
'garg-stable.iscpif.fr', 'garg-stable.iscpif.fr',
] ]
......
...@@ -149,7 +149,8 @@ th a { ...@@ -149,7 +149,8 @@ th a {
<div class="col-md-4"> <div class="col-md-4">
<div class="jumbotron"> <div class="jumbotron">
<h3><a href="/project/{{project.id}}/corpus/{{corpus.id}}/matrix">Matrix</a></h3> <!-- <h3><a href="/project/{{project.id}}/corpus/{{corpus.id}}/matrix">Matrix</a></h3> -->
<h3>Matrix (soon)</h3>
<ol> <ol>
<li>Sort</li> <li>Sort</li>
<li>Group</li> <li>Group</li>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment