From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Fri, 26 Apr 2013 14:29:40 +0000 (+0200)
Subject: Merge branch 'master' into funding
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/cda147aa999b09a14dacb097d91638f6b9cca236?ds=inline;hp=-c

Merge branch 'master' into funding
---

cda147aa999b09a14dacb097d91638f6b9cca236
diff --combined apps/wolnelektury_core/views.py
index 7f2940115,ae582ce2d..77cd01681
--- a/apps/wolnelektury_core/views.py
+++ b/apps/wolnelektury_core/views.py
@@@ -19,7 -19,6 +19,6 @@@ from ajaxable.utils import placeholdize
  from social.templatetags.social_tags import choose_cite
  
  
- @never_cache
  def main_page(request):
      last_published = Book.objects.filter(parent=None).order_by('-created_at')[:4]
      cite = choose_cite(RequestContext(request))
@@@ -90,11 -89,12 +89,12 @@@ def logout_then_redirect(request)
      return HttpResponseRedirect(urlquote_plus(request.GET.get('next', '/'), safe='/?='))
  
  
+ @never_cache
  def clock(request):
 -    """ Provides server time for jquery.countdown,
 +    """ Provides server UTC time for jquery.countdown,
      in a format suitable for Date.parse()
      """
 -    return HttpResponse(datetime.now().strftime('%Y/%m/%d %H:%M:%S'))
 +    return HttpResponse(datetime.utcnow().strftime('%Y/%m/%d %H:%M:%S UTC'))
  
  
  def publish_plan(request):
diff --combined requirements.txt
index 836f6d309,5b422ec06..572251ae4
--- a/requirements.txt
+++ b/requirements.txt
@@@ -5,19 -5,16 +5,19 @@@
  Django>=1.5,<1.6
  fnpdjango>=0.1.6,<0.2
  South>=0.7 # migrations for django
 -django-pipeline>=1.2,<1.3
 +django-pipeline>=1.2.24,<1.3
  django-pagination>=1.0
  django-maintenancemode>=0.10
  django-piston>=0.2.2.1,<0.2.3
- django-jsonfield>=0.9,<0.10
+ -e git+git://github.com/bradjasper/django-jsonfield.git@e67ec8c3652e61d8b47cc8db012a63f5ad39323d#egg=django-jsonfield
  django-picklefield
  
  #django-allauth<0.10 with migration fix
  -e git+git://github.com/rczajka/django-allauth.git@4ecda71b81f9311dea4febe1d2d0105f23c642c7#egg=django-allauth
  
 +pytz
 +pyScss
 +
  # Some contrib apps still need it
  simplejson
  
@@@ -43,7 -40,7 +43,7 @@@ lxml>=2.2.
  # MySQL-python>=1.2,<2.0
  
  # celery tasks
 -django-celery>=2.5.1
 +django-celery>=3.0.11
  django-kombu
  
  # spell checking
@@@ -54,5 -51,3 +54,5 @@@ pyoa
  
  egenix-mx-base
  sunburnt
 +
 +django-getpaid>=1.4,<1.5
diff --combined wolnelektury/settings/__init__.py
index 1ff9e0ef1,1f0d1d2b8..b3950fccb
--- a/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@@ -26,7 -26,6 +26,6 @@@ TEMPLATE_CONTEXT_PROCESSORS = 
  )
  
  MIDDLEWARE_CLASSES = [
-     'django.middleware.cache.UpdateCacheMiddleware',
      'django.middleware.common.CommonMiddleware',
      'django.contrib.sessions.middleware.SessionMiddleware',
      'django.middleware.csrf.CsrfViewMiddleware',
@@@ -37,7 -36,6 +36,6 @@@
      'piwik.django.middleware.PiwikMiddleware',
      'maintenancemode.middleware.MaintenanceModeMiddleware',
      'django.middleware.common.CommonMiddleware',
-     'django.middleware.cache.FetchFromCacheMiddleware',
      'django.contrib.messages.middleware.MessageMiddleware',
      'fnpdjango.middleware.SetRemoteAddrFromXRealIP',
  ]
@@@ -67,13 -65,8 +65,13 @@@ INSTALLED_APPS_OUR = 
      'waiter',
      'search',
      'oai',
 +    'funding',
      ]
  
 +GETPAID_BACKENDS = (
 +    'getpaid.backends.payu',
 +)
 +
  INSTALLED_APPS_CONTRIB = [
      # external
      'django.contrib.auth',
@@@ -94,9 -87,6 +92,9 @@@
      'djkombu',
      'honeypot',
      #'django_nose',
 +    'fnpdjango',
 +    'getpaid',
 +    'getpaid.backends.payu',
  
      #allauth stuff
      'uni_form',