Skip to content
Snippets Groups Projects
Commit 5c98bbcf authored by Jean-Philippe Laverdure's avatar Jean-Philippe Laverdure
Browse files

Merge branch 'master' into private_files

parents a769107f 820229a3
No related branches found
No related tags found
1 merge request!5Private files
......@@ -2,6 +2,8 @@ SECRET_KEY=^9&_!k-r&t^y9)+z9zh()rrt0qy6zpat=$8&+f0d_d0d35@iq-
DEBUG=True
ALLOWED_HOSTS=.iric.ca, localhost, 127.0.0.1
ADMINS=JPL/jean-philippe.laverdure@umontreal.ca,Jo/jonathan.seguin.1@umontreal.ca,Gen/genevieve.boucher@umontreal.ca
# Use SQLite engine for simplified DEV environment (laptop)
# DB_ENGINE=django.db.backends.sqlite3
DB_ENGINE=django.db.backends.postgresql
DB_NAME=iric_data_dev
DB_USER=iric_data_user
......@@ -9,7 +11,7 @@ DB_PASSWORD=
DB_HOST=127.0.0.1
AUTH_LDAP_SERVER_URI=ldap://10.113.0.13
AUTH_LDAP_BIND_DN=iric-bioinfo@sim.umontreal.ca
AUTH_LDAP_BIND_PASSWORD=xoc98~RW
AUTH_LDAP_BIND_PASSWORD=647By2vC
AUTH_LDAP_BIND_AS_AUTHENTICATING_USER=True
AUTH_LDAP_USER_DN_TEMPLATE=cn=%(user)s,ou=People,dc=sim,dc=umontreal,dc=ca
AUTH_LDAP_SEARCH=ou=people,dc=sim,dc=umontreal,dc=ca
......
This diff is collapsed.
{
"name": "Portail_IRIC_Data",
"name": "portail_iric_data",
"version": "1.0.0",
"description": "Portail web pour la récuperation de données expérimentales",
"description": "Portail web pour la récuperation de données expérimentales brutes",
"main": "gulpfile.js",
"devDependencies": {
"@fortawesome/fontawesome-pro": "^5.7.2",
......@@ -9,14 +9,15 @@
"browserify": "^16.1.1",
"gulp": "^3.9.1",
"gulp-autoprefixer": "^3.1.0",
"gulp-cli": "^2.2.0",
"gulp-gettext": "^0.3.0",
"gulp-load-plugins": "^1.1.0",
"gulp-postcss": "^6.1.1",
"gulp-sass": "^2.1.0",
"gulp-sass": "^4.0.2",
"gulp-sourcemaps": "^2.0.0",
"gulp-uglify-es": "^1.0.4",
"lodash.assign": "^4.2.0",
"node-sass": "^4.9.2",
"node-sass": "^4.12.0",
"postcss-flexbugs-fixes": "^2.0.0",
"vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0",
......
......@@ -17,7 +17,8 @@ class Command(BaseCommand):
'Archambault', 'Borden', 'Bouilly', 'Bouvier', 'Carréno', 'Emery',
'Gaboury', 'Gagnon', 'Harrington', 'Hoang', 'Kwok', 'Labbé', 'Lemieux',
'Lessard', 'Mader', 'Major', 'Marinier', 'Perreault', 'Roux', 'Sauvageau',
'Smith', 'Therrien', 'Thibault', 'Tyers', 'Verreault', 'Wilhelm'
'Smith', 'Therrien', 'Thibault', 'Tyers', 'Verreault', 'Wilhelm',
'Bioinformatique', 'Genomique'
]
try:
# Using get_or_create to tolerate running the script more than once
......
autopep8==1.4.3
certifi==2018.11.29
chardet==3.0.4
Django==2.1.4
Django==2.2.1
django-auth-ldap==1.7.0
django-chartjs==1.3
django-crispy-forms==1.7.2
......@@ -19,4 +19,5 @@ python-ldap==3.1.0
pytz==2018.7
requests==2.21.0
six==1.12.0
sqlparse==0.3.0
urllib3==1.24.1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment