Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Fixed typo in filterv-example #22

Closed
wants to merge 1 commit into
from

Conversation

Projects
None yet
3 participants

alf commented Apr 18, 2012

I assume this is a typo

@Tirael90 Tirael90 referenced this pull request in clojure-android/clojure Nov 19, 2014

Closed

Android 5.0 - L #3

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit e48219f73ead40c975270d105c4e3d81f7e4f92e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 17:55:20 2014 -0700

    added test for zoom on all fields and sorting by last24 next24 and workability

commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
Merge: 4fd31c1 3fb9894
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 15 23:39:41 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
      Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      fix for update

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 18:29:28 2014 -0700

    fixed a test bug

commit d563da337b94dd7131efa4afda61000f600162bf
Merge: e48219f 5b8d770
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 00:56:10 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
      Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e48219f73ead40c975270d105c4e3d81f7e4f92e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 17:55:20 2014 -0700

    added test for zoom on all fields and sorting by last24 next24 and workability

commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
Merge: 4fd31c1 3fb9894
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 15 23:39:41 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
      Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      fix for update

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit eea36d5154b6f910c7623333599066162ecbf6bb
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 15:36:39 2014 -0700

    check field details renders something

commit d7d110f9d967869952d532f495bdc711acb8a07f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 14:17:38 2014 -0700

    verifing fields loads are unique and complete

commit e4c249817e09001e31b7f0fd446c85899d9db5cf
Merge: cd2045d 9a02bbd
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 01:30:05 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
      Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 18:29:28 2014 -0700

    fixed a test bug

commit d563da337b94dd7131efa4afda61000f600162bf
Merge: e48219f 5b8d770
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 00:56:10 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
      Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e48219f73ead40c975270d105c4e3d81f7e4f92e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 17:55:20 2014 -0700

    added test for zoom on all fields and sorting by last24 next24 and workability

commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
Merge: 4fd31c1 3fb9894
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 15 23:39:41 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
      Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      fix for update

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:10:51 2014 -0700

    merging down code

commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a
Merge: 0ab6c52 c0327b4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:06 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:02 2014 -0700

    added login and out test flow

commit c0327b4fc13c89418e08bf36533dd05722bc955c
Merge: fef974b fdd7bd9
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:05:34 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f':
      Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

commit fef974ba5e14209211b9addc0d1563d3b3fcfccd
Merge: eea36d5 45ae29a
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 22:38:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851':
      Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit eea36d5154b6f910c7623333599066162ecbf6bb
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 15:36:39 2014 -0700

    check field details renders something

commit d7d110f9d967869952d532f495bdc711acb8a07f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 14:17:38 2014 -0700

    verifing fields loads are unique and complete

commit e4c249817e09001e31b7f0fd446c85899d9db5cf
Merge: cd2045d 9a02bbd
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 01:30:05 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
      Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 18:29:28 2014 -0700

    fixed a test bug

commit d563da337b94dd7131efa4afda61000f600162bf
Merge: e48219f 5b8d770
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 00:56:10 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
      Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e48219f73ead40c975270d105c4e3d81f7e4f92e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 17:55:20 2014 -0700

    added test for zoom on all fields and sorting by last24 next24 and workability

commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
Merge: 4fd31c1 3fb9894
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 15 23:39:41 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
      Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      fix for update

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3
Merge: c5d6157 5d2bd65
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:41 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit c5d6157e451ed03c08643ba3c629e717b89f15d0
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:12 2014 -0700

    added additional logging for when test fails

commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054
Merge: ca6a0f5 a759b85
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:15:43 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665':
      Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:10:51 2014 -0700

    merging down code

commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a
Merge: 0ab6c52 c0327b4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:06 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:02 2014 -0700

    added login and out test flow

commit c0327b4fc13c89418e08bf36533dd05722bc955c
Merge: fef974b fdd7bd9
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:05:34 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f':
      Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

commit fef974ba5e14209211b9addc0d1563d3b3fcfccd
Merge: eea36d5 45ae29a
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 22:38:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851':
      Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit eea36d5154b6f910c7623333599066162ecbf6bb
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 15:36:39 2014 -0700

    check field details renders something

commit d7d110f9d967869952d532f495bdc711acb8a07f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 14:17:38 2014 -0700

    verifing fields loads are unique and complete

commit e4c249817e09001e31b7f0fd446c85899d9db5cf
Merge: cd2045d 9a02bbd
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 01:30:05 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
      Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 18:29:28 2014 -0700

    fixed a test bug

commit d563da337b94dd7131efa4afda61000f600162bf
Merge: e48219f 5b8d770
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 00:56:10 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
      Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e48219f73ead40c975270d105c4e3d81f7e4f92e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 17:55:20 2014 -0700

    added test for zoom on all fields and sorting by last24 next24 and workability

commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
Merge: 4fd31c1 3fb9894
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 15 23:39:41 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
      Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      fix for update

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit 28b60c61c17c95741ec331373c964658cff8f828
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 17 10:44:35 2014 -0700

    minor test change

commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73
Merge: 9771b57 22195c3
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:46:27 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b':
      Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3
Merge: c5d6157 5d2bd65
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:41 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit c5d6157e451ed03c08643ba3c629e717b89f15d0
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:12 2014 -0700

    added additional logging for when test fails

commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054
Merge: ca6a0f5 a759b85
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:15:43 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665':
      Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:10:51 2014 -0700

    merging down code

commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a
Merge: 0ab6c52 c0327b4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:06 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:02 2014 -0700

    added login and out test flow

commit c0327b4fc13c89418e08bf36533dd05722bc955c
Merge: fef974b fdd7bd9
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:05:34 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f':
      Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

commit fef974ba5e14209211b9addc0d1563d3b3fcfccd
Merge: eea36d5 45ae29a
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 22:38:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851':
      Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit eea36d5154b6f910c7623333599066162ecbf6bb
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 15:36:39 2014 -0700

    check field details renders something

commit d7d110f9d967869952d532f495bdc711acb8a07f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 14:17:38 2014 -0700

    verifing fields loads are unique and complete

commit e4c249817e09001e31b7f0fd446c85899d9db5cf
Merge: cd2045d 9a02bbd
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 01:30:05 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
      Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 18:29:28 2014 -0700

    fixed a test bug

commit d563da337b94dd7131efa4afda61000f600162bf
Merge: e48219f 5b8d770
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 00:56:10 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
      Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e48219f73ead40c975270d105c4e3d81f7e4f92e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 17:55:20 2014 -0700

    added test for zoom on all fields and sorting by last24 next24 and workability

commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
Merge: 4fd31c1 3fb9894
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 15 23:39:41 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
      Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      fix for update

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #33 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 10:54:02 2014 -0700

    minor test case change

commit 1a46521938924c7d99b12990103b37a34f83a464
Merge: 28b60c6 43440f4
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 17 17:46:24 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b':
      Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 28b60c61c17c95741ec331373c964658cff8f828
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 17 10:44:35 2014 -0700

    minor test change

commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73
Merge: 9771b57 22195c3
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:46:27 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b':
      Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3
Merge: c5d6157 5d2bd65
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:41 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit c5d6157e451ed03c08643ba3c629e717b89f15d0
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:12 2014 -0700

    added additional logging for when test fails

commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054
Merge: ca6a0f5 a759b85
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:15:43 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665':
      Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:10:51 2014 -0700

    merging down code

commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a
Merge: 0ab6c52 c0327b4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:06 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:02 2014 -0700

    added login and out test flow

commit c0327b4fc13c89418e08bf36533dd05722bc955c
Merge: fef974b fdd7bd9
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:05:34 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f':
      Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

commit fef974ba5e14209211b9addc0d1563d3b3fcfccd
Merge: eea36d5 45ae29a
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 22:38:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851':
      Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit eea36d5154b6f910c7623333599066162ecbf6bb
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 15:36:39 2014 -0700

    check field details renders something

commit d7d110f9d967869952d532f495bdc711acb8a07f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 14:17:38 2014 -0700

    verifing fields loads are unique and complete

commit e4c249817e09001e31b7f0fd446c85899d9db5cf
Merge: cd2045d 9a02bbd
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 01:30:05 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
      Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 18:29:28 2014 -0700

    fixed a test bug

commit d563da337b94dd7131efa4afda61000f600162bf
Merge: e48219f 5b8d770
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 00:56:10 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
      Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e48219f73ead40c975270d105c4e3d81f7e4f92e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 17:55:20 2014 -0700

    added test for zoom on all fields and sorting by last24 next24 and workability

commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
Merge: 4fd31c1 3fb9894
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 15 23:39:41 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
      Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      fix for update

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #34 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit 4fd36c44b9b9c1609439c0298748cb46ab3dbdab
Merge: f239028 1599715
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:27:59 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java

commit f2390282424ff79771be0eb8f02c42052876d9b9
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:23:27 2014 -0700

    added testing workability and sort order

commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 10:54:02 2014 -0700

    minor test case change

commit 1a46521938924c7d99b12990103b37a34f83a464
Merge: 28b60c6 43440f4
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 17 17:46:24 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b':
      Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 28b60c61c17c95741ec331373c964658cff8f828
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 17 10:44:35 2014 -0700

    minor test change

commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73
Merge: 9771b57 22195c3
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:46:27 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b':
      Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3
Merge: c5d6157 5d2bd65
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:41 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit c5d6157e451ed03c08643ba3c629e717b89f15d0
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:12 2014 -0700

    added additional logging for when test fails

commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054
Merge: ca6a0f5 a759b85
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:15:43 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665':
      Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:10:51 2014 -0700

    merging down code

commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a
Merge: 0ab6c52 c0327b4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:06 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:02 2014 -0700

    added login and out test flow

commit c0327b4fc13c89418e08bf36533dd05722bc955c
Merge: fef974b fdd7bd9
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:05:34 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f':
      Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

commit fef974ba5e14209211b9addc0d1563d3b3fcfccd
Merge: eea36d5 45ae29a
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 22:38:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851':
      Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit eea36d5154b6f910c7623333599066162ecbf6bb
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 15:36:39 2014 -0700

    check field details renders something

commit d7d110f9d967869952d532f495bdc711acb8a07f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 14:17:38 2014 -0700

    verifing fields loads are unique and complete

commit e4c249817e09001e31b7f0fd446c85899d9db5cf
Merge: cd2045d 9a02bbd
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 01:30:05 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
      Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 18:29:28 2014 -0700

    fixed a test bug

commit d563da337b94dd7131efa4afda61000f600162bf
Merge: e48219f 5b8d770
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 00:56:10 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
      Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e48219f73ead40c975270d105c4e3d81f7e4f92e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 17:55:20 2014 -0700

    added test for zoom on all fields and sorting by last24 next24 and workability

commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
Merge: 4fd31c1 3fb9894
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 15 23:39:41 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
      Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      fix for update

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #36 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit a65c57e0003fe33b7693555e653c5f2a094e5d99
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 17:01:38 2014 -0700

    adjust validation on CLU Editor. Updated tests cases for it

commit 272a0a1732c4d36a393b412ae4d322d42a267adb
Merge: 4fd36c4 c0638c5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 18 20:14:01 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'c0638c5320261ea92c1ff871d32ea60d10a5e383':
      Merge pull request #35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
      Merge pull request #34 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 4fd36c44b9b9c1609439c0298748cb46ab3dbdab
Merge: f239028 1599715
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:27:59 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java

commit f2390282424ff79771be0eb8f02c42052876d9b9
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:23:27 2014 -0700

    added testing workability and sort order

commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 10:54:02 2014 -0700

    minor test case change

commit 1a46521938924c7d99b12990103b37a34f83a464
Merge: 28b60c6 43440f4
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 17 17:46:24 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b':
      Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 28b60c61c17c95741ec331373c964658cff8f828
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 17 10:44:35 2014 -0700

    minor test change

commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73
Merge: 9771b57 22195c3
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:46:27 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b':
      Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3
Merge: c5d6157 5d2bd65
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:41 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit c5d6157e451ed03c08643ba3c629e717b89f15d0
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:12 2014 -0700

    added additional logging for when test fails

commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054
Merge: ca6a0f5 a759b85
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:15:43 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665':
      Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:10:51 2014 -0700

    merging down code

commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a
Merge: 0ab6c52 c0327b4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:06 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:02 2014 -0700

    added login and out test flow

commit c0327b4fc13c89418e08bf36533dd05722bc955c
Merge: fef974b fdd7bd9
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:05:34 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f':
      Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

commit fef974ba5e14209211b9addc0d1563d3b3fcfccd
Merge: eea36d5 45ae29a
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 22:38:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851':
      Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit eea36d5154b6f910c7623333599066162ecbf6bb
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 15:36:39 2014 -0700

    check field details renders something

commit d7d110f9d967869952d532f495bdc711acb8a07f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 14:17:38 2014 -0700

    verifing fields loads are unique and complete

commit e4c249817e09001e31b7f0fd446c85899d9db5cf
Merge: cd2045d 9a02bbd
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 01:30:05 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
      Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 18:29:28 2014 -0700

    fixed a test bug

commit d563da337b94dd7131efa4afda61000f600162bf
Merge: e48219f 5b8d770
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 00:56:10 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
      Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e48219f73ead40c975270d105c4e3d81f7e4f92e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 17:55:20 2014 -0700

    added test for zoom on all fields and sorting by last24 next24 and workability

commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
Merge: 4fd31c1 3fb9894
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 15 23:39:41 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
      Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      fix for update

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #37 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit 9ec9a84935db84ff4fd349c208477217f2183048
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 11:11:50 2014 -0700

    fixed a test case I broke

commit 317f95d2ce491cfaa0aab4a7ad41172245df0e68
Merge: a65c57e 82b9e64
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 19 17:41:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '82b9e643e56be19cfb156c61a514fede3955317e':
      Merge pull request #36 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit a65c57e0003fe33b7693555e653c5f2a094e5d99
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 17:01:38 2014 -0700

    adjust validation on CLU Editor. Updated tests cases for it

commit 272a0a1732c4d36a393b412ae4d322d42a267adb
Merge: 4fd36c4 c0638c5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 18 20:14:01 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'c0638c5320261ea92c1ff871d32ea60d10a5e383':
      Merge pull request #35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
      Merge pull request #34 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 4fd36c44b9b9c1609439c0298748cb46ab3dbdab
Merge: f239028 1599715
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:27:59 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java

commit f2390282424ff79771be0eb8f02c42052876d9b9
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:23:27 2014 -0700

    added testing workability and sort order

commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 10:54:02 2014 -0700

    minor test case change

commit 1a46521938924c7d99b12990103b37a34f83a464
Merge: 28b60c6 43440f4
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 17 17:46:24 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b':
      Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 28b60c61c17c95741ec331373c964658cff8f828
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 17 10:44:35 2014 -0700

    minor test change

commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73
Merge: 9771b57 22195c3
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:46:27 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b':
      Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3
Merge: c5d6157 5d2bd65
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:41 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit c5d6157e451ed03c08643ba3c629e717b89f15d0
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:12 2014 -0700

    added additional logging for when test fails

commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054
Merge: ca6a0f5 a759b85
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:15:43 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665':
      Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:10:51 2014 -0700

    merging down code

commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a
Merge: 0ab6c52 c0327b4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:06 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:02 2014 -0700

    added login and out test flow

commit c0327b4fc13c89418e08bf36533dd05722bc955c
Merge: fef974b fdd7bd9
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:05:34 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f':
      Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

commit fef974ba5e14209211b9addc0d1563d3b3fcfccd
Merge: eea36d5 45ae29a
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 22:38:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851':
      Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit eea36d5154b6f910c7623333599066162ecbf6bb
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 15:36:39 2014 -0700

    check field details renders something

commit d7d110f9d967869952d532f495bdc711acb8a07f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 14:17:38 2014 -0700

    verifing fields loads are unique and complete

commit e4c249817e09001e31b7f0fd446c85899d9db5cf
Merge: cd2045d 9a02bbd
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 01:30:05 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
      Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 18:29:28 2014 -0700

    fixed a test bug

commit d563da337b94dd7131efa4afda61000f600162bf
Merge: e48219f 5b8d770
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 00:56:10 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
      Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e48219f73ead40c975270d105c4e3d81f7e4f92e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 17:55:20 2014 -0700

    added test for zoom on all fields and sorting by last24 next24 and workability

commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
Merge: 4fd31c1 3fb9894
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 15 23:39:41 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
      Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      fix for update

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #38 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit e1d446af4b113a15c3dd3deddb3a5b5422157a74
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 14:58:10 2014 -0700

    added functional testing to the planting activity

commit fddd54d99adb83d62012af60ad8dfb55ca50afad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 14:57:08 2014 -0700

    added functional testing to the planting activity

commit 9ec9a84935db84ff4fd349c208477217f2183048
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 11:11:50 2014 -0700

    fixed a test case I broke

commit 317f95d2ce491cfaa0aab4a7ad41172245df0e68
Merge: a65c57e 82b9e64
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 19 17:41:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '82b9e643e56be19cfb156c61a514fede3955317e':
      Merge pull request #36 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit a65c57e0003fe33b7693555e653c5f2a094e5d99
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 17:01:38 2014 -0700

    adjust validation on CLU Editor. Updated tests cases for it

commit 272a0a1732c4d36a393b412ae4d322d42a267adb
Merge: 4fd36c4 c0638c5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 18 20:14:01 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'c0638c5320261ea92c1ff871d32ea60d10a5e383':
      Merge pull request #35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
      Merge pull request #34 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 4fd36c44b9b9c1609439c0298748cb46ab3dbdab
Merge: f239028 1599715
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:27:59 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java

commit f2390282424ff79771be0eb8f02c42052876d9b9
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:23:27 2014 -0700

    added testing workability and sort order

commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 10:54:02 2014 -0700

    minor test case change

commit 1a46521938924c7d99b12990103b37a34f83a464
Merge: 28b60c6 43440f4
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 17 17:46:24 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b':
      Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 28b60c61c17c95741ec331373c964658cff8f828
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 17 10:44:35 2014 -0700

    minor test change

commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73
Merge: 9771b57 22195c3
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:46:27 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b':
      Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3
Merge: c5d6157 5d2bd65
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:41 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit c5d6157e451ed03c08643ba3c629e717b89f15d0
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:12 2014 -0700

    added additional logging for when test fails

commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054
Merge: ca6a0f5 a759b85
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:15:43 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665':
      Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:10:51 2014 -0700

    merging down code

commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a
Merge: 0ab6c52 c0327b4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:06 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:02 2014 -0700

    added login and out test flow

commit c0327b4fc13c89418e08bf36533dd05722bc955c
Merge: fef974b fdd7bd9
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:05:34 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f':
      Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

commit fef974ba5e14209211b9addc0d1563d3b3fcfccd
Merge: eea36d5 45ae29a
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 22:38:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851':
      Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit eea36d5154b6f910c7623333599066162ecbf6bb
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 15:36:39 2014 -0700

    check field details renders something

commit d7d110f9d967869952d532f495bdc711acb8a07f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 14:17:38 2014 -0700

    verifing fields loads are unique and complete

commit e4c249817e09001e31b7f0fd446c85899d9db5cf
Merge: cd2045d 9a02bbd
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 01:30:05 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
      Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 18:29:28 2014 -0700

    fixed a test bug

commit d563da337b94dd7131efa4afda61000f600162bf
Merge: e48219f 5b8d770
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 00:56:10 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
      Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e48219f73ead40c975270d105c4e3d81f7e4f92e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 17:55:20 2014 -0700

    added test for zoom on all fields and sorting by last24 next24 and workability

commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
Merge: 4fd31c1 3fb9894
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 15 23:39:41 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
      Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      fix for update

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #39 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit 13d554fe2650bbdb6caab96dcd6f1aafbdea90b0
Merge: 3369de0 1474c28
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 18:03:04 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/ui/PlantingFunctionalTest.java

commit 3369de0739d65fac9f64fdb8f0ded7d361191521
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 17:58:32 2014 -0700

    added test for adding multiple fields to a planting scout

commit e1d446af4b113a15c3dd3deddb3a5b5422157a74
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 14:58:10 2014 -0700

    added functional testing to the planting activity

commit fddd54d99adb83d62012af60ad8dfb55ca50afad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 14:57:08 2014 -0700

    added functional testing to the planting activity

commit 9ec9a84935db84ff4fd349c208477217f2183048
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 11:11:50 2014 -0700

    fixed a test case I broke

commit 317f95d2ce491cfaa0aab4a7ad41172245df0e68
Merge: a65c57e 82b9e64
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 19 17:41:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '82b9e643e56be19cfb156c61a514fede3955317e':
      Merge pull request #36 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit a65c57e0003fe33b7693555e653c5f2a094e5d99
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 17:01:38 2014 -0700

    adjust validation on CLU Editor. Updated tests cases for it

commit 272a0a1732c4d36a393b412ae4d322d42a267adb
Merge: 4fd36c4 c0638c5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 18 20:14:01 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'c0638c5320261ea92c1ff871d32ea60d10a5e383':
      Merge pull request #35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
      Merge pull request #34 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 4fd36c44b9b9c1609439c0298748cb46ab3dbdab
Merge: f239028 1599715
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:27:59 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java

commit f2390282424ff79771be0eb8f02c42052876d9b9
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:23:27 2014 -0700

    added testing workability and sort order

commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 10:54:02 2014 -0700

    minor test case change

commit 1a46521938924c7d99b12990103b37a34f83a464
Merge: 28b60c6 43440f4
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 17 17:46:24 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b':
      Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 28b60c61c17c95741ec331373c964658cff8f828
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 17 10:44:35 2014 -0700

    minor test change

commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73
Merge: 9771b57 22195c3
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:46:27 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b':
      Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3
Merge: c5d6157 5d2bd65
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:41 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit c5d6157e451ed03c08643ba3c629e717b89f15d0
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:12 2014 -0700

    added additional logging for when test fails

commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054
Merge: ca6a0f5 a759b85
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:15:43 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665':
      Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:10:51 2014 -0700

    merging down code

commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a
Merge: 0ab6c52 c0327b4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:06 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:02 2014 -0700

    added login and out test flow

commit c0327b4fc13c89418e08bf36533dd05722bc955c
Merge: fef974b fdd7bd9
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:05:34 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f':
      Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

commit fef974ba5e14209211b9addc0d1563d3b3fcfccd
Merge: eea36d5 45ae29a
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 22:38:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851':
      Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit eea36d5154b6f910c7623333599066162ecbf6bb
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 15:36:39 2014 -0700

    check field details renders something

commit d7d110f9d967869952d532f495bdc711acb8a07f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 14:17:38 2014 -0700

    verifing fields loads are unique and complete

commit e4c249817e09001e31b7f0fd446c85899d9db5cf
Merge: cd2045d 9a02bbd
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 01:30:05 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
      Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 18:29:28 2014 -0700

    fixed a test bug

commit d563da337b94dd7131efa4afda61000f600162bf
Merge: e48219f 5b8d770
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 00:56:10 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
      Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e48219f73ead40c975270d105c4e3d81f7e4f92e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 17:55:20 2014 -0700

    added test for zoom on all fields and sorting by last24 next24 and workability

commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
Merge: 4fd31c1 3fb9894
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 15 23:39:41 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
      Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      fix for update

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #40 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit caa80d2c66ccc0bf1c87964b196a5d5ec6670c08
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 18:11:20 2014 -0700

    added test for multiple fields

commit dc34634a0217c3e8ec5bcf0c2874719caa472a76
Merge: 13d554f 6b6efb0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 20 01:04:09 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '6b6efb07787a2d7fefca17678003eb220fb44e62':
      Merge pull request #39 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 13d554fe2650bbdb6caab96dcd6f1aafbdea90b0
Merge: 3369de0 1474c28
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 18:03:04 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/ui/PlantingFunctionalTest.java

commit 3369de0739d65fac9f64fdb8f0ded7d361191521
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 17:58:32 2014 -0700

    added test for adding multiple fields to a planting scout

commit e1d446af4b113a15c3dd3deddb3a5b5422157a74
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 14:58:10 2014 -0700

    added functional testing to the planting activity

commit fddd54d99adb83d62012af60ad8dfb55ca50afad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 14:57:08 2014 -0700

    added functional testing to the planting activity

commit 9ec9a84935db84ff4fd349c208477217f2183048
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 11:11:50 2014 -0700

    fixed a test case I broke

commit 317f95d2ce491cfaa0aab4a7ad41172245df0e68
Merge: a65c57e 82b9e64
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 19 17:41:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '82b9e643e56be19cfb156c61a514fede3955317e':
      Merge pull request #36 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit a65c57e0003fe33b7693555e653c5f2a094e5d99
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 17:01:38 2014 -0700

    adjust validation on CLU Editor. Updated tests cases for it

commit 272a0a1732c4d36a393b412ae4d322d42a267adb
Merge: 4fd36c4 c0638c5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 18 20:14:01 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'c0638c5320261ea92c1ff871d32ea60d10a5e383':
      Merge pull request #35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
      Merge pull request #34 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 4fd36c44b9b9c1609439c0298748cb46ab3dbdab
Merge: f239028 1599715
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:27:59 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java

commit f2390282424ff79771be0eb8f02c42052876d9b9
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:23:27 2014 -0700

    added testing workability and sort order

commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 10:54:02 2014 -0700

    minor test case change

commit 1a46521938924c7d99b12990103b37a34f83a464
Merge: 28b60c6 43440f4
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 17 17:46:24 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b':
      Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 28b60c61c17c95741ec331373c964658cff8f828
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 17 10:44:35 2014 -0700

    minor test change

commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73
Merge: 9771b57 22195c3
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:46:27 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b':
      Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3
Merge: c5d6157 5d2bd65
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:41 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit c5d6157e451ed03c08643ba3c629e717b89f15d0
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:12 2014 -0700

    added additional logging for when test fails

commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054
Merge: ca6a0f5 a759b85
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:15:43 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665':
      Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:10:51 2014 -0700

    merging down code

commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a
Merge: 0ab6c52 c0327b4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:06 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:02 2014 -0700

    added login and out test flow

commit c0327b4fc13c89418e08bf36533dd05722bc955c
Merge: fef974b fdd7bd9
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:05:34 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f':
      Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

commit fef974ba5e14209211b9addc0d1563d3b3fcfccd
Merge: eea36d5 45ae29a
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 22:38:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851':
      Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit eea36d5154b6f910c7623333599066162ecbf6bb
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 15:36:39 2014 -0700

    check field details renders something

commit d7d110f9d967869952d532f495bdc711acb8a07f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 14:17:38 2014 -0700

    verifing fields loads are unique and complete

commit e4c249817e09001e31b7f0fd446c85899d9db5cf
Merge: cd2045d 9a02bbd
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 01:30:05 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
      Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 18:29:28 2014 -0700

    fixed a test bug

commit d563da337b94dd7131efa4afda61000f600162bf
Merge: e48219f 5b8d770
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 00:56:10 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
      Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e48219f73ead40c975270d105c4e3d81f7e4f92e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 17:55:20 2014 -0700

    added test for zoom on all fields and sorting by last24 next24 and workability

commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
Merge: 4fd31c1 3fb9894
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 15 23:39:41 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
      Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      fix for update

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #43 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit e9fa699778ad683f7325803ae510fff5223b3ce8
Merge: f9fe1b8 c1c9606
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 24 00:17:33 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'c1c960659e5578f7a20347ec2bd412e633e6ffd8':
      Merge pull request #42 in MOB/climate-android from ~NROSENBERG/climate-android:MOB-576 to master
      Merge pull request #41 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-122 to master

commit f9fe1b877fa6209f90d6612959a76ad53c7d1b0f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 23 17:15:31 2014 -0700

    updated the ignore files

commit b07c691bf2e41bffa4699f32955040d2022f7352
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 23 17:13:46 2014 -0700

    removed build files

commit fff2dfa5244b94c753da584e5bf26bac7362acc5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 23 17:12:18 2014 -0700

    added support for spoon taking screenshots on espresso failure

commit 1f5c4a569e67c19325e1cbaf97439e7670400780
Merge: caa80d2 e5d0471
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 20 01:12:02 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5d047159080a320e90e8315365c539bfa3aff55':
      Merge pull request #40 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit caa80d2c66ccc0bf1c87964b196a5d5ec6670c08
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 18:11:20 2014 -0700

    added test for multiple fields

commit dc34634a0217c3e8ec5bcf0c2874719caa472a76
Merge: 13d554f 6b6efb0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 20 01:04:09 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '6b6efb07787a2d7fefca17678003eb220fb44e62':
      Merge pull request #39 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 13d554fe2650bbdb6caab96dcd6f1aafbdea90b0
Merge: 3369de0 1474c28
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 18:03:04 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/ui/PlantingFunctionalTest.java

commit 3369de0739d65fac9f64fdb8f0ded7d361191521
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 17:58:32 2014 -0700

    added test for adding multiple fields to a planting scout

commit e1d446af4b113a15c3dd3deddb3a5b5422157a74
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 14:58:10 2014 -0700

    added functional testing to the planting activity

commit fddd54d99adb83d62012af60ad8dfb55ca50afad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 14:57:08 2014 -0700

    added functional testing to the planting activity

commit 9ec9a84935db84ff4fd349c208477217f2183048
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 11:11:50 2014 -0700

    fixed a test case I broke

commit 317f95d2ce491cfaa0aab4a7ad41172245df0e68
Merge: a65c57e 82b9e64
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 19 17:41:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '82b9e643e56be19cfb156c61a514fede3955317e':
      Merge pull request #36 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit a65c57e0003fe33b7693555e653c5f2a094e5d99
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 17:01:38 2014 -0700

    adjust validation on CLU Editor. Updated tests cases for it

commit 272a0a1732c4d36a393b412ae4d322d42a267adb
Merge: 4fd36c4 c0638c5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 18 20:14:01 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'c0638c5320261ea92c1ff871d32ea60d10a5e383':
      Merge pull request #35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
      Merge pull request #34 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 4fd36c44b9b9c1609439c0298748cb46ab3dbdab
Merge: f239028 1599715
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:27:59 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java

commit f2390282424ff79771be0eb8f02c42052876d9b9
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:23:27 2014 -0700

    added testing workability and sort order

commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 10:54:02 2014 -0700

    minor test case change

commit 1a46521938924c7d99b12990103b37a34f83a464
Merge: 28b60c6 43440f4
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 17 17:46:24 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b':
      Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 28b60c61c17c95741ec331373c964658cff8f828
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 17 10:44:35 2014 -0700

    minor test change

commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73
Merge: 9771b57 22195c3
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:46:27 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b':
      Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3
Merge: c5d6157 5d2bd65
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:41 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit c5d6157e451ed03c08643ba3c629e717b89f15d0
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:12 2014 -0700

    added additional logging for when test fails

commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054
Merge: ca6a0f5 a759b85
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:15:43 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665':
      Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:10:51 2014 -0700

    merging down code

commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a
Merge: 0ab6c52 c0327b4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:06 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:02 2014 -0700

    added login and out test flow

commit c0327b4fc13c89418e08bf36533dd05722bc955c
Merge: fef974b fdd7bd9
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:05:34 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f':
      Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

commit fef974ba5e14209211b9addc0d1563d3b3fcfccd
Merge: eea36d5 45ae29a
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 22:38:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851':
      Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit eea36d5154b6f910c7623333599066162ecbf6bb
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 15:36:39 2014 -0700

    check field details renders something

commit d7d110f9d967869952d532f495bdc711acb8a07f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 14:17:38 2014 -0700

    verifing fields loads are unique and complete

commit e4c249817e09001e31b7f0fd446c85899d9db5cf
Merge: cd2045d 9a02bbd
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 01:30:05 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
      Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 18:29:28 2014 -0700

    fixed a test bug

commit d563da337b94dd7131efa4afda61000f600162bf
Merge: e48219f 5b8d770
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 00:56:10 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
      Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e48219f73ead40c975270d105c4e3d81f7e4f92e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 17:55:20 2014 -0700

    added test for zoom on all fields and sorting by last24 next24 and workability

commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
Merge: 4fd31c1 3fb9894
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 15 23:39:41 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
      Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      fix for update

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #46 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit d19259ff442b1b3e15c00b178220cf73fed8b3ee
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 24 16:47:35 2014 -0700

    adding tweak to fix issue on emulator

commit ce3b254ffa26d2e5a00ff085097dac2c276918cd
Merge: 8295fc5 7dde0e6
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 24 16:29:59 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit 8295fc5ba0bbad1013811a23659f219c38fab4e2
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 24 16:29:31 2014 -0700

    added spoon to take screenshots before and after tests are ran

commit 7dde0e654a773cbb780a8ed47867c9174056bc3a
Merge: e9fa699 a2a281d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 24 19:11:16 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'a2a281d5a4590c02cc8d1e3126b4091938849050':
      Merge pull request #43 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e9fa699778ad683f7325803ae510fff5223b3ce8
Merge: f9fe1b8 c1c9606
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 24 00:17:33 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'c1c960659e5578f7a20347ec2bd412e633e6ffd8':
      Merge pull request #42 in MOB/climate-android from ~NROSENBERG/climate-android:MOB-576 to master
      Merge pull request #41 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-122 to master

commit f9fe1b877fa6209f90d6612959a76ad53c7d1b0f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 23 17:15:31 2014 -0700

    updated the ignore files

commit b07c691bf2e41bffa4699f32955040d2022f7352
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 23 17:13:46 2014 -0700

    removed build files

commit fff2dfa5244b94c753da584e5bf26bac7362acc5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 23 17:12:18 2014 -0700

    added support for spoon taking screenshots on espresso failure

commit 1f5c4a569e67c19325e1cbaf97439e7670400780
Merge: caa80d2 e5d0471
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 20 01:12:02 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5d047159080a320e90e8315365c539bfa3aff55':
      Merge pull request #40 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit caa80d2c66ccc0bf1c87964b196a5d5ec6670c08
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 18:11:20 2014 -0700

    added test for multiple fields

commit dc34634a0217c3e8ec5bcf0c2874719caa472a76
Merge: 13d554f 6b6efb0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 20 01:04:09 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '6b6efb07787a2d7fefca17678003eb220fb44e62':
      Merge pull request #39 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 13d554fe2650bbdb6caab96dcd6f1aafbdea90b0
Merge: 3369de0 1474c28
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 18:03:04 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/ui/PlantingFunctionalTest.java

commit 3369de0739d65fac9f64fdb8f0ded7d361191521
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 17:58:32 2014 -0700

    added test for adding multiple fields to a planting scout

commit e1d446af4b113a15c3dd3deddb3a5b5422157a74
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 14:58:10 2014 -0700

    added functional testing to the planting activity

commit fddd54d99adb83d62012af60ad8dfb55ca50afad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 14:57:08 2014 -0700

    added functional testing to the planting activity

commit 9ec9a84935db84ff4fd349c208477217f2183048
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 11:11:50 2014 -0700

    fixed a test case I broke

commit 317f95d2ce491cfaa0aab4a7ad41172245df0e68
Merge: a65c57e 82b9e64
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 19 17:41:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '82b9e643e56be19cfb156c61a514fede3955317e':
      Merge pull request #36 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit a65c57e0003fe33b7693555e653c5f2a094e5d99
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 17:01:38 2014 -0700

    adjust validation on CLU Editor. Updated tests cases for it

commit 272a0a1732c4d36a393b412ae4d322d42a267adb
Merge: 4fd36c4 c0638c5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 18 20:14:01 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'c0638c5320261ea92c1ff871d32ea60d10a5e383':
      Merge pull request #35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
      Merge pull request #34 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 4fd36c44b9b9c1609439c0298748cb46ab3dbdab
Merge: f239028 1599715
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:27:59 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java

commit f2390282424ff79771be0eb8f02c42052876d9b9
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:23:27 2014 -0700

    added testing workability and sort order

commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 10:54:02 2014 -0700

    minor test case change

commit 1a46521938924c7d99b12990103b37a34f83a464
Merge: 28b60c6 43440f4
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 17 17:46:24 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b':
      Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 28b60c61c17c95741ec331373c964658cff8f828
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 17 10:44:35 2014 -0700

    minor test change

commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73
Merge: 9771b57 22195c3
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:46:27 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b':
      Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3
Merge: c5d6157 5d2bd65
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:41 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit c5d6157e451ed03c08643ba3c629e717b89f15d0
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:45:12 2014 -0700

    added additional logging for when test fails

commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054
Merge: ca6a0f5 a759b85
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:15:43 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665':
      Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:10:51 2014 -0700

    merging down code

commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a
Merge: 0ab6c52 c0327b4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:06 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 16:06:02 2014 -0700

    added login and out test flow

commit c0327b4fc13c89418e08bf36533dd05722bc955c
Merge: fef974b fdd7bd9
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:05:34 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f':
      Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

commit fef974ba5e14209211b9addc0d1563d3b3fcfccd
Merge: eea36d5 45ae29a
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 22:38:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851':
      Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit eea36d5154b6f910c7623333599066162ecbf6bb
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 15:36:39 2014 -0700

    check field details renders something

commit d7d110f9d967869952d532f495bdc711acb8a07f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 16 14:17:38 2014 -0700

    verifing fields loads are unique and complete

commit e4c249817e09001e31b7f0fd446c85899d9db5cf
Merge: cd2045d 9a02bbd
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 01:30:05 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
      Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 18:29:28 2014 -0700

    fixed a test bug

commit d563da337b94dd7131efa4afda61000f600162bf
Merge: e48219f 5b8d770
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 00:56:10 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
      Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e48219f73ead40c975270d105c4e3d81f7e4f92e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 17:55:20 2014 -0700

    added test for zoom on all fields and sorting by last24 next24 and workability

commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
Merge: 4fd31c1 3fb9894
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 15 23:39:41 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
      Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      fix for update

commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 15 16:37:59 2014 -0700

    added test for SaaS links

commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
Merge: f688c1a 61e95c0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 13 00:41:21 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
      Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
Merge: 5e7b62b c070bc7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:39:50 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 17:30:21 2014 -0700

    cleaned up tests

commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 12 15:25:35 2014 -0700

    udpated gradle to use test res

commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
Merge: 71d5f20 b8eb732
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 12 22:23:58 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
      fixed scouting delete
      scouting fix

commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
Merge: 36774a5 3c318d5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 22:41:08 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      added code for fixing update scouting

commit 36774a52a326a0baac0746df252c5eda2fe90d41
Merge: 79b5657 e5f845f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:30:29 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5f845f242fdc19c844601124a47103964f053ec':
      Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

commit 79b5657249e830bbc535c808d8a6a02b029962cf
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 11 10:05:18 2014 -0700

    map test consolidation

commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
Merge: 586a520 9b46015
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 11 17:04:04 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
      Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Incremented version

commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
Merge: f0cee81 3d01293
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 23:39:06 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
      Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 16:37:57 2014 -0700

    added returning to list after a scouting submit

commit 433c4a0dd89f05593c5bff9db774e638d48a182e
Merge: b1a99bf 108b943
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:59:23 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
      Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:58:33 2014 -0700

    added deleting of scouting event

commit c072e5241e776041a41fb68e7ec1abffa3cf4822
Merge: 7446fa4 f6ae870
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 21:54:52 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
      Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 7446fa48d55b6c27af16702e4235a938da4db7e5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 9 14:53:21 2014 -0700

    updated scouting for pics and refactored code

commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
Merge: acda078 305156d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 9 00:36:17 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
      Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit acda0781dbedb1607d69201a119c44c5afcdebad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 17:35:27 2014 -0700

    added test for imageviewer

commit 489e17858e6351785a2cfe07ee66b406873492b7
Merge: 975f03c e37df5c
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Sep 8 23:59:47 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
      Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 8 16:58:43 2014 -0700

    added image viewer for scouting

commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
Merge: c7e20ad 2597440
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 6 00:17:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '2597440bd31c195f298f5795832260361844e964':
      Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 15:12:52 2014 -0700

    added test for MultipleField selectors

commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 5 14:09:08 2014 -0700

    fixed future radar bug. added tests for it

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #48 in MOB/climate-android from ~CSTUEHRENBERG/cli…
…mate-android:blue-129 to master

Squashed commit of the following:

commit 203d16d76fc5111cce33636ab669624967592543
Merge: 0d3050a d3a3b5f
Author: Curtis <cstuehrenberg@climate.com>
Date:   Thu Sep 25 11:02:04 2014 -0700

    Merge branch 'blue-129' of ssh://stash.ci.climatedna.net:7999/~cstuehrenberg/climate-android into blue-129

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/utils/ClimateInstrumentationTestCase2.java

commit 0d3050aed7641958be17e6bf0d5c9856b79cbe43
Merge: ae3d47a 31e0c81
Author: Curtis <cstuehrenberg@climate.com>
Date:   Thu Sep 25 10:48:09 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into blue-129

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/build.gradle
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/LoginSmokeTest.java
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/utils/ClimateInstrumentationTestCase2.java

commit d3a3b5f4ee94554f32a8063c14705d3758076b52
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date:   Thu Sep 25 17:02:10 2014 +0000

    Merge pull request #6 in ~CSTUEHRENBERG/climate-android from master to blue-129

    Squashed commit of the following:

    commit 40d0441c662f5c1cf79384dbb082baa47371c557
    Merge: fcfa949 ae3d47a
    Author: Curtis <cstuehrenberg@climate.com>
    Date:   Thu Sep 25 10:00:54 2014 -0700

        Merge branch 'blue-129' of ssh://stash.ci.climatedna.net:7999/~cstuehrenberg/climate-android

        Conflicts:
        	ClimateGrowersProject/ClimateGrowersApp/build.gradle
        	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/utils/ClimateInstrumentationTestCase2.java

    commit fcfa949454c6d1472bf0737e84c0c3d37fc5629c
    Author: Curtis <cstuehrenberg@climate.com>
    Date:   Thu Sep 25 09:48:37 2014 -0700

        Removing Josh's prototype fix to resolve merge conflicts with mine

    commit 31e0c81cf54cae458a403e4bdc8e1d90a39d9930
    Author: Joshua Musselwhite <jmusselwhite@climate.com>
    Date:   Wed Sep 24 23:49:30 2014 +0000

        Merge pull request #46 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        Squashed commit of the following:

        commit d19259ff442b1b3e15c00b178220cf73fed8b3ee
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Wed Sep 24 16:47:35 2014 -0700

            adding tweak to fix issue on emulator

        commit ce3b254ffa26d2e5a00ff085097dac2c276918cd
        Merge: 8295fc5 7dde0e6
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Wed Sep 24 16:29:59 2014 -0700

            Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

        commit 8295fc5ba0bbad1013811a23659f219c38fab4e2
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Wed Sep 24 16:29:31 2014 -0700

            added spoon to take screenshots before and after tests are ran

        commit 7dde0e654a773cbb780a8ed47867c9174056bc3a
        Merge: e9fa699 a2a281d
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Wed Sep 24 19:11:16 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'a2a281d5a4590c02cc8d1e3126b4091938849050':
              Merge pull request #43 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit e9fa699778ad683f7325803ae510fff5223b3ce8
        Merge: f9fe1b8 c1c9606
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Wed Sep 24 00:17:33 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'c1c960659e5578f7a20347ec2bd412e633e6ffd8':
              Merge pull request #42 in MOB/climate-android from ~NROSENBERG/climate-android:MOB-576 to master
              Merge pull request #41 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-122 to master

        commit f9fe1b877fa6209f90d6612959a76ad53c7d1b0f
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 23 17:15:31 2014 -0700

            updated the ignore files

        commit b07c691bf2e41bffa4699f32955040d2022f7352
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 23 17:13:46 2014 -0700

            removed build files

        commit fff2dfa5244b94c753da584e5bf26bac7362acc5
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 23 17:12:18 2014 -0700

            added support for spoon taking screenshots on espresso failure

        commit 1f5c4a569e67c19325e1cbaf97439e7670400780
        Merge: caa80d2 e5d0471
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Sat Sep 20 01:12:02 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'e5d047159080a320e90e8315365c539bfa3aff55':
              Merge pull request #40 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit caa80d2c66ccc0bf1c87964b196a5d5ec6670c08
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 18:11:20 2014 -0700

            added test for multiple fields

        commit dc34634a0217c3e8ec5bcf0c2874719caa472a76
        Merge: 13d554f 6b6efb0
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Sat Sep 20 01:04:09 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '6b6efb07787a2d7fefca17678003eb220fb44e62':
              Merge pull request #39 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 13d554fe2650bbdb6caab96dcd6f1aafbdea90b0
        Merge: 3369de0 1474c28
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 18:03:04 2014 -0700

            Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

            Conflicts:
            	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/ui/PlantingFunctionalTest.java

        commit 3369de0739d65fac9f64fdb8f0ded7d361191521
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 17:58:32 2014 -0700

            added test for adding multiple fields to a planting scout

        commit e1d446af4b113a15c3dd3deddb3a5b5422157a74
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 14:58:10 2014 -0700

            added functional testing to the planting activity

        commit fddd54d99adb83d62012af60ad8dfb55ca50afad
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 14:57:08 2014 -0700

            added functional testing to the planting activity

        commit 9ec9a84935db84ff4fd349c208477217f2183048
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 11:11:50 2014 -0700

            fixed a test case I broke

        commit 317f95d2ce491cfaa0aab4a7ad41172245df0e68
        Merge: a65c57e 82b9e64
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Fri Sep 19 17:41:39 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '82b9e643e56be19cfb156c61a514fede3955317e':
              Merge pull request #36 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit a65c57e0003fe33b7693555e653c5f2a094e5d99
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Thu Sep 18 17:01:38 2014 -0700

            adjust validation on CLU Editor. Updated tests cases for it

        commit 272a0a1732c4d36a393b412ae4d322d42a267adb
        Merge: 4fd36c4 c0638c5
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Thu Sep 18 20:14:01 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'c0638c5320261ea92c1ff871d32ea60d10a5e383':
              Merge pull request #35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
              Merge pull request #34 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 4fd36c44b9b9c1609439c0298748cb46ab3dbdab
        Merge: f239028 1599715
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Thu Sep 18 11:27:59 2014 -0700

            Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

            Conflicts:
            	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java

        commit f2390282424ff79771be0eb8f02c42052876d9b9
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Thu Sep 18 11:23:27 2014 -0700

            added testing workability and sort order

        commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Thu Sep 18 10:54:02 2014 -0700

            minor test case change

        commit 1a46521938924c7d99b12990103b37a34f83a464
        Merge: 28b60c6 43440f4
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Wed Sep 17 17:46:24 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b':
              Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 28b60c61c17c95741ec331373c964658cff8f828
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Wed Sep 17 10:44:35 2014 -0700

            minor test change

        commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73
        Merge: 9771b57 22195c3
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 23:46:27 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b':
              Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3
        Merge: c5d6157 5d2bd65
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 16:45:41 2014 -0700

            Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

        commit c5d6157e451ed03c08643ba3c629e717b89f15d0
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 16:45:12 2014 -0700

            added additional logging for when test fails

        commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054
        Merge: ca6a0f5 a759b85
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 23:15:43 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665':
              Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 16:10:51 2014 -0700

            merging down code

        commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a
        Merge: 0ab6c52 c0327b4
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 16:06:06 2014 -0700

            Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

        commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 16:06:02 2014 -0700

            added login and out test flow

        commit c0327b4fc13c89418e08bf36533dd05722bc955c
        Merge: fef974b fdd7bd9
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 23:05:34 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f':
              Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

        commit fef974ba5e14209211b9addc0d1563d3b3fcfccd
        Merge: eea36d5 45ae29a
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 22:38:52 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851':
              Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit eea36d5154b6f910c7623333599066162ecbf6bb
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 15:36:39 2014 -0700

            check field details renders something

        commit d7d110f9d967869952d532f495bdc711acb8a07f
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 14:17:38 2014 -0700

            verifing fields loads are unique and complete

        commit e4c249817e09001e31b7f0fd446c85899d9db5cf
        Merge: cd2045d 9a02bbd
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 01:30:05 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
              Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Mon Sep 15 18:29:28 2014 -0700

            fixed a test bug

        commit d563da337b94dd7131efa4afda61000f600162bf
        Merge: e48219f 5b8d770
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 00:56:10 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
              Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit e48219f73ead40c975270d105c4e3d81f7e4f92e
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Mon Sep 15 17:55:20 2014 -0700

            added test for zoom on all fields and sorting by last24 next24 and workability

        commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
        Merge: 4fd31c1 3fb9894
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Mon Sep 15 23:39:41 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
              Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
              fix for update

        commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Mon Sep 15 16:37:59 2014 -0700

            added test for SaaS links

        commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
        Merge: f688c1a 61e95c0
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Sat Sep 13 00:41:21 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
              Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
        Merge: 5e7b62b c070bc7
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 12 17:39:50 2014 -0700

            Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

            Conflicts:
            	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
            	ClimateGrowersProject/ClimateGrowersApp/build.gradle
            	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

        commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 12 17:30:21 2014 -0700

            cleaned up tests

        commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 12 15:25:35 2014 -0700

            udpated gradle to use test res

        commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
        Merge: 71d5f20 b8eb732
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Fri Sep 12 22:23:58 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
              fixed scouting delete
              scouting fix

        commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
        Merge: 36774a5 3c318d5
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Thu Sep 11 22:41:08 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
              Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
              added code for fixing update scouting

        commit 36774a52a326a0baac0746df252c5eda2fe90d41
        Merge: 79b5657 e5f845f
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Thu Sep 11 17:30:29 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'e5f845f242fdc19c844601124a47103964f053ec':
              Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

        commit 79b5657249e830bbc535c808d8a6a02b029962cf
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Thu Sep 11 10:05:18 2014 -0700

            map test consolidation

        commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
        Merge: 586a520 9b46015
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Thu Sep 11 17:04:04 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
              Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
              Incremented version

        commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
        Merge: f0cee81 3d01293
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 9 23:39:06 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
              Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 9 16:37:57 2014 -0700

            added returning to list after a scouting submit

        commit 433c4a0dd89f05593c5bff9db774e638d48a182e
        Merge: b1a99bf 108b943
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 9 21:59:23 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
              Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 9 14:58:33 2014 -0700

            added deleting of scouting event

        commit c072e5241e776041a41fb68e7ec1abffa3cf4822
        Merge: 7446fa4 f6ae870
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 9 21:54:52 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
              Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 7446fa48d55b6c27af16702e4235a938da4db7e5
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 9 14:53:21 2014 -0700

            updated scouting for pics and refactored code

        commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
        Merge: acda078 305156d
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 9 00:36:17 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
              Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit acda0781dbedb1607d69201a119c44c5afcdebad
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Mon Sep 8 17:35:27 2014 -0700

            added test for imageviewer

        commit 489e17858e6351785a2cfe07ee66b406873492b7
        Merge: 975f03c e37df5c
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Mon Sep 8 23:59:47 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
              Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Mon Sep 8 16:58:43 2014 -0700

            added image viewer for scouting

        commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
        Merge: c7e20ad 2597440
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Sat Sep 6 00:17:39 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '2597440bd31c195f298f5795832260361844e964':
              Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
              Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 5 15:12:52 2014 -0700

            added test for MultipleField selectors

        commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 5 14:09:08 2014 -0700

            fixed future radar bug. added tests for it

    commit a2a281d5a4590c02cc8d1e3126b4091938849050
    Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
    Date:   Wed Sep 24 15:16:04 2014 +0000

        Merge pull request #43 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        Squashed commit of the following:

        commit e9fa699778ad683f7325803ae510fff5223b3ce8
        Merge: f9fe1b8 c1c9606
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Wed Sep 24 00:17:33 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'c1c960659e5578f7a20347ec2bd412e633e6ffd8':
              Merge pull request #42 in MOB/climate-android from ~NROSENBERG/climate-android:MOB-576 to master
              Merge pull request #41 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-122 to master

        commit f9fe1b877fa6209f90d6612959a76ad53c7d1b0f
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 23 17:15:31 2014 -0700

            updated the ignore files

        commit b07c691bf2e41bffa4699f32955040d2022f7352
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 23 17:13:46 2014 -0700

            removed build files

        commit fff2dfa5244b94c753da584e5bf26bac7362acc5
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 23 17:12:18 2014 -0700

            added support for spoon taking screenshots on espresso failure

        commit 1f5c4a569e67c19325e1cbaf97439e7670400780
        Merge: caa80d2 e5d0471
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Sat Sep 20 01:12:02 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'e5d047159080a320e90e8315365c539bfa3aff55':
              Merge pull request #40 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit caa80d2c66ccc0bf1c87964b196a5d5ec6670c08
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 18:11:20 2014 -0700

            added test for multiple fields

        commit dc34634a0217c3e8ec5bcf0c2874719caa472a76
        Merge: 13d554f 6b6efb0
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Sat Sep 20 01:04:09 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '6b6efb07787a2d7fefca17678003eb220fb44e62':
              Merge pull request #39 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 13d554fe2650bbdb6caab96dcd6f1aafbdea90b0
        Merge: 3369de0 1474c28
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 18:03:04 2014 -0700

            Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

            Conflicts:
            	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/ui/PlantingFunctionalTest.java

        commit 3369de0739d65fac9f64fdb8f0ded7d361191521
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 17:58:32 2014 -0700

            added test for adding multiple fields to a planting scout

        commit e1d446af4b113a15c3dd3deddb3a5b5422157a74
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 14:58:10 2014 -0700

            added functional testing to the planting activity

        commit fddd54d99adb83d62012af60ad8dfb55ca50afad
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 14:57:08 2014 -0700

            added functional testing to the planting activity

        commit 9ec9a84935db84ff4fd349c208477217f2183048
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 11:11:50 2014 -0700

            fixed a test case I broke

        commit 317f95d2ce491cfaa0aab4a7ad41172245df0e68
        Merge: a65c57e 82b9e64
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Fri Sep 19 17:41:39 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '82b9e643e56be19cfb156c61a514fede3955317e':
              Merge pull request #36 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit a65c57e0003fe33b7693555e653c5f2a094e5d99
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Thu Sep 18 17:01:38 2014 -0700

            adjust validation on CLU Editor. Updated tests cases for it

        commit 272a0a1732c4d36a393b412ae4d322d42a267adb
        Merge: 4fd36c4 c0638c5
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Thu Sep 18 20:14:01 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'c0638c5320261ea92c1ff871d32ea60d10a5e383':
              Merge pull request #35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
              Merge pull request #34 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 4fd36c44b9b9c1609439c0298748cb46ab3dbdab
        Merge: f239028 1599715
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Thu Sep 18 11:27:59 2014 -0700

            Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

            Conflicts:
            	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java

        commit f2390282424ff79771be0eb8f02c42052876d9b9
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Thu Sep 18 11:23:27 2014 -0700

            added testing workability and sort order

        commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Thu Sep 18 10:54:02 2014 -0700

            minor test case change

        commit 1a46521938924c7d99b12990103b37a34f83a464
        Merge: 28b60c6 43440f4
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Wed Sep 17 17:46:24 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b':
              Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 28b60c61c17c95741ec331373c964658cff8f828
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Wed Sep 17 10:44:35 2014 -0700

            minor test change

        commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73
        Merge: 9771b57 22195c3
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 23:46:27 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b':
              Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3
        Merge: c5d6157 5d2bd65
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 16:45:41 2014 -0700

            Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

        commit c5d6157e451ed03c08643ba3c629e717b89f15d0
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 16:45:12 2014 -0700

            added additional logging for when test fails

        commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054
        Merge: ca6a0f5 a759b85
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 23:15:43 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665':
              Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 16:10:51 2014 -0700

            merging down code

        commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a
        Merge: 0ab6c52 c0327b4
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 16:06:06 2014 -0700

            Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

        commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 16:06:02 2014 -0700

            added login and out test flow

        commit c0327b4fc13c89418e08bf36533dd05722bc955c
        Merge: fef974b fdd7bd9
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 23:05:34 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f':
              Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

        commit fef974ba5e14209211b9addc0d1563d3b3fcfccd
        Merge: eea36d5 45ae29a
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 22:38:52 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851':
              Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit eea36d5154b6f910c7623333599066162ecbf6bb
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 15:36:39 2014 -0700

            check field details renders something

        commit d7d110f9d967869952d532f495bdc711acb8a07f
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 14:17:38 2014 -0700

            verifing fields loads are unique and complete

        commit e4c249817e09001e31b7f0fd446c85899d9db5cf
        Merge: cd2045d 9a02bbd
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 01:30:05 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
              Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Mon Sep 15 18:29:28 2014 -0700

            fixed a test bug

        commit d563da337b94dd7131efa4afda61000f600162bf
        Merge: e48219f 5b8d770
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 00:56:10 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
              Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit e48219f73ead40c975270d105c4e3d81f7e4f92e
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Mon Sep 15 17:55:20 2014 -0700

            added test for zoom on all fields and sorting by last24 next24 and workability

        commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
        Merge: 4fd31c1 3fb9894
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Mon Sep 15 23:39:41 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
              Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
              fix for update

        commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Mon Sep 15 16:37:59 2014 -0700

            added test for SaaS links

        commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
        Merge: f688c1a 61e95c0
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Sat Sep 13 00:41:21 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
              Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
        Merge: 5e7b62b c070bc7
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 12 17:39:50 2014 -0700

            Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

            Conflicts:
            	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
            	ClimateGrowersProject/ClimateGrowersApp/build.gradle
            	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

        commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 12 17:30:21 2014 -0700

            cleaned up tests

        commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 12 15:25:35 2014 -0700

            udpated gradle to use test res

        commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
        Merge: 71d5f20 b8eb732
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Fri Sep 12 22:23:58 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
              fixed scouting delete
              scouting fix

        commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
        Merge: 36774a5 3c318d5
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Thu Sep 11 22:41:08 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
              Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
              added code for fixing update scouting

        commit 36774a52a326a0baac0746df252c5eda2fe90d41
        Merge: 79b5657 e5f845f
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Thu Sep 11 17:30:29 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'e5f845f242fdc19c844601124a47103964f053ec':
              Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

        commit 79b5657249e830bbc535c808d8a6a02b029962cf
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Thu Sep 11 10:05:18 2014 -0700

            map test consolidation

        commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
        Merge: 586a520 9b46015
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Thu Sep 11 17:04:04 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
              Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
              Incremented version

        commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
        Merge: f0cee81 3d01293
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 9 23:39:06 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
              Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 9 16:37:57 2014 -0700

            added returning to list after a scouting submit

        commit 433c4a0dd89f05593c5bff9db774e638d48a182e
        Merge: b1a99bf 108b943
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 9 21:59:23 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
              Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 9 14:58:33 2014 -0700

            added deleting of scouting event

        commit c072e5241e776041a41fb68e7ec1abffa3cf4822
        Merge: 7446fa4 f6ae870
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 9 21:54:52 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
              Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 7446fa48d55b6c27af16702e4235a938da4db7e5
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 9 14:53:21 2014 -0700

            updated scouting for pics and refactored code

        commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
        Merge: acda078 305156d
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 9 00:36:17 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
              Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit acda0781dbedb1607d69201a119c44c5afcdebad
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Mon Sep 8 17:35:27 2014 -0700

            added test for imageviewer

        commit 489e17858e6351785a2cfe07ee66b406873492b7
        Merge: 975f03c e37df5c
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Mon Sep 8 23:59:47 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
              Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Mon Sep 8 16:58:43 2014 -0700

            added image viewer for scouting

        commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
        Merge: c7e20ad 2597440
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Sat Sep 6 00:17:39 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '2597440bd31c195f298f5795832260361844e964':
              Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
              Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 5 15:12:52 2014 -0700

            added test for MultipleField selectors

        commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 5 14:09:08 2014 -0700

            fixed future radar bug. added tests for it

    commit c1c960659e5578f7a20347ec2bd412e633e6ffd8
    Author: Richard Shin <rshin@climate.com>
    Date:   Tue Sep 23 22:30:25 2014 +0000

        Merge pull request #42 in MOB/climate-android from ~NROSENBERG/climate-android:MOB-576 to master

        Squashed commit of the following:

        commit 1295e7c792a1bdc77df1c0beda3609d32da45837
        Author: Nicole Rosenberg <nrosenberg@climate.com>
        Date:   Tue Sep 23 15:23:17 2014 -0700

            [MOB-576] Updating 'last updated' date on SaaS agreement

commit ae3d47a3d41a0bbe21174a768c126d94aa9641c6
Author: Curtis <cstuehrenberg@climate.com>
Date:   Wed Sep 24 17:03:54 2014 -0700

    Added in a new delegate class to account for drawers not being visible enough to click

commit dac6f17d5bcbf1e283ec1d58615f329db12355f3
Author: Curtis <cstuehrenberg@climate.com>
Date:   Wed Sep 24 12:06:03 2014 -0700

    Adding in the fasterxml jackson libraries for test object purposes

commit bd0a80654ecc90b03e755ad4d9ea567573759531
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date:   Wed Sep 24 16:44:17 2014 +0000

    Merge pull request #3 in ~CSTUEHRENBERG/climate-android from master to blue-129

    Squashed commit of the following:

    commit a2a281d5a4590c02cc8d1e3126b4091938849050
    Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
    Date:   Wed Sep 24 15:16:04 2014 +0000

        Merge pull request #43 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        Squashed commit of the following:

        commit e9fa699778ad683f7325803ae510fff5223b3ce8
        Merge: f9fe1b8 c1c9606
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Wed Sep 24 00:17:33 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'c1c960659e5578f7a20347ec2bd412e633e6ffd8':
              Merge pull request #42 in MOB/climate-android from ~NROSENBERG/climate-android:MOB-576 to master
              Merge pull request #41 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-122 to master

        commit f9fe1b877fa6209f90d6612959a76ad53c7d1b0f
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 23 17:15:31 2014 -0700

            updated the ignore files

        commit b07c691bf2e41bffa4699f32955040d2022f7352
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 23 17:13:46 2014 -0700

            removed build files

        commit fff2dfa5244b94c753da584e5bf26bac7362acc5
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 23 17:12:18 2014 -0700

            added support for spoon taking screenshots on espresso failure

        commit 1f5c4a569e67c19325e1cbaf97439e7670400780
        Merge: caa80d2 e5d0471
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Sat Sep 20 01:12:02 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'e5d047159080a320e90e8315365c539bfa3aff55':
              Merge pull request #40 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit caa80d2c66ccc0bf1c87964b196a5d5ec6670c08
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 18:11:20 2014 -0700

            added test for multiple fields

        commit dc34634a0217c3e8ec5bcf0c2874719caa472a76
        Merge: 13d554f 6b6efb0
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Sat Sep 20 01:04:09 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '6b6efb07787a2d7fefca17678003eb220fb44e62':
              Merge pull request #39 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 13d554fe2650bbdb6caab96dcd6f1aafbdea90b0
        Merge: 3369de0 1474c28
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 18:03:04 2014 -0700

            Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

            Conflicts:
            	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/ui/PlantingFunctionalTest.java

        commit 3369de0739d65fac9f64fdb8f0ded7d361191521
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 17:58:32 2014 -0700

            added test for adding multiple fields to a planting scout

        commit e1d446af4b113a15c3dd3deddb3a5b5422157a74
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 14:58:10 2014 -0700

            added functional testing to the planting activity

        commit fddd54d99adb83d62012af60ad8dfb55ca50afad
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 14:57:08 2014 -0700

            added functional testing to the planting activity

        commit 9ec9a84935db84ff4fd349c208477217f2183048
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 19 11:11:50 2014 -0700

            fixed a test case I broke

        commit 317f95d2ce491cfaa0aab4a7ad41172245df0e68
        Merge: a65c57e 82b9e64
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Fri Sep 19 17:41:39 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '82b9e643e56be19cfb156c61a514fede3955317e':
              Merge pull request #36 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit a65c57e0003fe33b7693555e653c5f2a094e5d99
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Thu Sep 18 17:01:38 2014 -0700

            adjust validation on CLU Editor. Updated tests cases for it

        commit 272a0a1732c4d36a393b412ae4d322d42a267adb
        Merge: 4fd36c4 c0638c5
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Thu Sep 18 20:14:01 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'c0638c5320261ea92c1ff871d32ea60d10a5e383':
              Merge pull request #35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
              Merge pull request #34 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 4fd36c44b9b9c1609439c0298748cb46ab3dbdab
        Merge: f239028 1599715
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Thu Sep 18 11:27:59 2014 -0700

            Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

            Conflicts:
            	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java

        commit f2390282424ff79771be0eb8f02c42052876d9b9
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Thu Sep 18 11:23:27 2014 -0700

            added testing workability and sort order

        commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Thu Sep 18 10:54:02 2014 -0700

            minor test case change

        commit 1a46521938924c7d99b12990103b37a34f83a464
        Merge: 28b60c6 43440f4
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Wed Sep 17 17:46:24 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b':
              Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 28b60c61c17c95741ec331373c964658cff8f828
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Wed Sep 17 10:44:35 2014 -0700

            minor test change

        commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73
        Merge: 9771b57 22195c3
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 23:46:27 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b':
              Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3
        Merge: c5d6157 5d2bd65
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 16:45:41 2014 -0700

            Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

        commit c5d6157e451ed03c08643ba3c629e717b89f15d0
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 16:45:12 2014 -0700

            added additional logging for when test fails

        commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054
        Merge: ca6a0f5 a759b85
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 23:15:43 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665':
              Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 16:10:51 2014 -0700

            merging down code

        commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a
        Merge: 0ab6c52 c0327b4
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 16:06:06 2014 -0700

            Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

        commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 16:06:02 2014 -0700

            added login and out test flow

        commit c0327b4fc13c89418e08bf36533dd05722bc955c
        Merge: fef974b fdd7bd9
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 23:05:34 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f':
              Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

        commit fef974ba5e14209211b9addc0d1563d3b3fcfccd
        Merge: eea36d5 45ae29a
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 22:38:52 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851':
              Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit eea36d5154b6f910c7623333599066162ecbf6bb
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 15:36:39 2014 -0700

            check field details renders something

        commit d7d110f9d967869952d532f495bdc711acb8a07f
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 16 14:17:38 2014 -0700

            verifing fields loads are unique and complete

        commit e4c249817e09001e31b7f0fd446c85899d9db5cf
        Merge: cd2045d 9a02bbd
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 01:30:05 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d':
              Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit cd2045d746191a41f4dc8657984f8a3bf90bb88b
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Mon Sep 15 18:29:28 2014 -0700

            fixed a test bug

        commit d563da337b94dd7131efa4afda61000f600162bf
        Merge: e48219f 5b8d770
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 16 00:56:10 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273':
              Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit e48219f73ead40c975270d105c4e3d81f7e4f92e
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Mon Sep 15 17:55:20 2014 -0700

            added test for zoom on all fields and sorting by last24 next24 and workability

        commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f
        Merge: 4fd31c1 3fb9894
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Mon Sep 15 23:39:41 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8':
              Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
              fix for update

        commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Mon Sep 15 16:37:59 2014 -0700

            added test for SaaS links

        commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a
        Merge: f688c1a 61e95c0
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Sat Sep 13 00:41:21 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '61e95c076c07105e33f71c06552bc0ee093e3a81':
              Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5
        Merge: 5e7b62b c070bc7
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 12 17:39:50 2014 -0700

            Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

            Conflicts:
            	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml
            	ClimateGrowersProject/ClimateGrowersApp/build.gradle
            	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java

        commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 12 17:30:21 2014 -0700

            cleaned up tests

        commit 777b80ce2b46ba3f28db8041a0a285e33039cd52
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 12 15:25:35 2014 -0700

            udpated gradle to use test res

        commit d4092562a077dbe2c3f9a471e43f9a7b05a08766
        Merge: 71d5f20 b8eb732
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Fri Sep 12 22:23:58 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6':
              fixed scouting delete
              scouting fix

        commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a
        Merge: 36774a5 3c318d5
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Thu Sep 11 22:41:08 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
              Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
              added code for fixing update scouting

        commit 36774a52a326a0baac0746df252c5eda2fe90d41
        Merge: 79b5657 e5f845f
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Thu Sep 11 17:30:29 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'e5f845f242fdc19c844601124a47103964f053ec':
              Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3

        commit 79b5657249e830bbc535c808d8a6a02b029962cf
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Thu Sep 11 10:05:18 2014 -0700

            map test consolidation

        commit 67aa159e3ad039af4b2c6e2694356defb2f41a51
        Merge: 586a520 9b46015
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Thu Sep 11 17:04:04 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '9b4601584a795840815beb40d98ad57a3fba6a1a':
              Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
              Incremented version

        commit 586a520d721c59a7e5186e9120ea6d57c54f6b26
        Merge: f0cee81 3d01293
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 9 23:39:06 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '3d012936a15290e1bc6a664ad4486e024607bc99':
              Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 9 16:37:57 2014 -0700

            added returning to list after a scouting submit

        commit 433c4a0dd89f05593c5bff9db774e638d48a182e
        Merge: b1a99bf 108b943
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 9 21:59:23 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123':
              Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit b1a99bfb7736d92bbecaa27652f50b375513bdf4
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 9 14:58:33 2014 -0700

            added deleting of scouting event

        commit c072e5241e776041a41fb68e7ec1abffa3cf4822
        Merge: 7446fa4 f6ae870
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 9 21:54:52 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22':
              Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 7446fa48d55b6c27af16702e4235a938da4db7e5
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Tue Sep 9 14:53:21 2014 -0700

            updated scouting for pics and refactored code

        commit 8909d2298520d03e2381af6f11d6a34b50cf5b10
        Merge: acda078 305156d
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Tue Sep 9 00:36:17 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c':
              Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit acda0781dbedb1607d69201a119c44c5afcdebad
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Mon Sep 8 17:35:27 2014 -0700

            added test for imageviewer

        commit 489e17858e6351785a2cfe07ee66b406873492b7
        Merge: 975f03c e37df5c
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Mon Sep 8 23:59:47 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20':
              Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Mon Sep 8 16:58:43 2014 -0700

            added image viewer for scouting

        commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252
        Merge: c7e20ad 2597440
        Author: Joshua Musselwhite <jmusselwhite@climate.com>
        Date:   Sat Sep 6 00:17:39 2014 +0000

            Merging in latest from upstream (MOB/climate-android:refs/heads/master)

            * commit '2597440bd31c195f298f5795832260361844e964':
              Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
              Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

        commit c7e20ad22c700c30c570611c03e04e2f0cabdd83
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 5 15:12:52 2014 -0700

            added test for MultipleField selectors

        commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5
        Author: Musselwhizzle <jm@therealjoshua.com>
        Date:   Fri Sep 5 14:09:08 2014 -0700

            fixed future radar bug. added tests for it

    commit c1c960659e5578f7a20347ec2bd412e633e6ffd8
    Author: Richard Shin <rshin@climate.com>
    Date:   Tue Sep 23 22:30:25 2014 +0000

        Merge pull request #42 in MOB/climate-android from ~NROSENBERG/climate-android:MOB-576 to master

        Squashed commit of the following:

        commit 1295e7c792a1bdc77df1c0beda3609d32da45837
        Author: Nicole Rosenberg <nrosenberg@climate.com>
        Date:   Tue Sep 23 15:23:17 2014 -0700

            [MOB-576] Updating 'last updated' date on SaaS agreement

commit a1ecd2c9bb77ef9bb0528493fd6003b20beabe75
Author: Curtis <cstuehrenberg@climate.com>
Date:   Wed Sep 24 09:40:41 2014 -0700

    Created a few test objects for use in testing.  This is part of the decoupling from hardcoded values exercise necessary for completig [BLUE_129] correctly.

MichaelBlume pushed a commit to MichaelBlume/clojure that referenced this pull request Feb 2, 2016

Merge pull request #51 in MOB/climate-android from ~JMUSSELWHITE/josh…
…-android:master to master

Squashed commit of the following:

commit 4e50a8d6d5819c7e23dd7ed026f08670b521f110
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 26 14:14:10 2014 -0700

    api endpoints changed on future radar

commit 46654b23ab85512b684ec9cb3dcac47a61cd7938
Merge: d19259f 31e0c81
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 24 23:49:43 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '31e0c81cf54cae458a403e4bdc8e1d90a39d9930':
      Merge pull request #46 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit d19259ff442b1b3e15c00b178220cf73fed8b3ee
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 24 16:47:35 2014 -0700

    adding tweak to fix issue on emulator

commit ce3b254ffa26d2e5a00ff085097dac2c276918cd
Merge: 8295fc5 7dde0e6
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 24 16:29:59 2014 -0700

    Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android

commit 8295fc5ba0bbad1013811a23659f219c38fab4e2
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 24 16:29:31 2014 -0700

    added spoon to take screenshots before and after tests are ran

commit 7dde0e654a773cbb780a8ed47867c9174056bc3a
Merge: e9fa699 a2a281d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 24 19:11:16 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'a2a281d5a4590c02cc8d1e3126b4091938849050':
      Merge pull request #43 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit e9fa699778ad683f7325803ae510fff5223b3ce8
Merge: f9fe1b8 c1c9606
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 24 00:17:33 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'c1c960659e5578f7a20347ec2bd412e633e6ffd8':
      Merge pull request #42 in MOB/climate-android from ~NROSENBERG/climate-android:MOB-576 to master
      Merge pull request #41 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-122 to master

commit f9fe1b877fa6209f90d6612959a76ad53c7d1b0f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 23 17:15:31 2014 -0700

    updated the ignore files

commit b07c691bf2e41bffa4699f32955040d2022f7352
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 23 17:13:46 2014 -0700

    removed build files

commit fff2dfa5244b94c753da584e5bf26bac7362acc5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 23 17:12:18 2014 -0700

    added support for spoon taking screenshots on espresso failure

commit 1f5c4a569e67c19325e1cbaf97439e7670400780
Merge: caa80d2 e5d0471
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 20 01:12:02 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'e5d047159080a320e90e8315365c539bfa3aff55':
      Merge pull request #40 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit caa80d2c66ccc0bf1c87964b196a5d5ec6670c08
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 18:11:20 2014 -0700

    added test for multiple fields

commit dc34634a0217c3e8ec5bcf0c2874719caa472a76
Merge: 13d554f 6b6efb0
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 20 01:04:09 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '6b6efb07787a2d7fefca17678003eb220fb44e62':
      Merge pull request #39 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 13d554fe2650bbdb6caab96dcd6f1aafbdea90b0
Merge: 3369de0 1474c28
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 18:03:04 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/ui/PlantingFunctionalTest.java

commit 3369de0739d65fac9f64fdb8f0ded7d361191521
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 17:58:32 2014 -0700

    added test for adding multiple fields to a planting scout

commit e1d446af4b113a15c3dd3deddb3a5b5422157a74
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 14:58:10 2014 -0700

    added functional testing to the planting activity

commit fddd54d99adb83d62012af60ad8dfb55ca50afad
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 14:57:08 2014 -0700

    added functional testing to the planting activity

commit 9ec9a84935db84ff4fd349c208477217f2183048
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 19 11:11:50 2014 -0700

    fixed a test case I broke

commit 317f95d2ce491cfaa0aab4a7ad41172245df0e68
Merge: a65c57e 82b9e64
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 19 17:41:39 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '82b9e643e56be19cfb156c61a514fede3955317e':
      Merge pull request #36 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit a65c57e0003fe33b7693555e653c5f2a094e5d99
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 17:01:38 2014 -0700

    adjust validation on CLU Editor. Updated tests cases for it

commit 272a0a1732c4d36a393b412ae4d322d42a267adb
Merge: 4fd36c4 c0638c5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Sep 18 20:14:01 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit 'c0638c5320261ea92c1ff871d32ea60d10a5e383':
      Merge pull request #35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
      Merge pull request #34 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 4fd36c44b9b9c1609439c0298748cb46ab3dbdab
Merge: f239028 1599715
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:27:59 2014 -0700

    Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java

commit f2390282424ff79771be0eb8f02c42052876d9b9
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 11:23:27 2014 -0700

    added testing workability and sort order

commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Sep 18 10:54:02 2014 -0700

    minor test case change

commit 1a46521938924c7d99b12990103b37a34f83a464
Merge: 28b60c6 43440f4
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 17 17:46:24 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b':
      Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 28b60c61c17c95741ec331373c964658cff8f828
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 17 10:44:35 2014 -0700

    minor test change

commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73
Merge: 9771b57 22195c3
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 16 23:46:27 2014 +0000

    Merging in latest from upstream (MOB/climate-android:refs/heads/master)

    * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b':
      Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-andro