fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generowanie pybundle z wymaganymi bibliotekami na komputerze lokalnym i przerzucanie...
[redakcja.git]
/
project
/
settings.py
diff --git
a/project/settings.py
b/project/settings.py
index
13e0bc5
..
3a1f3ad
100644
(file)
--- a/
project/settings.py
+++ b/
project/settings.py
@@
-8,6
+8,7
@@
TEMPLATE_DEBUG = DEBUG
ADMINS = (
(u'Marek Stępniowski', 'marek@stepniowski.com'),
ADMINS = (
(u'Marek Stępniowski', 'marek@stepniowski.com'),
+ (u'Łukasz Rekucki', 'lrekucki@gmail.com'),
)
MANAGERS = ADMINS
)
MANAGERS = ADMINS
@@
-30,8
+31,8
@@
TIME_ZONE = 'Europe/Warsaw Poland'
# http://www.i18nguy.com/unicode/language-identifiers.html
LANGUAGE_CODE = 'pl'
# http://www.i18nguy.com/unicode/language-identifiers.html
LANGUAGE_CODE = 'pl'
-import locale
-locale.setlocale(locale.LC_ALL, '')
+
#
import locale
+
#
locale.setlocale(locale.LC_ALL, '')
SITE_ID = 1
SITE_ID = 1
@@
-87,7
+88,7
@@
MIDDLEWARE_CLASSES = (
ROOT_URLCONF = 'urls'
TEMPLATE_DIRS = (
ROOT_URLCONF = 'urls'
TEMPLATE_DIRS = (
- PROJECT_ROOT + '/templates',
+ PROJECT_ROOT + '/templates',
)
# CSS and JS files to compress
)
# CSS and JS files to compress
@@
-115,9
+116,8
@@
INSTALLED_APPS = (
'django.contrib.sites',
'django.contrib.admin',
'django.contrib.admindocs',
'django.contrib.sites',
'django.contrib.admin',
'django.contrib.admindocs',
-
- 'cas_provider',
- 'cas_consumer',
+
+ 'piston',
'explorer',
'toolbar',
'api',
'explorer',
'toolbar',
'api',
@@
-135,10
+135,6
@@
EDITOR_DEFAULT_SETTINGS = {
],
}
],
}
-# django-cas-provider
-LOGIN_URL = '/cas/login/'
-LOGOUT_URL = '/cas/logout/'
-
# Python logging settings
import logging
# Python logging settings
import logging