Merge branch 'develop'

changelog.json

@@ -1,4 +1,12 @@
 [
+  {
+    "version": "v2.8.2",
+    "date": "9th June, 2015",
+    "features": [],
+    "bugs": [
+      "Upgrade otto to v1.3.7 to fix synthetic bridge methods created by JDK 8"
+    ]
+  },
   {
     "version": "v2.8.1",
     "date": "5th June, 2015",

smssync/build.gradle

@@ -112,8 +112,8 @@ android {
     }
 
     defaultConfig {
-        versionCode 33
-        versionName "2.8.1"
+        versionCode 34
+        versionName "2.8.2"
         minSdkVersion 8
         targetSdkVersion 22
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -223,7 +223,7 @@ dependencies {
     compile 'com.android.support:appcompat-v7:22.0.0'
     compile 'nl.qbusict:cupboard:2.1.1'
     compile 'com.squareup.okhttp:okhttp:2.2.0'
-    compile 'com.squareup:otto:1.3.4'
+    compile 'com.squareup:otto:1.3.5'
     compile 'com.google.code.gson:gson:2.3.1'
     compile 'com.commonsware.cwac:wakeful:1.0.+'
     androidTestCompile 'org.mockito:mockito-core:1.9.+'

smssync/src/main/play/en-US/whatsnew

@@ -1,2 +1 @@
-- Fixed Navigation drawer. Items not showing on older devices.
-- Fixed alert code sending wrong info when querying for battery level.
+- Upgrade otto to v1.3.7 to fix synthetic bridge methods created by JDK 8.

website-src/layouts/_default/single.html

@@ -1,40 +1,40 @@
 {{/*
-  ~ Copyright (c) 2010 - 2015 Ushahidi Inc
-  ~ All rights reserved
-  ~ Contact: [email protected]
-  ~ Website: http://www.ushahidi.com
-  ~ GNU Lesser General Public License Usage
-  ~ This file may be used under the terms of the GNU Lesser
-  ~ General Public License version 3 as published by the Free Software
-  ~ Foundation and appearing in the file LICENSE.LGPL included in the
-  ~ packaging of this file. Please review the following information to
-  ~ ensure the GNU Lesser General Public License version 3 requirements
-  ~ will be met: http://www.gnu.org/licenses/lgpl.html.
-  ~
-  ~ If you have questions regarding the use of this file, please contact
-  ~ Ushahidi developers at [email protected].
-  -->*/}}
+~ Copyright (c) 2010 - 2015 Ushahidi Inc
+~ All rights reserved
+~ Contact: [email protected]
+~ Website: http://www.ushahidi.com
+~ GNU Lesser General Public License Usage
+~ This file may be used under the terms of the GNU Lesser
+~ General Public License version 3 as published by the Free Software
+~ Foundation and appearing in the file LICENSE.LGPL included in the
+~ packaging of this file. Please review the following information to
+~ ensure the GNU Lesser General Public License version 3 requirements
+~ will be met: http://www.gnu.org/licenses/lgpl.html.
+~
+~ If you have questions regarding the use of this file, please contact
+~ Ushahidi developers at [email protected].
+-->*/}}
 {{ partial "header-media-links.html" . }}
 <title>{{ .Site.Title }} - {{ .Title }}</title>
 {{ partial "header-end-tags.html" . }}
 {{ partial "menu.html" . }}
+<div class="container">
+    <div class="jumbotron">
+        <h2>{{ .Site.Params.tagline }}</h2>
+    </div>
+    <!-- header ends -->
     <div class="container">
-        {{ partial "alerts.html" . }}
-        <div class="jumbotron">
-            <h2>{{ .Site.Params.tagline }}</h2>
-        </div>
-        <!-- header ends -->
-        <div class="container">
-          <div class="page-header">
+        <div class="page-header">
             {{ .Params.header | safeHtml }}
-          </div>
         </div>
-        <!-- body starts -->
-        <div class="container">
-          {{ .Content }}
-        </div> <!-- body ends -->
-          {{ partial "container-footer.html" . }}
     </div>
+    <!-- body starts -->
+    <div class="container">
+        {{ .Content }}
+    </div>
+    <!-- body ends -->
+    {{ partial "container-footer.html" . }}
+</div>
 {{ partial "footer-scripts.html" . }}
 {{ partial "google-analytics.html" . }}
 {{ partial "footer.html" . }}

website-src/layouts/configure/single.html

@@ -19,7 +19,6 @@
 {{ partial "header-end-tags.html" . }}
 {{ partial "menu.html" . }}
     <div class="container">
-        {{ partial "alerts.html" . }}
         <div class="jumbotron">
             <h2>{{ .Site.Params.tagline }}</h2>
       </div>

website-src/layouts/contributors/single.html

@@ -30,7 +30,6 @@
 {{ partial "header-end-tags.html" . }}
 {{ partial "menu.html" . }}
     <div class="container">
-        {{ partial "alerts.html" . }}
         <div class="jumbotron">
             <h2>{{ .Site.Params.tagline }}</h2>
       </div>

website-src/layouts/developers/single.html

@@ -20,7 +20,6 @@
 {{ partial "header.html" . }}
 {{ partial "menu.html" . }}
     <div class="container">
-        {{ partial "alerts.html" . }}
         <div class="jumbotron">
             <h2>{{ .Site.Params.tagline }}</h2>
       </div>