diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-09 12:11:16 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-09 12:11:16 +0200 |
| commit | 29646fc139ce59b2e6a3ffa3be7cacde513f90f7 (patch) | |
| tree | 6a039bc7e8f3de2d4d0ecb99bd58b396cecb0c5f | |
| parent | 99668d2ba6b764020062ff1f0f7c4628e5d490a1 (diff) | |
| parent | 05003124ae5f03de6fe8fd4a9304dcf3d64e859e (diff) | |
| download | Ishtar-29646fc139ce59b2e6a3ffa3be7cacde513f90f7.tar.bz2 Ishtar-29646fc139ce59b2e6a3ffa3be7cacde513f90f7.zip | |
Merge branch 'v0.9' into wheezy
| -rw-r--r-- | CHANGES.txt | 1 | ||||
| -rw-r--r-- | install/local_settings.py.sample | 4 | ||||
| -rw-r--r-- | version.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 368f5a3c4..f6473a10a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -11,6 +11,7 @@ Bug fixes: - Fix operation code for operation with no year (or year 0) - Fix warehouse creation - Allow to save a find if no operation is defined +- Add PROJECT_SLUG to default installation 0.94 (2016-06-03) ----------------- diff --git a/install/local_settings.py.sample b/install/local_settings.py.sample index 3d17d6610..857249613 100644 --- a/install/local_settings.py.sample +++ b/install/local_settings.py.sample @@ -7,6 +7,7 @@ TEMPLATE_DEBUG = DEBUG SQL_DEBUG = False APP_NAME = u"#PROJECT_NAME#" +PROJECT_SLUG = u"#PROJECT_NAME#" ROOT_URLCONF = '#APP_NAME#.urls' STATIC_URL = '/static-#DATE#/' SECRET_KEY = "#SECRET_KEY#" @@ -25,7 +26,7 @@ MANAGERS = ADMINS DATABASES = { 'default': { 'ENGINE': 'django.contrib.gis.db.backends.postgis', - 'NAME': '#DB_NAME#', + 'NAME': '#DB_NAME#', 'HOST': '#DB_HOST#', 'PORT': '#DB_PORT#', 'USER': '#DB_NAME#', @@ -40,4 +41,3 @@ EXTRA_APPS = [ 'archaeological_warehouse', 'archaeological_finds', ] - diff --git a/version.py b/version.py index 2c496f753..125271355 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (0, 95, 2) +VERSION = (0, 95, 3) def get_version(): |