Merge branch 'release/0.0.9.2'

.env.example

@@ -44,9 +44,6 @@ APP_SHORTURL=examp.le
 ADMIN_USER=admin
 ADMIN_PASS=password
 
-PIWIK_URL=
-PIWIK_SITE_ID=
-
 TWITTER_CONSUMER_KEY=
 TWITTER_CONSUMER_SECRET=
 TWITTER_ACCESS_TOKEN=

bower.json

@@ -19,8 +19,8 @@
     "fetch": "~1.0",
     "alertify.js": "alertifyjs#~1.0.5",
     "store2": "~2.3.2",
-    "Autolinker.js": "^0.27.0",
+    "Autolinker.js": "~1.0",
-    "marked": "~0.3.5",
+    "marked": "^0.3.6",
     "sanitize-css": "^4.1.0"
   }
 }

changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Version 0.0.9.2 (2016-09-08)
+  - Remove Piwik
+  - Updated some bower dependencies
+  - Tidy some `.git*` files
+
 ## Version 0.0.9.1 (2016-09-07)
   - Fix an issue with syndicating notes.
 

resources/views/master.blade.php

@@ -36,23 +36,5 @@
   <!--scripts go here when needed-->
   @show
 
-  {{-- The piwik code that should only be shown in production --}}
-  @if (env('PIWIK_URL') !== null)
-  <!-- Piwik -->
-  <script type="text/javascript">
-    var _paq = _paq || [];
-    _paq.push(['trackPageView']);
-    _paq.push(['enableLinkTracking']);
-    (function() {
-      var u="{{ env('PIWIK_URL') }}";
-      _paq.push(['setTrackerUrl', u+'/piwik.php']);
-      _paq.push(['setSiteId', {{ env('PIWIK_SITE_ID') }}]);
-      var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-      g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'/piwik.js'; s.parentNode.insertBefore(g,s);
-    })();
-  </script>
-  <noscript><p><img src="{{ env('PIWIK_URL') }}/piwik.php?idsite={{ env('PIWIK_SITE_ID') }}" style="border:0;" alt="" /></p></noscript>
-  <!-- End Piwik Code -->
-  @endif
 </body>
 </html>

storage/HTML/.gitignore

@@ -1,3 +1,2 @@
 *
 !.gitignore
-!.gitkeep

storage/media-tmp/.gitignore

@@ -1,3 +1,2 @@
 *
 !.gitignore
-!.gitkeep