fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OAI-PMH link on main page
[wolnelektury.git]
/
wolnelektury
/
settings
/
__init__.py
diff --git
a/wolnelektury/settings/__init__.py
b/wolnelektury/settings/__init__.py
index
2005797
..
db6ba45
100644
(file)
--- a/
wolnelektury/settings/__init__.py
+++ b/
wolnelektury/settings/__init__.py
@@
-42,8
+42,32
@@
MIDDLEWARE_CLASSES = [
ROOT_URLCONF = 'wolnelektury.urls'
ROOT_URLCONF = 'wolnelektury.urls'
-INSTALLED_APPS = [
+# These are the ones we should test.
+INSTALLED_APPS_OUR = [
'wolnelektury_core',
'wolnelektury_core',
+ # our
+ 'ajaxable',
+ 'api',
+ 'catalogue',
+ 'chunks',
+ 'dictionary',
+ 'infopages',
+ 'lesmianator',
+ 'newtagging',
+ 'opds',
+ 'pdcounter',
+ 'reporting',
+ 'sponsors',
+ 'stats',
+ 'suggest',
+ 'picture',
+ 'social',
+ 'waiter',
+ 'search',
+ 'oai',
+ ]
+
+INSTALLED_APPS_CONTRIB = [
# external
'django.contrib.auth',
'django.contrib.contenttypes',
# external
'django.contrib.auth',
'django.contrib.contenttypes',
@@
-51,7
+75,9
@@
INSTALLED_APPS = [
'django.contrib.sites',
'django.contrib.admin',
'django.contrib.admindocs',
'django.contrib.sites',
'django.contrib.admin',
'django.contrib.admindocs',
+ 'django.contrib.staticfiles',
'pagination',
'pagination',
+ 'pipeline',
'piston',
'piwik.django',
#'rosetta',
'piston',
'piwik.django',
#'rosetta',
@@
-60,7
+86,7
@@
INSTALLED_APPS = [
'djcelery',
'djkombu',
'honeypot',
'djcelery',
'djkombu',
'honeypot',
- #
'django_nose',
+ #'django_nose',
#allauth stuff
'emailconfirmation',
#allauth stuff
'emailconfirmation',
@@
-73,30
+99,10
@@
INSTALLED_APPS = [
#'allauth.twitter',
# included
#'allauth.twitter',
# included
- 'compress',
'modeltranslation',
'modeltranslation',
+ ]
- # our
- 'ajaxable',
- 'api',
- 'catalogue',
- 'chunks',
- 'dictionary',
- 'infopages',
- 'lesmianator',
- #'lessons',
- 'newtagging',
- 'opds',
- 'pdcounter',
- 'reporting',
- 'sponsors',
- 'stats',
- 'suggest',
- 'picture',
- 'search',
- 'social',
- 'waiter',
-]
+INSTALLED_APPS = INSTALLED_APPS_OUR + INSTALLED_APPS_CONTRIB
# Load localsettings, if they exist
try:
# Load localsettings, if they exist
try: