From: Radek Czajka <rczajka@rczajka.pl>
Date: Sun, 22 Mar 2020 09:42:44 +0000 (+0100)
Subject: Merge branch 'master' of ssh://s.mdrn.pl:2224/srv/redakcja.wolnelektury.pl/git
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/2c6efebdedb5212749f1f6340118e31c22b260b1?ds=sidebyside;hp=-c

Merge branch 'master' of ssh://s.mdrn.pl:2224/srv/redakcja.wolnelektury.pl/git
---

2c6efebdedb5212749f1f6340118e31c22b260b1
diff --combined requirements/requirements.txt
index 60d02dd4,00f7f0a5..800fa744
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@@ -8,7 -8,7 +8,7 @@@ oauth
  httplib2 # oauth2 dependency
  python-slugify
  
- librarian==1.7.6
+ librarian==1.8.1
  
  ## Django
  Django==2.2.6
@@@ -22,6 -22,5 +22,6 @@@ django-gravatar2==1.4.
  django-extensions==2.1.6
  django-bootstrap4==1.0.1
  libsasscompiler==0.1.5
 +django-debug-toolbar
  
  sentry-sdk==0.12.2
diff --combined src/redakcja/settings/__init__.py
index dd18ae6d,3f925fd2..51dec4da
--- a/src/redakcja/settings/__init__.py
+++ b/src/redakcja/settings/__init__.py
@@@ -43,14 -43,8 +43,14 @@@ MIDDLEWARE = 
      'django.contrib.messages.middleware.MessageMiddleware',
  
      'django.contrib.auth.middleware.AuthenticationMiddleware',
 -    'django_cas_ng.middleware.CASMiddleware',
 +    ]
  
 +if CAS_SERVER_URL:
 +    MIDDLEWARE.append(
 +        'django_cas_ng.middleware.CASMiddleware',
 +    )
 +
 +MIDDLEWARE += [
      'django.contrib.admindocs.middleware.XViewMiddleware',
      'fnp_django_pagination.middleware.PaginationMiddleware',
      'maintenancemode.middleware.MaintenanceModeMiddleware',
@@@ -61,11 -55,10 +61,11 @@@ if DEBUG
          'debug_toolbar.middleware.DebugToolbarMiddleware',
      ] + MIDDLEWARE
  
 -AUTHENTICATION_BACKENDS = (
 -    'django.contrib.auth.backends.ModelBackend',
 -    'django_cas_ng.backends.CASBackend',
 -)
 +if CAS_SERVER_URL:
 +    AUTHENTICATION_BACKENDS = (
 +        'django.contrib.auth.backends.ModelBackend',
 +        'django_cas_ng.backends.CASBackend',
 +    )
  
  ROOT_URLCONF = 'redakcja.urls'
  
@@@ -236,6 -229,7 +236,7 @@@ PIPELINE = 
          },
          'book': {
              'source_filenames': (
+                 'js/lib/jquery/jquery.cycle2.min.js',
                  'js/book_text/jquery.eventdelegation.js',
                  'js/book_text/jquery.scrollto.js',
                  'js/book_text/jquery.highlightfade.js',