2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-15 03:17:12 +00:00

comments on urls resolution re apache & bugfix

This commit is contained in:
Philip Sargent
2021-03-21 01:37:52 +00:00
parent b4b343b578
commit a0c3ef8ea1
3 changed files with 48 additions and 29 deletions

View File

@@ -38,6 +38,8 @@ ADMINS = (
)
MANAGERS = ADMINS
#LOGIN_URL = '/accounts/login/' # this is the default value so does not need to be set
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
@@ -62,6 +64,7 @@ FIX_PERMISSIONS = []
# top-level survex file basename (without .svx)
SURVEX_TOPNAME = "1623"
MAX_LOGBOOK_ENTRY_TITLE_LENGTH = 200
DEFAULT_LOGBOOK_PARSER = "Parseloghtmltxt"
DEFAULT_LOGBOOK_FILE = "logbook.html"
# All years since 2010 use the default value for Logbook parser
@@ -117,11 +120,11 @@ INSTALLED_APPS = (
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.admindocs',
# 'django.contrib.staticfiles', # apparently not working. Using workarounds with flatpages
'registration', # only for expo user. REPLACE with another non-admin, contrib.auth user ?
'troggle.profiles', # Probably don't need this at all
# 'django.contrib.staticfiles', # Using workarounds with flatpages
'registration', # only for expo user. REPLACE using django.contrib.auth
'troggle.core',
'troggle.flatpages', # NOT django.contrib.flatpages.models.FlatPage Merge in with troggle ?
'troggle.flatpages', # Written by Martin Green 2011. This is NOT django.contrib.flatpages which stores HTML in the database
# 'troggle.profiles', # Commented out, but keep until user/login system fully bedded down.
)
MIDDLEWARE_CLASSES = (
@@ -146,7 +149,7 @@ AUTH_PROFILE_MODULE = 'core.person'
QM_PATTERN="\[\[\s*[Qq][Mm]:([ABC]?)(\d{4})-(\d*)-(\d*)\]\]"
# Re-enable TinyMCE when Dj upgraded to v3. Also templates/editflatpage.html
# TINYMCE_DEFAULT_CONFIG = {
# 'plugins': "table,spellchecker,paste,searchreplace",
# 'theme': "advanced",
@@ -154,8 +157,6 @@ QM_PATTERN="\[\[\s*[Qq][Mm]:([ABC]?)(\d{4})-(\d*)-(\d*)\]\]"
# TINYMCE_SPELLCHECKER = False
# TINYMCE_COMPRESSOR = True
MAX_LOGBOOK_ENTRY_TITLE_LENGTH = 200
TEST_RUNNER = 'django.test.runner.DiscoverRunner'
from localsettings import *