Merge pull request #481 from shankari/release_270

Release 270
e-mission · Oct 19, 2018 · d561906 · d561906
2 parents 6496483 + a5dc523
commit d561906
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 24 deletions.
diff --git a/config.cordovabuild.xml b/config.cordovabuild.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="35" id="edu.berkeley.eecs.emission" ios-CFBundleVersion="35" version="2.6.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="37" id="edu.berkeley.eecs.emission" ios-CFBundleVersion="37" version="2.7.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>emission</name>
     <description>
         A commute pattern tracker and carbon footprint estimator.

diff --git a/www/img/stop.png b/www/img/stop.png
diff --git a/www/js/goals.js b/www/js/goals.js
@@ -853,7 +853,7 @@ angular.module('emission.main.goals',['emission.services', 'emission.plugin.logg
         console.log("Refreshing information");
         refresh = true;
         Promise.all([KVStore.get('party_id'),
-            KVStore.get(HABITICA_REGISTERED_KEY)]).then(function(party_id, is_registered) {
+            KVStore.get(HABITICA_REGISTERED_KEY)]).then(function([party_id, is_registered]) {
         console.log("Party ID = " + party_id);
         if (is_registered == true) {
             getUserInfo();

diff --git a/www/templates/intro/intro.html b/www/templates/intro/intro.html
@@ -1,8 +1,5 @@
 <ion-view hide-nav-bar="true" class="intro-view">
     <ion-slide-box delegate-handle="intro-box" on-slide-changed="slideChanged(index)" show-pager="false">
-      <ion-slide>
-        <ng-include src="'templates/intro/study-text.html'"></ng-include>
-      </ion-slide>
       <ion-slide>
         <ng-include src="'templates/intro/summary.html'"></ng-include>
       </ion-slide>

diff --git a/www/templates/intro/study-text.html b/www/templates/intro/study-text.html
diff --git a/www/templates/intro/summary.html b/www/templates/intro/summary.html
@@ -24,3 +24,4 @@
     GETTING STARTED
   </button>
 </ion-footer-bar>
+