From f8e97069de7a6a854984082ab8dc660483111676 Mon Sep 17 00:00:00 2001
From: jdejoode <jdj@email.com>
Date: Mon, 10 Aug 2015 11:48:45 +0100
Subject: [PATCH 1/2] Add changelog

---
 CHANGELOG.rst | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 CHANGELOG.rst

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 0000000..67bf8af
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,53 @@
+1.1.1
+-----
+* fixes a bug that deleted the Google Analytics javascript
+* adds a licence to the code
+* adds this changelog
+
+1.1
+---
+* adds subsets as a way to navigate and explore quotes, suspensions, short suspensions, etc.
+* boosts number of uwsgi processes 
+* adds a profiler
+* activates 1-grams in keywords and clusters
+
+1.0.6
+-----
+* moves clusters and keywords to jinja templates (speeds them up massively because 
+  there is less client side rendering)
+* boosts number of uwsgi processes 
+
+1.0.5
+-----
+* adds AHRC logo
+
+1.0.4
+-----
+* disables the 6-12 gram options
+* enables indefinite caching
+* swaps the loading bar for a spinning icon
+* reduces the number of clusters that can be retrieved in one go to 3000
+* makes clusters and keywords results clickable (this leads to a concordance, 
+  which in turn is clickable to lead to the text)
+
+1.0.3
+-----
+* chapter view now highlights the search term
+* removes jquery js to highlight the term (now it is done in the backend)
+* adds initial settings management
+* adds more tests
+
+1.0.2
+-----
+* updates text displayed when concordance results table has no entries to '0 entries'
+* refactors concordance view
+* adds functional tests and unit tests
+* starts working with jinja templates
+* cleans up files
+* initial, raw version of a chapter view (when clicking on a concordance line, the chapter is displayed)
+
+1.0.1
+-----
+* adds total count of occurrences in concordance
+* speeds up the concordance (for instance, by optimising xpath queries)
+* fixes issues with non-alphabetic character rendering in the frontend concordance

From 6adb5a22a42cfb89a83b78b8a081acdf1fcec9a3 Mon Sep 17 00:00:00 2001
From: jdejoode <jdj@email.com>
Date: Mon, 10 Aug 2015 12:12:13 +0100
Subject: [PATCH 2/2] Add google analytics js in layout base template

---
 clic/web/templates/layout/default.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/clic/web/templates/layout/default.html b/clic/web/templates/layout/default.html
index 951ea97..1c9b580 100644
--- a/clic/web/templates/layout/default.html
+++ b/clic/web/templates/layout/default.html
@@ -70,6 +70,18 @@ <h1 class="uonHeaderh1">CLiC</h1>
 <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
 <script src="{{ url_for('static', filename='dist/js/bootstrap.min.js') }}"></script>
 
+<!-- Analytics =================================================== -->
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-921739-26', 'nottingham.ac.uk');
+  ga('send', 'pageview');
+
+</script>
+
 <!--Generic JS-->
 {% block scripts %}
 <script src="{{ url_for('static', filename='js/clic.js') }}"></script>