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

Merge branch 'master' into funding
---

cda147aa999b09a14dacb097d91638f6b9cca236
diff --cc apps/wolnelektury_core/views.py
index 7f2940115,ae582ce2d..77cd01681
--- a/apps/wolnelektury_core/views.py
+++ b/apps/wolnelektury_core/views.py
@@@ -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):