Skip to content

Commit

Permalink
Merge pull request #143 in MOB/climate-android from ~JMUSSELWHITE/jos…
Browse files Browse the repository at this point in the history 
…h-android:develop to master

Squashed commit of the following:

commit c63626dce2f552cf8a7925e4c4de9e071657c26d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Mar 4 16:55:39 2015 -0800

    added aar files back

commit a4c8dc491440613816283d4b6b5fa6dd5b264cf8
Merge: 80670b9 d4fa5fa
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Mar 4 16:54:21 2015 -0800

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

    Conflicts:
    	ClimateGrowersProject/FieldHealthLib-release/FieldHealthLib-release.aar
    	ClimateGrowersProject/aars/FieldHealthLib-release.aar

commit 80670b98f6b093a72948ca4ecb3427a9f577ca7a
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Mar 4 16:47:50 2015 -0800

    this build is broken. fha aar wont update

commit 77c078a212015077ba0ee7e96b43d9f3a896e94d
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Mar 4 16:42:47 2015 -0800

    added fha module aar

commit 4e1b30e0bcbf3881505cb157392e5926c3fa51fd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Mar 4 16:42:21 2015 -0800

    remove fha to force update

commit 577fdd8c503cea334cebc84f04858f7f80c0952c
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Mar 4 16:33:13 2015 -0800

    updated fha module

commit 71dda7a9e261851fad54c33291a45f19bb652202
Merge: 3798d8e 4ab019a
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Mar 4 13:50:32 2015 -0800

    merged in code

commit 3798d8e3bde23fedbab0075bccdb87bfb85f6424
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Mar 4 13:42:02 2015 -0800

    RED-1055

commit 0b4234659b67d7fc4acb6804afe5c3ee38caf388
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Mar 4 13:21:03 2015 -0800

    updated aar files

commit 4ab019ae60ea2a9fc00dfd803d3bd833e772276c
Merge: 9b71637 a0d1016
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Mar 4 21:20:05 2015 +0000

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

    * commit 'a0d1016afe51dd008364ec811268fe846267108c':
      Merge pull request #137 in MOB/climate-android from ~KBAYGAN/climate-android:basic618 to master
      Merge pull request #139 in MOB/climate-android from ~JMUSSELWHITE/josh-android:develop to master

commit 9b71637838c6df51d7baf193da3f7109202837f2
Merge: aac3a3d 91bc88b
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Mar 2 22:53:32 2015 +0000

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

    * commit '91bc88b9c9113e405d462d603f6e803fb7e62b5e':
      Merge pull request #138 in MOB/climate-android from ~MANAV.SINGHAL/climate-android:basic-634b to master

commit 788184f4cd643cadb76fa3720c38558766a14435
Merge: aac3a3d 553c12e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Mar 2 14:51:50 2015 -0800

    Merge branch 'develop'

commit 553c12e296acf663d58bc46ab6db40367cc1b42f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Mar 2 14:51:36 2015 -0800

    updated outlines around module launchers

commit aac3a3d2586637c9c308f65be4511d0ad7aaf94b
Merge: b843d9f 026c30a
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Mar 2 21:03:50 2015 +0000

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

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

commit b843d9f3a9542f3df1ed3e335020ab6b4c56f718
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Feb 27 15:33:05 2015 -0800

    updated fha. shut down google api client

commit ca1d53517a0ffc2e878a58d677143269706a419d
Merge: b37a983 6f6523f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Feb 27 00:53:56 2015 +0000

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

    * commit '6f6523fc8a8d6eb4598686a13199046c42dc50c7':
      Merge pull request #134 in MOB/climate-android from ~MANAV.SINGHAL/climate-android:basic-765 to master
      Merge pull request #135 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit b37a9837f3cfb7ed0334b6f2ce46ddb026fc6a6c
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Feb 26 16:53:22 2015 -0800

    updated analytics

commit 5235ff75f8f211a09867640b92724032aa80d29b
Merge: 78d850a f4cb890
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Feb 25 22:59:15 2015 +0000

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

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

commit 78d850a3f0575f4c2ac76207b238152e213c5fc5
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Feb 25 14:59:03 2015 -0800

    fixed missing imports

commit 1f4e9b47d094fe67a814339e89c9fe146cffd738
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Feb 25 14:38:01 2015 -0800

    updated fha

commit ce7499de4d0a6d5438c50ebc1996443c1bb75df9
Merge: 1c9aea8 3b89eef
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Feb 25 14:11:30 2015 -0800

    updated to new analytics

commit 1c9aea8bcdf11e7b4ac6ad7feb85e4a75bd136c7
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Feb 25 14:03:50 2015 -0800

    updated to new tracker. resolved play services version conflicts

commit a50ca901d89e2f741df18a02c90e22bf2468aa08
Merge: 24b15b6 cd230bd
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Feb 25 10:19:30 2015 -0800

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

commit 24b15b6ff4e7a8711866de526b5d484af8a35a02
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Feb 25 10:19:27 2015 -0800

    bleh

commit cd230bd17cc0fcbdaa7bd57fab303a31a34f96ff
Merge: a4110bf 5b29eef
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Feb 25 18:18:56 2015 +0000

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

    * commit '5b29eef42f4bb898072f52f294edb5a4bcd9231d':
      Merge pull request #131 in MOB/climate-android from ~RJOSHI/climate-android:BASIC-713 to master

commit a4110bf4a3139d6819de9d3bda8e4c96c574f306
Merge: e0b3169 fd1a42f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Feb 23 18:19:03 2015 +0000

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

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

commit e0b31694663511b01cd1f9380a0bf93aa791d072
Merge: a0b381f fb0f539
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Feb 20 15:47:05 2015 -0800

    fix merges

commit a0b381fd77c596a20dc6761b9861f63309f8b799
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Feb 20 15:41:12 2015 -0800

    strings to res and pro icon

commit db4acc3074c0a98c80addf8f6c87c02dc4b06b38
Merge: 2480a21 cbebf8b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Feb 20 10:51:56 2015 -0800

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

    Conflicts:
    	ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml

commit 2480a211f97bbcf550cafaad31f0f615ed2c097b
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Feb 20 10:49:12 2015 -0800

    added back in fha changes which didn't make the merge

commit 4616e3b7e060a4a211dc89f06b705faeaacf0f8f
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Feb 20 10:11:22 2015 -0800

    parsing pro field

commit 2b18e9242bf459010afcaa7c2d9207e46f91fc71
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Feb 19 14:29:45 2015 -0800

    fixed black border

commit 27f22044e0e88cd0a8dbc8cb73c8d50a18a60205
Merge: d8a08fa 6ed77c5
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Feb 19 22:02:07 2015 +0000

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

    * commit '6ed77c56691308509c67b38b1095d49c5f1cfb63':
      Merge pull request #123 in MOB/climate-android from ~KBAYGAN/climate-android:release_fieldcard to master
      Merge pull request #122 in MOB/climate-android from feature_fha_integ to master
      Merge pull request #118 in MOB/climate-android from ~KBAYGAN/climate-android:workspace to master
      Merge pull request #121 in MOB/climate-android from ~RJOSHI/climate-android:hide-sorting to release/2015-02-05
      Merge pull request #120 in MOB/climate-android from ~RJOSHI/climate-android:hide-sorting to master
      Merge pull request #119 in MOB/climate-android from ~RJOSHI/climate-android:remove-workability to master

commit d8a08faa92dadbf65f8991d6a4c7e4d9f38ccdff
Merge: c00887a e3f36c2
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Jan 29 00:25:33 2015 +0000

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

    * commit 'e3f36c236277c7f79c6517e44889c55482c0a15f':
      Merge pull request #116 in MOB/climate-android from ~KBAYGAN/climate-android:workspace to master

commit c00887a85e93181e224fd1a1c97f0f3a1738892b
Merge: a0bd359 8a23b54
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Jan 27 02:07:30 2015 +0000

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

    * commit '8a23b54638bf92fafae40538269655db67b46522':
      Merge pull request #115 in MOB/climate-android from ~RJOSHI/climate-android:notificationlib-1.3.8 to master
      Merge pull request #114 in MOB/climate-android from ~KBAYGAN/climate-android15:master to master
      Merge pull request #112 in MOB/climate-android from ~KBAYGAN/climate-android15:master to master
      Merge pull request #113 in MOB/climate-android from ~RJOSHI/climate-android:notificationlib-v1.3.7 to master
      Merge pull request #111 in MOB/climate-android from ~KBAYGAN/climate-android15:master to master

commit a0bd3591e390e2216757353a0e9bf53f1ceb8bfc
Merge: 98476fc e24fc1e
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Jan 9 02:40:10 2015 +0000

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

    * commit 'e24fc1e1f6e7d55be0c376031086f2cdcbe642e0':
      Merge pull request #110 in MOB/climate-android from ~MANAV.SINGHAL/climate-android:genymotion-play to master
      Merge pull request #109 in MOB/climate-android from ~MANAV.SINGHAL/climate-android:genymotion-play to master
      Merge pull request #108 in MOB/climate-android from ~RJOSHI/climate-android:notifications-1.3.6 to master
      Merge pull request #107 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 98476fcd47bb0ef2edd90dd788d45b39dbad190a
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Dec 22 16:50:59 2014 -0800

    updated gradle to not use +

commit fd0a2ba2366d0f79cad57321f507270c961178eb
Merge: 2b36bfc 28227c3
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Dec 23 00:43:42 2014 +0000

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

    * commit '28227c328da6fb31eeb000b63d685c92fec84902':
      deleted files
      Added more dex cache

commit 2b36bfce550d9737a4aa9a107cf51f7e7ee6f3a2
Merge: 303f8c1 7d35fe8
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Dec 22 22:27:51 2014 +0000

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

    * commit '7d35fe8e80ce802d583427115ce0ca741e11444e':
      deleted files
      Merge pull request #105 in MOB/climate-android from ~RJOSHI/climate-android:remove-proguard to master
      Merge pull request #106 in MOB/climate-android from ~KBAYGAN/climate-android:master to master

commit 303f8c17cdbbdbb05577edd0411ff3b36f610bf0
Merge: 864c6aa 1ebe58b
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Dec 22 18:59:44 2014 +0000

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

    * commit '1ebe58b8eaa6a00223e76fea1ee9f2760aafb504':
      Merge pull request #104 in MOB/climate-android from ~RJOSHI/climate-android:remove-lib-ids to master
      Merge pull request #103 in MOB/climate-android from ~RJOSHI/climate-android:gradle-update-2.2 to master
      Merge pull request #102 in MOB/climate-android from ~RJOSHI/climate-android:notificationlib-1.3.4 to master
      Merge pull request #101 in MOB/climate-android from ~KBAYGAN/climate-android:master to master
      Merge pull request clojure#99 in MOB/climate-android from ~KBAYGAN/climate-android:master to master

commit 864c6aa2e26570eb3a349a2afcc4df95aa439abd
Merge: 2c99e1d 3816428
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Dec 18 01:52:37 2014 +0000

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

    * commit '381642825e63984017ad16b680d068fec325e3c8':
      Merge pull request clojure#100 in MOB/climate-android from ~RJOSHI/climate-android:gradle-fixes to master

commit 2c99e1db4fc44d07be57e7360da21d26c89f6dc5
Merge: 1c9bcba 1f8659e
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Dec 18 00:34:51 2014 +0000

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

    * commit '1f8659e1dbd3b804c0cba3b64dd925d27a659a61':
      Merge pull request clojure#98 in MOB/climate-android from ~RJOSHI/climate-android:notificationlib-1.2.4 to master
      Merge pull request clojure#97 in MOB/climate-android from ~RJOSHI/climate-android:notificationlib-1.2.3 to master
      Merge pull request clojure#96 in MOB/climate-android from ~KBAYGAN/climate-android:master to master
      Merge pull request clojure#95 in MOB/climate-android from ~RJOSHI/climate-android:notificationlib-1.2.2 to master
      Merge pull request clojure#94 in MOB/climate-android from ~RJOSHI/climate-android:notificationslib-1.2.1 to master
      Merge pull request clojure#93 in MOB/climate-android from ~KBAYGAN/climate-android:master to master
      Merge pull request clojure#89 in MOB/climate-android from ~NROSENBERG/climate-android:BASIC-385 to master
      Merge pull request clojure#92 in MOB/climate-android from ~RJOSHI/climate-android:notification-1.20 to master
      Merge pull request clojure#91 in MOB/climate-android from ~RJOSHI/climate-android:notificationlib-1.1.2 to master
      Merge pull request clojure#90 in MOB/climate-android from ~RJOSHI/climate-android:use-notificationlib-1.1.1 to master

commit 1c9bcba3faa2acf51d98d61dd9062b38a6c9fcbb
Merge: b18da35 67de0df
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Dec 4 23:24:25 2014 +0000

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

    * commit '67de0dfd6e74599bd1d8cec3eb915713f33ab7f5':
      Merge pull request clojure#88 in MOB/climate-android from ~KBAYGAN/climate-android:master to master

commit b18da358a6304221717cd2c9f700102ae868933f
Merge: 8cc0ee5 e692261
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Dec 4 23:05:05 2014 +0000

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

    * commit 'e692261e93371ae20fef2175622e789b7053d91b':
      Merge pull request clojure#87 in MOB/climate-android from ~RJOSHI/climate-android:notification-1.1.0 to master
      Merge pull request clojure#86 in MOB/climate-android from ~KBAYGAN/climate-android:master to master

commit 8cc0ee51acc99912b5c107a9521c83c906b6a6ed
Merge: 0b5065b 3b9efeb
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Mon Dec 1 18:51:30 2014 +0000

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

    * commit '3b9efebcf7a36123b3fbd3c2303e30536dbb1d66':
      Merge pull request clojure#85 in MOB/climate-android from ~RJOSHI/climate-android:notification-1.0.4 to master
      Merge pull request clojure#84 in MOB/climate-android from ~RJOSHI/climate-android:notifications-1.0.2 to master
      Merge pull request clojure#82 in MOB/climate-android from ~RJOSHI/climate-android:notificationlib-maven to master
      Merge pull request clojure#81 in MOB/climate-android from ~KBAYGAN/climate-android:master to master

commit 0b5065b523361ad3b7b3951c52d8a4904325d5d3
Merge: 9a471ea 3a4808a
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Nov 19 18:25:56 2014 +0000

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

    * commit '3a4808a4841b3f28d0e7992c2e962a990d0a3e6e':
      Merge pull request clojure#80 in MOB/climate-android from ~KBAYGAN/climate-android:master to master

commit 9a471ea368af68b30bd57d15ea0087edfd0b93e5
Merge: fa3b0ca 49b1998
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Thu Oct 23 22:28:48 2014 +0000

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

    * commit '49b199829f3021545b35a55963baa51d94810f31':
      Merge pull request clojure#79 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:feature/blue-201 to master
      Merge pull request clojure#78 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:bugfix/blue-200 to master
      Merge pull request clojure#77 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:bugfix/blue-200 to master
      Merge pull request clojure#76 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:bugfix/blue-200 to master
      Merge pull request clojure#75 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#74 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:feature/blue-198 to master
      Merge pull request clojure#72 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:feature/blue-164 to master
      Merge pull request clojure#71 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:feature/blue-129 to master
      Merge pull request clojure#68 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Merge pull request clojure#67 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master

commit fa3b0ca6cf1c124a4f399f96dbc952de5c76b311
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Oct 17 12:45:13 2014 -0700

    added null check for settings

commit 82324fc619503a78ef74d9e80945e59cdee80023
Merge: 5dcc08c e06406f
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Oct 3 21:27:24 2014 +0000

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

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

commit 5dcc08c0ba56b3fb7fc0666df0e8b7079d8626cd
Merge: c4c198c 1cab678
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Oct 3 21:25:57 2014 +0000

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

    * commit '1cab67888c288090ec4f4eef6c7d895749486d5b':
      Merge pull request clojure#63 in MOB/climate-android from ~RJOSHI/climate-android:trace-precip-nonzero to master

commit c4c198cd73633e3d3f9dd55a14c7359171163b2e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Oct 3 14:23:36 2014 -0700

    cleaned up res

commit e53a6be89ebb484028a935cd66c1545d9e49fb71
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Thu Oct 2 19:32:19 2014 -0700

    moving hardcoded strings to strings.xml

commit bf5d5d267f378eee70b1aa2aa17aa0b50d454204
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 30 17:10:41 2014 -0700

    added test to check handling of null radar tiles

commit d4b31382adb3499090c74f84e5f834ce2bc20601
Merge: 74f1601 a50b76e
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 30 14:41:21 2014 -0700

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

commit 74f16016aa2472ed9d7339ba163d66137fc5b059
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Tue Sep 30 14:41:17 2014 -0700

    fixed an import

commit a50b76e853bfbfa3f63529049d7b18630da2c945
Merge: cf2623d 79df575
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 30 21:40:23 2014 +0000

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

    * commit '79df5751c03eace5b2083d4aac1fba0d55c27007':
      Merge pull request clojure#61 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master

commit cf2623d550c7e22953de0c222c2f8b297c8b033a
Merge: a91c9cb d1af874
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Tue Sep 30 00:21:07 2014 +0000

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

    * commit 'd1af8746d7da9cb0c77f923cf6475e3dc8968081':
      Merge pull request clojure#60 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#59 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master

commit a91c9cb00fe452d77a6c46a378fab0e9847b4e69
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Mon Sep 29 17:19:55 2014 -0700

    changed packages on test utils. fixed bug on editing CLU on planting

commit dd62f9c1353e0ba1277db994db2fc0ab48e72930
Merge: 114fcb6 988aa34
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Sat Sep 27 00:58:53 2014 +0000

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

    * commit '988aa34a87f415bd409d16d54dd05813235ce5fc':
      Merge pull request clojure#58 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#56 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master
      Merge pull request clojure#55 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master

commit 114fcb61f15883b73ccfc6e8c420fa974acff0b0
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 26 17:51:43 2014 -0700

    changed url for furture radar server

commit d49694392e560fc5c7748cce401bc7aae42a4ca1
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 26 17:08:59 2014 -0700

    fixed a google map overlay bug

commit a59c838ca566ca6eb1e982dbf9ca1873f4a27f9f
Merge: 4e50a8d 7b51932
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Fri Sep 26 21:15:45 2014 +0000

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

    * commit '7b51932dc15711d38f6636843278bad05861ca4e':
      Merge pull request clojure#51 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master
      Merge pull request clojure#50 in MOB/climate-android from ~RJOSHI/climate-android:BASIC-45 to master
      Merge pull request clojure#49 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-187 to master
      [BUILD] Fixing a build break caused by merge resolving artifacts I accidentally left behind
      Merge pull request clojure#48 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-129 to master

commit 4e50a8d6d5819c7e23dd7ed026f08670b521f110
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Fri Sep 26 14:14:10 2014 -0700

    api endpoints changed on future radar

commit 46654b23ab85512b684ec9cb3dcac47a61cd7938
Merge: d19259f 31e0c81
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 24 23:49:43 2014 +0000

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

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

commit d19259ff442b1b3e15c00b178220cf73fed8b3ee
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 24 16:47:35 2014 -0700

    adding tweak to fix issue on emulator

commit ce3b254ffa26d2e5a00ff085097dac2c276918cd
Merge: 8295fc5 7dde0e6
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 24 16:29:59 2014 -0700

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

commit 8295fc5ba0bbad1013811a23659f219c38fab4e2
Author: Musselwhizzle <jm@therealjoshua.com>
Date:   Wed Sep 24 16:29:31 2014 -0700

    added spoon to take screenshots before and after tests are ran

commit 7dde0e654a773cbb780a8ed47867c9174056bc3a
Merge: e9fa699 a2a281d
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 24 19:11:16 2014 +0000

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

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

commit e9fa699778ad683f7325803ae510fff5223b3ce8
Merge: f9fe1b8 c1c9606
Author: Joshua Musselwhite <jmusselwhite@climate.com>
Date:   Wed Sep 24 00:17:33 2014 +0000

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

    * commit 'c1c960659e5578f7a20347ec2bd412e633e6ffd8':
      Merge pull request 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
  • Loading branch information
@jmusselwhite
jmusselwhite committed Mar 5, 2015
1 parent d4fa5fa commit 0d81f8a
Show file tree
Hide file tree
Showing 9 changed files with 6 additions and 10 deletions.
3 changes: 1 addition & 2 deletions ClimateGrowersProject/AndroidMapsExtensions/AndroidMapsExtensions.iml
View file
Expand Up @@ -9,7 +9,6 @@
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
Expand Down Expand Up @@ -84,9 +83,9 @@
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
<orderEntry type="library" exported="" name="play-services-6.5.87" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
</component>
</module>

2 changes: 0 additions & 2 deletions ...mateGrowersApp/src/main/java/com/climate/growers/android/renderers/WeatherModuleCard.java
View file
Expand Up @@ -11,8 +11,6 @@

import com.climate.growers.android.R;
import com.climate.growers.android.managers.pojos.DetailedField;
import com.climate.growers.android.managers.pojos.FieldLazyDetails;
import com.climate.growers.android.managers.pojos.Temperature;
import com.climate.growers.android.utils.PrecipUtil;
import com.climate.growers.android.widgets.WeatherConditionImageView;

Expand Down
4 changes: 3 additions & 1 deletion ClimateGrowersProject/ClimateGrowersProject.iml
View file
Expand Up @@ -7,7 +7,9 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
Expand Down
Binary file modified ClimateGrowersProject/FieldHealthLib-release/FieldHealthLib-release.aar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion ClimateGrowersProject/FieldHealthLib-release/FieldHealthLib-release.iml
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="ClimateGrowersProject" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
Expand Down
3 changes: 1 addition & 2 deletions ClimateGrowersProject/MapTileAnimationLib/MapTileAnimationLib.iml
View file
Expand Up @@ -9,7 +9,6 @@
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
Expand Down Expand Up @@ -86,9 +85,9 @@
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" />
<orderEntry type="library" exported="" name="play-services-6.5.87" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" />
</component>
</module>

1 change: 0 additions & 1 deletion ClimateGrowersProject/TwoWayViewCore/TwoWayViewCore.iml
View file
Expand Up @@ -9,7 +9,6 @@
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
Expand Down
1 change: 0 additions & 1 deletion ClimateGrowersProject/TwoWayViewLayouts/TwoWayViewLayouts.iml
View file
Expand Up @@ -9,7 +9,6 @@
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
Expand Down
Binary file modified ClimateGrowersProject/aars/FieldHealthLib-release.aar
View file
Binary file not shown.

0 comments on commit 0d81f8a

Please sign in to comment.