From 92beb8bf790ea7942439b9b16274e68628e60175 Mon Sep 17 00:00:00 2001 From: Harry Bridge Date: Sat, 12 Mar 2016 18:12:39 +0000 Subject: [PATCH 1/4] Fixed jquery version --- templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/base.html b/templates/base.html index 23476432..d190e724 100644 --- a/templates/base.html +++ b/templates/base.html @@ -21,7 +21,7 @@ {% block css %} {% endblock %} - + {% block preload_js %} From 5d48d75f342b94f0b35c5b9f6b06b3135aa002a5 Mon Sep 17 00:00:00 2001 From: Harry Bridge Date: Sat, 12 Mar 2016 18:17:03 +0000 Subject: [PATCH 2/4] Make protocol-agnostic --- templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/base.html b/templates/base.html index d190e724..cc3e9dd5 100644 --- a/templates/base.html +++ b/templates/base.html @@ -21,7 +21,7 @@ {% block css %} {% endblock %} - + {% block preload_js %} From 54dc29b4b28074c1e25b619448e0997810015ff0 Mon Sep 17 00:00:00 2001 From: Tom Price Date: Thu, 17 Mar 2016 17:18:42 +0000 Subject: [PATCH 3/4] Switch to jquery CDN who provide a sha256 hash to validate against. Advise is now to always use HTTPS for libraries as somebody else manages the certificate it will always validate and it makes sure that a large target doesn't get subject to MITM attack. --- templates/base.html | 62 ++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/templates/base.html b/templates/base.html index cc3e9dd5..c27231bd 100644 --- a/templates/base.html +++ b/templates/base.html @@ -14,14 +14,16 @@ - + {% block css %} {% endblock %} - + {% block preload_js %} @@ -46,32 +48,40 @@
  • @@ -177,7 +187,7 @@ jQuery(document).on('click', '.modal-href', function (e) { $link = jQuery(this); // Anti modal inception - if($link.parents('#modal').length == 0) { + if ($link.parents('#modal').length == 0) { e.preventDefault(); modaltarget = $link.data('target'); modalobject = ""; @@ -189,11 +199,11 @@ var easter_egg = new Konami(); - easter_egg.code = function() { + easter_egg.code = function () { var s = document.createElement('script'); - s.type='text/javascript'; + s.type = 'text/javascript'; document.body.appendChild(s); - s.src='{% static "js/asteroids.min.js"%}'; + s.src = '{% static "js/asteroids.min.js"%}'; ga('send', 'event', 'easter_egg', 'activated'); } easter_egg.load(); From 94679d67830580e80353c1f5058ba89e9ae01191 Mon Sep 17 00:00:00 2001 From: Tom Price Date: Thu, 17 Mar 2016 17:23:21 +0000 Subject: [PATCH 4/4] Update seleium version for Wercker --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6366da5c..532cadea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ python-dateutil==2.4.2 pytz==2015.4 raven==5.8.1 reportlab==3.1.44 -selenium==2.46.0 +selenium==2.53.1 simplejson==3.7.2 six==1.9.0 sqlparse==0.1.15