From a20db8d1c1b5d848b02730c66634ea578a1bdecc Mon Sep 17 00:00:00 2001 From: "K. Shankari" Date: Thu, 18 Oct 2018 20:59:54 -0700 Subject: [PATCH 1/4] Revert "Merge pull request #364 from AndyLc/summarychange" This reverts commit 5f8b542c87a4765613837d8bf0341ab5b70ca762, reversing changes made to 51bc19f7de7743e19346cf298be3fe1accacd57f. So we will no longer start with a stop sign, which is not actually required, since any studies should really use emTripLog instead --- www/img/stop.png | Bin 15950 -> 0 bytes www/templates/intro/intro.html | 3 --- www/templates/intro/study-text.html | 19 ------------------- www/templates/intro/summary.html | 1 + 4 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 www/img/stop.png delete mode 100644 www/templates/intro/study-text.html diff --git a/www/img/stop.png b/www/img/stop.png deleted file mode 100644 index 6cd93ac9d703684907a5a5291b922c5a377bf05e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15950 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 BW6A&k diff --git a/www/templates/intro/intro.html b/www/templates/intro/intro.html index 925706c32..471c9944b 100644 --- a/www/templates/intro/intro.html +++ b/www/templates/intro/intro.html @@ -1,8 +1,5 @@ - - - diff --git a/www/templates/intro/study-text.html b/www/templates/intro/study-text.html deleted file mode 100644 index 487172567..000000000 --- a/www/templates/intro/study-text.html +++ /dev/null @@ -1,19 +0,0 @@ - - -
-
-
- -
-
-
-
If you are joining a study, please return to your study instructions and complete the second step before proceeding.
-
-
If you aren't joining a study, please proceed!
-
-
- - - diff --git a/www/templates/intro/summary.html b/www/templates/intro/summary.html index 1ea4f5890..2dbd1f0a7 100644 --- a/www/templates/intro/summary.html +++ b/www/templates/intro/summary.html @@ -24,3 +24,4 @@ GETTING STARTED + From 3483f677cee19908f90dd79bdbf736cd789cd634 Mon Sep 17 00:00:00 2001 From: "K. Shankari" Date: Thu, 18 Oct 2018 23:08:29 -0700 Subject: [PATCH 2/4] Bump up the version number Finally a new e-mission release! --- config.cordovabuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.cordovabuild.xml b/config.cordovabuild.xml index e3a08bda8..a403df92e 100644 --- a/config.cordovabuild.xml +++ b/config.cordovabuild.xml @@ -1,5 +1,5 @@ - + emission A commute pattern tracker and carbon footprint estimator. From b90ef8c5375ffbab26f416a93abece438ae78cc0 Mon Sep 17 00:00:00 2001 From: "K. Shankari" Date: Fri, 19 Oct 2018 00:07:24 -0700 Subject: [PATCH 3/4] Fix habitica sign-in after switch to promisified storage When you run Promise.all([task1, task2]).then(function(...)) the function receives an array of [result1, result2], not two separate arguments. I wasn't able to test this earlier because the app with habitica included is too large to serve, so the habitica css was split out (f3f91718ca6b2a770fe62f3cccd43d09e80d3483) After copying it back, I tested, and fixed this issue. --- www/js/goals.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/js/goals.js b/www/js/goals.js index 9c5945dfc..7f5b76645 100644 --- 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(); From a5dc52318a3d238995ca9c89e9ca79e705e5a950 Mon Sep 17 00:00:00 2001 From: "K. Shankari" Date: Fri, 19 Oct 2018 00:11:32 -0700 Subject: [PATCH 4/4] Bump up the version number again To account for b90ef8c5375ffbab26f416a93abece438ae78cc0 --- config.cordovabuild.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.cordovabuild.xml b/config.cordovabuild.xml index a403df92e..a35c467bc 100644 --- a/config.cordovabuild.xml +++ b/config.cordovabuild.xml @@ -1,5 +1,5 @@ - + emission A commute pattern tracker and carbon footprint estimator.