Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
humanities
gargantext
Commits
8b6693d0
Commit
8b6693d0
authored
May 02, 2016
by
delanoe
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/refactoring-dev' into refactoring-merge
parents
4ad658c6
e6078955
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
15 deletions
+14
-15
constants.py
gargantext/constants.py
+1
-1
settings.py
gargantext/settings.py
+13
-14
No files found.
gargantext/constants.py
View file @
8b6693d0
...
...
@@ -102,7 +102,7 @@ INDEXED_HYPERDATA = {
}
from
gargantext.util.taggers
import
EnglishMeltTagger
,
FrenchMeltTagger
,
TurboTagger
from
gargantext.util.taggers
import
FrenchMeltTagger
,
TurboTagger
LANGUAGES
=
{
'en'
:
{
...
...
gargantext/settings.py
View file @
8b6693d0
...
...
@@ -26,7 +26,7 @@ SECRET_KEY = '!%ktkh981)piil1%t5r0g4$^0=uvdafk!=f2x8djxy7_gq(n5%'
DEBUG
=
True
MAINTENANCE
=
False
ALLOWED_HOSTS
=
[
'localhost'
]
ALLOWED_HOSTS
=
[
'localhost'
,
'dev.gargantext.org'
,
'garg-dev.iscpif.fr'
]
# Asynchronous tasks
...
...
@@ -87,9 +87,21 @@ TEMPLATES = [
WSGI_APPLICATION
=
'gargantext.wsgi.application'
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.9/howto/static-files/
STATIC_ROOT
=
'/srv/gargantext_static/'
STATIC_URL
=
'/static/'
STATICFILES_DIRS
=
(
os
.
path
.
join
(
BASE_DIR
,
'static'
),
)
STATICFILES_FINDERS
=
(
'django.contrib.staticfiles.finders.AppDirectoriesFinder'
,
'django.contrib.staticfiles.finders.FileSystemFinder'
,
)
MEDIA_ROOT
=
'/srv/gargantext_media'
#MEDIA_ROOT = os.path.join(PROJECT_PATH, 'media')
MEDIA_URL
=
'/media/'
...
...
@@ -143,17 +155,4 @@ USE_L10N = True
USE_TZ
=
True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.9/howto/static-files/
#STATIC_URL = '/static/'
STATICFILES_DIRS
=
(
os
.
path
.
join
(
BASE_DIR
,
'static'
),
)
STATICFILES_FINDERS
=
(
'django.contrib.staticfiles.finders.AppDirectoriesFinder'
,
'django.contrib.staticfiles.finders.FileSystemFinder'
,
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment