Merge branch 'development' into feature/ACL_support

This commit is contained in:
Roberto Rosario
2011-12-07 16:09:45 -04:00
81 changed files with 6949 additions and 318 deletions

View File

@@ -53,6 +53,7 @@ LANGUAGES = (
('es', ugettext('Spanish')),
('pt', ugettext('Portuguese')),
('ru', ugettext('Russian')),
('it', ugettext('Italian')),
)
SITE_ID = 1
@@ -189,6 +190,8 @@ STATICFILES_FINDERS = (
COMPRESS_PARSER = 'compressor.parser.HtmlParser'
COMPRESS_CSS_FILTERS = ['compressor.filters.css_default.CssAbsoluteFilter', 'compressor.filters.cssmin.CSSMinFilter']
COMPRESS_ENABLED=False
#===== User configuration options ===============
#--------- Pagination ------------------
#PAGINATION_DEFAULT_PAGINATION = 10