Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index f93f9e8..f5c9cf2 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -21,10 +21,10 @@ DATABASES = {
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.

-        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.

     }
 }
 
     }
 }
 

+

 # 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.
 # 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.


@@ -190,6 +190,7 @@ COMPRESS_CSS = {
             'css/jquery.countdown.css', 
 
             'css/base.css',
             'css/jquery.countdown.css', 
 
             'css/base.css',

+            'css/cite.css',

             'css/header.css',
             'css/main_page.css',
             'css/dialogs.css',
             'css/header.css',
             'css/main_page.css',
             'css/dialogs.css',


@@ -197,7 +198,8 @@ COMPRESS_CSS = {
             'css/book_box.css',
             'css/catalogue.css',
             'css/sponsors.css',
             'css/book_box.css',
             'css/catalogue.css',
             'css/sponsors.css',

-            
+
+            'css/social/shelf_tags.css',

             'css/ui-lightness/jquery-ui-1.8.16.custom.css',
         ],
         'output_filename': 'css/all.min?.css',
             'css/ui-lightness/jquery-ui-1.8.16.custom.css',
         ],
         'output_filename': 'css/all.min?.css',


@@ -312,7 +314,7 @@ BROKER_USER = "guest"
 BROKER_PASSWORD = "guest"
 BROKER_VHOST = "/"
 
 BROKER_PASSWORD = "guest"
 BROKER_VHOST = "/"
 

-
+CELERY_EAGER_PROPAGATES_EXCEPTIONS = True

 
 # Load localsettings, if they exist
 try:
 
 # Load localsettings, if they exist
 try: