Skip to content
New issue

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

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a bug: replace-first-by (and thus replace-first) returns nil #17

Merged
merged 0 commits into from Aug 27, 2014

Conversation

Projects
None yet
7 participants
@yangsx
Copy link

commented Mar 4, 2012

when it should return the original text.

The bug occurs only when the second argument of replace-first is a pattern and the third argument is a function.

@richhickey richhickey merged commit 43cc185 into clojure:master Aug 27, 2014

@razum2um

This comment has been minimized.

Copy link

commented Aug 27, 2014

Hi @richhickey, thanks for your work on clojure and it's ecosystem, thanks for not being blind to community and for accepting PR!

Imo this flow is more community-friendly in comparison to old-school email-patch workflow (offered http://clojure.org/contributing). Some ecosystem like kernel/os developers could (must?) do this way, because there are only a few people (may be just one) who can fully understand influence of changes to the codebase and automated tests are hard, it may be also applicable to lang-core development, but not for libs, don't you think?

Maybe it's time to face this community problem and start to merge and accept more from pull requests, not to do in such way e.g. - clojure/tools.trace#4 (comment)

My thoughts may seem naive but they're genuine :)
I also suggest to +1 people to convert this topic to a petition ;)

@michaelklishin

This comment has been minimized.

Copy link

commented Aug 27, 2014

@razum2um give up. This fight has been fought dozens of times before.

@Gonzih

This comment has been minimized.

Copy link

commented Aug 27, 2014

And what is logic behind current flow? Just curious.


Regards,
Max

On Wed, Aug 27, 2014 at 9:38 PM, Vlad Bokov notifications@github.com
wrote:

Hi @richhickey, thanks for your work on clojure and it's ecosystem, thanks for not being blind to community and for accepting PR!
Imo this flow is more community-friendly in comparison to old-school email-patch workflow (offered http://clojure.org/contributing). Some ecosystem like kernel/os developers could (must?) do this way, because there are only a few people (may be just one) who can fully understand influence of changes to the codebase and automated tests are hard, it may be also applicable to lang-core development, but not for libs, don't you think?
Maybe it's time to face this community problem and start to merge and accept more from pull requests, not to do in such way e.g. - clojure/tools.trace#4 (comment)
My thoughts may seem naive but they're genuine :)

I also suggest to +1 people to convert this topic to a petition ;)

Reply to this email directly or view it on GitHub:
#17 (comment)

@niquola

This comment has been minimized.

Copy link

commented Aug 27, 2014

👍

@michaelklishin

This comment has been minimized.

Copy link

commented Aug 27, 2014

TL;DR: Cognitect likes it this way.

Just do a search for "contribution process" or similar on the mailing list. Some of the longest threads:

There were discussions of this on Clojure conferences, IRC, et cetera. Every single long time Clojure contributor I've talked to about this in the last couple of years has given up. So will you.

@richhickey

This comment has been minimized.

Copy link
Member

commented Aug 27, 2014

GitHub fabricated this 'pull request acceptance' from the application of a patch that had nothing to do with it.

@Thingographist

This comment has been minimized.

Copy link

commented Nov 2, 2014

@Tirael90 Tirael90 referenced this pull request Nov 19, 2014

Closed

Android 5.0 - L #3

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

Curtis Stuehrenberg
Merge pull request clojure#17 in MOB/climate-android from ~CSTUEHRENB…
…ERG/climate-android:master to master

Squashed commit of the following:

commit feae96e717c9bb203492a1dab28cefa9cb7fcf4e
Author: Curtis <cstuehrenberg@climate.com>
Date:   Thu Sep 11 15:33:55 2014 -0700

    Uploading my code to have Josh sync up with my issue

commit 09b42bfa8b48f9d2e2ca240a34b8931b54b78839
Merge: e805b63 5539bbf
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date:   Thu Sep 11 22:07:56 2014 +0000

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

    * commit '5539bbf0f101c9bf842ddc9664e2496626860f51':
      added code for fixing update scouting

commit e805b63e944977997db7addc675520c6e6681761
Merge: 8cbdd43 e5f845f
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date:   Thu Sep 11 18:25:36 2014 +0000

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

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

commit 8cbdd43aa4d35cdef35929d752a1f3995fc0fafa
Author: Curtis <cstuehrenberg@climate.com>
Date:   Thu Sep 11 09:20:08 2014 -0700

    Checking this in so we can review the idling resource issue with seed hybrids

commit a4445ccb6c059da20712c88127dd92d1e4c8c493
Merge: 5448903 3b225ba
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date:   Thu Sep 11 15:07:29 2014 +0000

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

    * commit '3b225baa98b234d59f8d9c8cecc6504343f33d96':
      Incremented version

commit 544890311d2c7aa63f1e3f5f0ab5e400939a4fa2
Merge: d9d49e9 3167f2b
Author: Curtis <cstuehrenberg@climate.com>
Date:   Wed Sep 10 15:50:01 2014 -0700

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

commit d9d49e9dc6e091e1bcbedb232dff094aa0304187
Author: Curtis <cstuehrenberg@climate.com>
Date:   Wed Sep 10 15:46:48 2014 -0700

    [BLUE-159]
    [BLUE-160]

commit 3167f2bce452ceaa25408f778cc765b06083ce42
Merge: 80cbf6a 3d01293
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date:   Wed Sep 10 15:41:27 2014 +0000

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

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

commit 80cbf6a3a7511733844cc51731abe0ea06f32f4b
Merge: 1b2a456 305156d
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date:   Tue Sep 9 16:59:22 2014 +0000

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

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

commit 1b2a456877ed12f44aa267717f6be3ce04ddad75
Author: Curtis <cstuehrenberg@climate.com>
Date:   Fri Sep 5 16:03:57 2014 -0700

    Showing Elena how to commit to Stash

commit 0cb3c0aefaf67aad2ccc445225b0d3843b79ffb7
Merge: ab88f56 2597440
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date:   Fri Sep 5 22:22:14 2014 +0000

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

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

commit ab88f563604f8a53c55867241d7e4f68b135371d
Author: Curtis <cstuehrenberg@climate.com>
Date:   Fri Sep 5 11:33:13 2014 -0700

    Adding in test cases for creating and deleting a nitrogen activity

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

Joshua Musselwhite
Merge pull request clojure#19 in MOB/climate-android from ~JMUSSELWHI…
…TE/josh-android:master to master

Squashed commit of the following:

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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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

Joshua Musselwhite
Merge pull request clojure#22 in MOB/climate-android from ~JMUSSELWHI…
…TE/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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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

Joshua Musselwhite
Merge pull request clojure#23 in MOB/climate-android from ~JMUSSELWHI…
…TE/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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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

Joshua Musselwhite
Merge pull request clojure#24 in MOB/climate-android from ~JMUSSELWHI…
…TE/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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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

Joshua Musselwhite
Merge pull request clojure#25 in MOB/climate-android from ~JMUSSELWHI…
…TE/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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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

Joshua Musselwhite
Merge pull request clojure#26 in MOB/climate-android from ~JMUSSELWHI…
…TE/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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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

Curtis Stuehrenberg
Merge pull request clojure#28 in MOB/climate-android from ~CSTUEHRENB…
…ERG/climate-android:blue-163 to master

Squashed commit of the following:

commit 93ddf0a96ea2786b9cac58a94d8e596f5505e455
Author: Curtis <cstuehrenberg@climate.com>
Date:   Tue Sep 16 15:49:27 2014 -0700

    Creating commit file to reconcile merge conflicts with master fork

commit 3b6ba9e80b1d317fb536e634b3f415910a80d909
Merge: 9a02bbd a520365
Author: Curtis <cstuehrenberg@climate.com>
Date:   Tue Sep 16 15:25:01 2014 -0700

    Merge branch 'blue-163' of ssh://stash.ci.climatedna.net:7999/~cstuehrenberg/climate-android into blue-163

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/DashboardMapSmokeTest.java
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FarmerActivityAddAndDeleteSmokeTest.java
    	ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/utils/ClimateActivityLogger.java

commit a5203651575b82f593abc8b0257dcdca6a7fcec7
Author: Curtis <cstuehrenberg@climate.com>
Date:   Tue Sep 16 15:00:47 2014 -0700

    [BLUE-163] Moving test files to a UI folder and adding refacoring features
    Implemented a workaround for [BLUE-174] to bypass the API return coming back with unexpected results

commit 94a6fdbd5dc6ecbd56a118a3793c8d6cd5f8fc40
Author: Curtis <cstuehrenberg@climate.com>
Date:   Mon Sep 15 08:37:17 2014 -0700

    Moving page specific controls into a page feature

commit 48283f90d99d4393bd16cc87de72df6737367bb2
Author: Curtis <cstuehrenberg@climate.com>
Date:   Fri Sep 12 16:00:33 2014 -0700

    Creating a new branch for [BLUE-163] and checking in my working files

commit 6272c96ad2a07054c10adf3d64c3de2dc66f6ac4
Author: Curtis <cstuehrenberg@climate.com>
Date:   Fri Sep 12 10:23:59 2014 -0700

    [BLUE-118]
    [BLUE-120]

commit dfca32e8a0f5b3a9dfe458a464f7d58b2004113c
Merge: da65d2f 029af03
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date:   Fri Sep 12 15:25:23 2014 +0000

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

    * commit '029af03acdd34293c6d325a91854d351a81efaf1':
      scouting fix

commit da65d2f029b9843f99f476a4317472e8ce980394
Merge: feae96e 3c318d5
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date:   Thu Sep 11 22:46:04 2014 +0000

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

    * commit '3c318d5c90998459b2463fb99e0d191fad34f649':
      Merge pull request clojure#17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master

commit feae96e717c9bb203492a1dab28cefa9cb7fcf4e
Author: Curtis <cstuehrenberg@climate.com>
Date:   Thu Sep 11 15:33:55 2014 -0700

    Uploading my code to have Josh sync up with my issue

commit 09b42bfa8b48f9d2e2ca240a34b8931b54b78839
Merge: e805b63 5539bbf
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date:   Thu Sep 11 22:07:56 2014 +0000

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

    * commit '5539bbf0f101c9bf842ddc9664e2496626860f51':
      added code for fixing update scouting

commit e805b63e944977997db7addc675520c6e6681761
Merge: 8cbdd43 e5f845f
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date:   Thu Sep 11 18:25:36 2014 +0000

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

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

commit 8cbdd43aa4d35cdef35929d752a1f3995fc0fafa
Author: Curtis <cstuehrenberg@climate.com>
Date:   Thu Sep 11 09:20:08 2014 -0700

    Checking this in so we can review the idling resource issue with seed hybrids

commit a4445ccb6c059da20712c88127dd92d1e4c8c493
Merge: 5448903 3b225ba
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date:   Thu Sep 11 15:07:29 2014 +0000

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

    * commit '3b225baa98b234d59f8d9c8cecc6504343f33d96':
      Incremented version

commit 544890311d2c7aa63f1e3f5f0ab5e400939a4fa2
Merge: d9d49e9 3167f2b
Author: Curtis <cstuehrenberg@climate.com>
Date:   Wed Sep 10 15:50:01 2014 -0700

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

commit d9d49e9dc6e091e1bcbedb232dff094aa0304187
Author: Curtis <cstuehrenberg@climate.com>
Date:   Wed Sep 10 15:46:48 2014 -0700

    [BLUE-159]
    [BLUE-160]

commit 3167f2bce452ceaa25408f778cc765b06083ce42
Merge: 80cbf6a 3d01293
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date:   Wed Sep 10 15:41:27 2014 +0000

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

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

commit 80cbf6a3a7511733844cc51731abe0ea06f32f4b
Merge: 1b2a456 305156d
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date:   Tue Sep 9 16:59:22 2014 +0000

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

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

commit 1b2a456877ed12f44aa267717f6be3ce04ddad75
Author: Curtis <cstuehrenberg@climate.com>
Date:   Fri Sep 5 16:03:57 2014 -0700

    Showing Elena how to commit to Stash

commit 0cb3c0aefaf67aad2ccc445225b0d3843b79ffb7
Merge: ab88f56 2597440
Author: Curtis Stuehrenberg <cstuehrenberg@climate.com>
Date:   Fri Sep 5 22:22:14 2014 +0000

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

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

commit ab88f563604f8a53c55867241d7e4f68b135371d
Author: Curtis <cstuehrenberg@climate.com>
Date:   Fri Sep 5 11:33:13 2014 -0700

    Adding in test cases for creating and deleting a nitrogen activity

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

Curtis Stuehrenberg
Merge pull request clojure#29 in MOB/climate-android from ~JMUSSELWHI…
…TE/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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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

Joshua Musselwhite
Merge pull request clojure#30 in MOB/climate-android from ~JMUSSELWHI…
…TE/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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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

Joshua Musselwhite
Merge pull request clojure#31 in MOB/climate-android from ~JMUSSELWHI…
…TE/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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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

Joshua Musselwhite
Merge pull request clojure#33 in MOB/climate-android from ~JMUSSELWHI…
…TE/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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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

Curtis Stuehrenberg
Merge pull request clojure#34 in MOB/climate-android from ~JMUSSELWHI…
…TE/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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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

Curtis Stuehrenberg
Merge pull request clojure#36 in MOB/climate-android from ~JMUSSELWHI…
…TE/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 clojure#35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
      Merge pull request clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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

Curtis Stuehrenberg
Merge pull request clojure#37 in MOB/climate-android from ~JMUSSELWHI…
…TE/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 clojure#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 clojure#35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
      Merge pull request clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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

Curtis Stuehrenberg
Merge pull request clojure#38 in MOB/climate-android from ~JMUSSELWHI…
…TE/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 clojure#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 clojure#35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
      Merge pull request clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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

Joshua Musselwhite
Merge pull request clojure#39 in MOB/climate-android from ~JMUSSELWHI…
…TE/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 clojure#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 clojure#35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
      Merge pull request clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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

Joshua Musselwhite
Merge pull request clojure#40 in MOB/climate-android from ~JMUSSELWHI…
…TE/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 clojure#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 clojure#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 clojure#35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
      Merge pull request clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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

Curtis Stuehrenberg
Merge pull request clojure#43 in MOB/climate-android from ~JMUSSELWHI…
…TE/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 clojure#42 in MOB/climate-android from ~NROSENBERG/climate-android:MOB-576 to master
      Merge pull request clojure#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 clojure#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 clojure#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 clojure#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 clojure#35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master
      Merge pull request clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#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 clojure#8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#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