diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2016-01-05 22:17:44 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2016-01-05 22:17:44 +0100 |
| commit | 9ce61bc6de5e98397e84c24a00d30002d4e04de5 (patch) | |
| tree | 8ab9d19530ca3026fb21aff1993982f487dc7a28 /chimere/settings.sample.py | |
| parent | 2ca084384e6bf0596822938a607a189b507f60ed (diff) | |
| parent | 89c4baf537a590dbe80c5f6a4c20f202c63ebb15 (diff) | |
| download | Chimère-9ce61bc6de5e98397e84c24a00d30002d4e04de5.tar.bz2 Chimère-9ce61bc6de5e98397e84c24a00d30002d4e04de5.zip | |
Merge branch 'v2.2'
Conflicts:
chimere/actions.py
chimere/admin.py
chimere/locale/fr/LC_MESSAGES/django.po
chimere/models.py
chimere/urls.py
chimere/utils.py
chimere/views.py
Diffstat (limited to 'chimere/settings.sample.py')
| -rw-r--r-- | chimere/settings.sample.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chimere/settings.sample.py b/chimere/settings.sample.py index 1ddeca6..357ccef 100644 --- a/chimere/settings.sample.py +++ b/chimere/settings.sample.py @@ -57,6 +57,8 @@ CHIMERE_DAYS_BEFORE_EVENT = 30 CHIMERE_ALL_DATED_ARE_FRONT = False # allow feeds CHIMERE_FEEDS = True +# display a directory of items +CHIMERE_DIRECTORY = False CHIMERE_ICON_WIDTH = 21 CHIMERE_ICON_HEIGHT = 25 @@ -132,6 +134,8 @@ HAYSTACK_CONNECTIONS = { 'URL': 'http://127.0.0.1:8080/solr' }, } +HAYSTACK_SEARCH_RESULTS_PER_PAGE = 12 +HAYSTACK_AUTOCOMPLETE = False CHIMERE_CSV_ENCODING = 'ISO-8859-1' |