-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Agents generate less garbage while working #3
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
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Don't call count, which can be expensive. Just peek and if its not null, treat that as being > 0
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…RG/climate-android:master to master Squashed commit of the following: commit 5d1eeabe9b1b36d91c1cdec1bbe67d3dd0dce2da Author: Curtis <cstuehrenberg@climate.com> Date: Thu Sep 4 17:19:49 2014 -0700 Adding in a test case to delete harvest activities commit 0d8c5812a76c978eff359ccd205fbe05c83f7e7a Merge: 84aa57f 27f3db4 Author: Curtis <cstuehrenberg@climate.com> Date: Thu Sep 4 16:12:02 2014 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~cstuehrenberg/climate-android commit 84aa57febcf950208b13503c1a21085e6982f4e1 Author: Curtis <cstuehrenberg@climate.com> Date: Thu Sep 4 16:10:55 2014 -0700 UTEST] Adding new location files for testing moving around [TEST] Adding new location files for testing moving around commit 27f3db4f5c227ce2d0d468a390a746a10031c882 Merge: fca7ee1 2bf8d71 Author: Curtis Stuehrenberg <cstuehrenberg@climate.com> Date: Thu Sep 4 19:40:12 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '2bf8d710324485dca68a7fd10016d590b08badad': Merge pull request clojure#1 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master Debugged image code for scouting commit fca7ee1884d109eaccf41861f25a8cc6b83d4e36 Merge: d690f2a ebf41f3 Author: Curtis <cstuehrenberg@climate.com> Date: Thu Sep 4 12:08:31 2014 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~cstuehrenberg/climate-android commit d690f2ac36ff7ee556f49afba9cfde8414b30ef3 Author: Curtis <cstuehrenberg@climate.com> Date: Thu Sep 4 12:02:19 2014 -0700 Adding a new test file for creating and deleting activities
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…ERG/climate-android:blue-129 to master Squashed commit of the following: commit 203d16d76fc5111cce33636ab669624967592543 Merge: 0d3050a d3a3b5f Author: Curtis <cstuehrenberg@climate.com> Date: Thu Sep 25 11:02:04 2014 -0700 Merge branch 'blue-129' of ssh://stash.ci.climatedna.net:7999/~cstuehrenberg/climate-android into blue-129 Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/utils/ClimateInstrumentationTestCase2.java commit 0d3050aed7641958be17e6bf0d5c9856b79cbe43 Merge: ae3d47a 31e0c81 Author: Curtis <cstuehrenberg@climate.com> Date: Thu Sep 25 10:48:09 2014 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into blue-129 Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/LoginSmokeTest.java ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/utils/ClimateInstrumentationTestCase2.java commit d3a3b5f4ee94554f32a8063c14705d3758076b52 Author: Curtis Stuehrenberg <cstuehrenberg@climate.com> Date: Thu Sep 25 17:02:10 2014 +0000 Merge pull request #6 in ~CSTUEHRENBERG/climate-android from master to blue-129 Squashed commit of the following: commit 40d0441c662f5c1cf79384dbb082baa47371c557 Merge: fcfa949 ae3d47a Author: Curtis <cstuehrenberg@climate.com> Date: Thu Sep 25 10:00:54 2014 -0700 Merge branch 'blue-129' of ssh://stash.ci.climatedna.net:7999/~cstuehrenberg/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/utils/ClimateInstrumentationTestCase2.java commit fcfa949454c6d1472bf0737e84c0c3d37fc5629c Author: Curtis <cstuehrenberg@climate.com> Date: Thu Sep 25 09:48:37 2014 -0700 Removing Josh's prototype fix to resolve merge conflicts with mine commit 31e0c81cf54cae458a403e4bdc8e1d90a39d9930 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Wed Sep 24 23:49:30 2014 +0000 Merge pull request #46 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master Squashed commit of the following: commit d19259ff442b1b3e15c00b178220cf73fed8b3ee Author: Musselwhizzle <jm@therealjoshua.com> Date: Wed Sep 24 16:47:35 2014 -0700 adding tweak to fix issue on emulator commit ce3b254ffa26d2e5a00ff085097dac2c276918cd Merge: 8295fc5 7dde0e6 Author: Musselwhizzle <jm@therealjoshua.com> Date: Wed Sep 24 16:29:59 2014 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android commit 8295fc5ba0bbad1013811a23659f219c38fab4e2 Author: Musselwhizzle <jm@therealjoshua.com> Date: Wed Sep 24 16:29:31 2014 -0700 added spoon to take screenshots before and after tests are ran commit 7dde0e654a773cbb780a8ed47867c9174056bc3a Merge: e9fa699 a2a281d Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Wed Sep 24 19:11:16 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'a2a281d5a4590c02cc8d1e3126b4091938849050': Merge pull request #43 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit e9fa699778ad683f7325803ae510fff5223b3ce8 Merge: f9fe1b8 c1c9606 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Wed Sep 24 00:17:33 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c1c960659e5578f7a20347ec2bd412e633e6ffd8': Merge pull request #42 in MOB/climate-android from ~NROSENBERG/climate-android:MOB-576 to master Merge pull request #41 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-122 to master commit f9fe1b877fa6209f90d6612959a76ad53c7d1b0f Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 23 17:15:31 2014 -0700 updated the ignore files commit b07c691bf2e41bffa4699f32955040d2022f7352 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 23 17:13:46 2014 -0700 removed build files commit fff2dfa5244b94c753da584e5bf26bac7362acc5 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 23 17:12:18 2014 -0700 added support for spoon taking screenshots on espresso failure commit 1f5c4a569e67c19325e1cbaf97439e7670400780 Merge: caa80d2 e5d0471 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Sat Sep 20 01:12:02 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'e5d047159080a320e90e8315365c539bfa3aff55': Merge pull request #40 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit caa80d2c66ccc0bf1c87964b196a5d5ec6670c08 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 18:11:20 2014 -0700 added test for multiple fields commit dc34634a0217c3e8ec5bcf0c2874719caa472a76 Merge: 13d554f 6b6efb0 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Sat Sep 20 01:04:09 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '6b6efb07787a2d7fefca17678003eb220fb44e62': Merge pull request #39 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 13d554fe2650bbdb6caab96dcd6f1aafbdea90b0 Merge: 3369de0 1474c28 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 18:03:04 2014 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/ui/PlantingFunctionalTest.java commit 3369de0739d65fac9f64fdb8f0ded7d361191521 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 17:58:32 2014 -0700 added test for adding multiple fields to a planting scout commit e1d446af4b113a15c3dd3deddb3a5b5422157a74 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 14:58:10 2014 -0700 added functional testing to the planting activity commit fddd54d99adb83d62012af60ad8dfb55ca50afad Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 14:57:08 2014 -0700 added functional testing to the planting activity commit 9ec9a84935db84ff4fd349c208477217f2183048 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 11:11:50 2014 -0700 fixed a test case I broke commit 317f95d2ce491cfaa0aab4a7ad41172245df0e68 Merge: a65c57e 82b9e64 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Fri Sep 19 17:41:39 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '82b9e643e56be19cfb156c61a514fede3955317e': Merge pull request #36 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit a65c57e0003fe33b7693555e653c5f2a094e5d99 Author: Musselwhizzle <jm@therealjoshua.com> Date: Thu Sep 18 17:01:38 2014 -0700 adjust validation on CLU Editor. Updated tests cases for it commit 272a0a1732c4d36a393b412ae4d322d42a267adb Merge: 4fd36c4 c0638c5 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Thu Sep 18 20:14:01 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c0638c5320261ea92c1ff871d32ea60d10a5e383': Merge pull request #35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master Merge pull request #34 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 4fd36c44b9b9c1609439c0298748cb46ab3dbdab Merge: f239028 1599715 Author: Musselwhizzle <jm@therealjoshua.com> Date: Thu Sep 18 11:27:59 2014 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java commit f2390282424ff79771be0eb8f02c42052876d9b9 Author: Musselwhizzle <jm@therealjoshua.com> Date: Thu Sep 18 11:23:27 2014 -0700 added testing workability and sort order commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d Author: Musselwhizzle <jm@therealjoshua.com> Date: Thu Sep 18 10:54:02 2014 -0700 minor test case change commit 1a46521938924c7d99b12990103b37a34f83a464 Merge: 28b60c6 43440f4 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Wed Sep 17 17:46:24 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b': Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 28b60c61c17c95741ec331373c964658cff8f828 Author: Musselwhizzle <jm@therealjoshua.com> Date: Wed Sep 17 10:44:35 2014 -0700 minor test change commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73 Merge: 9771b57 22195c3 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 23:46:27 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b': Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3 Merge: c5d6157 5d2bd65 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 16:45:41 2014 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android commit c5d6157e451ed03c08643ba3c629e717b89f15d0 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 16:45:12 2014 -0700 added additional logging for when test fails commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054 Merge: ca6a0f5 a759b85 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 23:15:43 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665': Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 16:10:51 2014 -0700 merging down code commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a Merge: 0ab6c52 c0327b4 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 16:06:06 2014 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 16:06:02 2014 -0700 added login and out test flow commit c0327b4fc13c89418e08bf36533dd05722bc955c Merge: fef974b fdd7bd9 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 23:05:34 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f': Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master commit fef974ba5e14209211b9addc0d1563d3b3fcfccd Merge: eea36d5 45ae29a Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 22:38:52 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851': Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit eea36d5154b6f910c7623333599066162ecbf6bb Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 15:36:39 2014 -0700 check field details renders something commit d7d110f9d967869952d532f495bdc711acb8a07f Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 14:17:38 2014 -0700 verifing fields loads are unique and complete commit e4c249817e09001e31b7f0fd446c85899d9db5cf Merge: cd2045d 9a02bbd Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 01:30:05 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d': Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit cd2045d746191a41f4dc8657984f8a3bf90bb88b Author: Musselwhizzle <jm@therealjoshua.com> Date: Mon Sep 15 18:29:28 2014 -0700 fixed a test bug commit d563da337b94dd7131efa4afda61000f600162bf Merge: e48219f 5b8d770 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 00:56:10 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273': Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit e48219f73ead40c975270d105c4e3d81f7e4f92e Author: Musselwhizzle <jm@therealjoshua.com> Date: Mon Sep 15 17:55:20 2014 -0700 added test for zoom on all fields and sorting by last24 next24 and workability commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f Merge: 4fd31c1 3fb9894 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Mon Sep 15 23:39:41 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8': Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master fix for update commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696 Author: Musselwhizzle <jm@therealjoshua.com> Date: Mon Sep 15 16:37:59 2014 -0700 added test for SaaS links commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a Merge: f688c1a 61e95c0 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Sat Sep 13 00:41:21 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '61e95c076c07105e33f71c06552bc0ee093e3a81': Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5 Merge: 5e7b62b c070bc7 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 12 17:39:50 2014 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 12 17:30:21 2014 -0700 cleaned up tests commit 777b80ce2b46ba3f28db8041a0a285e33039cd52 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 12 15:25:35 2014 -0700 udpated gradle to use test res commit d4092562a077dbe2c3f9a471e43f9a7b05a08766 Merge: 71d5f20 b8eb732 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Fri Sep 12 22:23:58 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6': fixed scouting delete scouting fix commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a Merge: 36774a5 3c318d5 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Thu Sep 11 22:41:08 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3c318d5c90998459b2463fb99e0d191fad34f649': Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master added code for fixing update scouting commit 36774a52a326a0baac0746df252c5eda2fe90d41 Merge: 79b5657 e5f845f Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Thu Sep 11 17:30:29 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'e5f845f242fdc19c844601124a47103964f053ec': Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3 commit 79b5657249e830bbc535c808d8a6a02b029962cf Author: Musselwhizzle <jm@therealjoshua.com> Date: Thu Sep 11 10:05:18 2014 -0700 map test consolidation commit 67aa159e3ad039af4b2c6e2694356defb2f41a51 Merge: 586a520 9b46015 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Thu Sep 11 17:04:04 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '9b4601584a795840815beb40d98ad57a3fba6a1a': Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master Incremented version commit 586a520d721c59a7e5186e9120ea6d57c54f6b26 Merge: f0cee81 3d01293 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 9 23:39:06 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3d012936a15290e1bc6a664ad4486e024607bc99': Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 9 16:37:57 2014 -0700 added returning to list after a scouting submit commit 433c4a0dd89f05593c5bff9db774e638d48a182e Merge: b1a99bf 108b943 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 9 21:59:23 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123': Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit b1a99bfb7736d92bbecaa27652f50b375513bdf4 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 9 14:58:33 2014 -0700 added deleting of scouting event commit c072e5241e776041a41fb68e7ec1abffa3cf4822 Merge: 7446fa4 f6ae870 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 9 21:54:52 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22': Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 7446fa48d55b6c27af16702e4235a938da4db7e5 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 9 14:53:21 2014 -0700 updated scouting for pics and refactored code commit 8909d2298520d03e2381af6f11d6a34b50cf5b10 Merge: acda078 305156d Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 9 00:36:17 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c': Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit acda0781dbedb1607d69201a119c44c5afcdebad Author: Musselwhizzle <jm@therealjoshua.com> Date: Mon Sep 8 17:35:27 2014 -0700 added test for imageviewer commit 489e17858e6351785a2cfe07ee66b406873492b7 Merge: 975f03c e37df5c Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Mon Sep 8 23:59:47 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20': Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5 Author: Musselwhizzle <jm@therealjoshua.com> Date: Mon Sep 8 16:58:43 2014 -0700 added image viewer for scouting commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252 Merge: c7e20ad 2597440 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Sat Sep 6 00:17:39 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '2597440bd31c195f298f5795832260361844e964': Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit c7e20ad22c700c30c570611c03e04e2f0cabdd83 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 5 15:12:52 2014 -0700 added test for MultipleField selectors commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 5 14:09:08 2014 -0700 fixed future radar bug. added tests for it commit a2a281d5a4590c02cc8d1e3126b4091938849050 Author: Curtis Stuehrenberg <cstuehrenberg@climate.com> Date: Wed Sep 24 15:16:04 2014 +0000 Merge pull request #43 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master Squashed commit of the following: commit e9fa699778ad683f7325803ae510fff5223b3ce8 Merge: f9fe1b8 c1c9606 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Wed Sep 24 00:17:33 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c1c960659e5578f7a20347ec2bd412e633e6ffd8': Merge pull request #42 in MOB/climate-android from ~NROSENBERG/climate-android:MOB-576 to master Merge pull request #41 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-122 to master commit f9fe1b877fa6209f90d6612959a76ad53c7d1b0f Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 23 17:15:31 2014 -0700 updated the ignore files commit b07c691bf2e41bffa4699f32955040d2022f7352 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 23 17:13:46 2014 -0700 removed build files commit fff2dfa5244b94c753da584e5bf26bac7362acc5 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 23 17:12:18 2014 -0700 added support for spoon taking screenshots on espresso failure commit 1f5c4a569e67c19325e1cbaf97439e7670400780 Merge: caa80d2 e5d0471 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Sat Sep 20 01:12:02 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'e5d047159080a320e90e8315365c539bfa3aff55': Merge pull request #40 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit caa80d2c66ccc0bf1c87964b196a5d5ec6670c08 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 18:11:20 2014 -0700 added test for multiple fields commit dc34634a0217c3e8ec5bcf0c2874719caa472a76 Merge: 13d554f 6b6efb0 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Sat Sep 20 01:04:09 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '6b6efb07787a2d7fefca17678003eb220fb44e62': Merge pull request #39 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 13d554fe2650bbdb6caab96dcd6f1aafbdea90b0 Merge: 3369de0 1474c28 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 18:03:04 2014 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/ui/PlantingFunctionalTest.java commit 3369de0739d65fac9f64fdb8f0ded7d361191521 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 17:58:32 2014 -0700 added test for adding multiple fields to a planting scout commit e1d446af4b113a15c3dd3deddb3a5b5422157a74 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 14:58:10 2014 -0700 added functional testing to the planting activity commit fddd54d99adb83d62012af60ad8dfb55ca50afad Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 14:57:08 2014 -0700 added functional testing to the planting activity commit 9ec9a84935db84ff4fd349c208477217f2183048 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 11:11:50 2014 -0700 fixed a test case I broke commit 317f95d2ce491cfaa0aab4a7ad41172245df0e68 Merge: a65c57e 82b9e64 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Fri Sep 19 17:41:39 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '82b9e643e56be19cfb156c61a514fede3955317e': Merge pull request #36 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit a65c57e0003fe33b7693555e653c5f2a094e5d99 Author: Musselwhizzle <jm@therealjoshua.com> Date: Thu Sep 18 17:01:38 2014 -0700 adjust validation on CLU Editor. Updated tests cases for it commit 272a0a1732c4d36a393b412ae4d322d42a267adb Merge: 4fd36c4 c0638c5 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Thu Sep 18 20:14:01 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c0638c5320261ea92c1ff871d32ea60d10a5e383': Merge pull request #35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master Merge pull request #34 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 4fd36c44b9b9c1609439c0298748cb46ab3dbdab Merge: f239028 1599715 Author: Musselwhizzle <jm@therealjoshua.com> Date: Thu Sep 18 11:27:59 2014 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java commit f2390282424ff79771be0eb8f02c42052876d9b9 Author: Musselwhizzle <jm@therealjoshua.com> Date: Thu Sep 18 11:23:27 2014 -0700 added testing workability and sort order commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d Author: Musselwhizzle <jm@therealjoshua.com> Date: Thu Sep 18 10:54:02 2014 -0700 minor test case change commit 1a46521938924c7d99b12990103b37a34f83a464 Merge: 28b60c6 43440f4 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Wed Sep 17 17:46:24 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b': Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 28b60c61c17c95741ec331373c964658cff8f828 Author: Musselwhizzle <jm@therealjoshua.com> Date: Wed Sep 17 10:44:35 2014 -0700 minor test change commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73 Merge: 9771b57 22195c3 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 23:46:27 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b': Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3 Merge: c5d6157 5d2bd65 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 16:45:41 2014 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android commit c5d6157e451ed03c08643ba3c629e717b89f15d0 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 16:45:12 2014 -0700 added additional logging for when test fails commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054 Merge: ca6a0f5 a759b85 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 23:15:43 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665': Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 16:10:51 2014 -0700 merging down code commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a Merge: 0ab6c52 c0327b4 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 16:06:06 2014 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 16:06:02 2014 -0700 added login and out test flow commit c0327b4fc13c89418e08bf36533dd05722bc955c Merge: fef974b fdd7bd9 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 23:05:34 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f': Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master commit fef974ba5e14209211b9addc0d1563d3b3fcfccd Merge: eea36d5 45ae29a Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 22:38:52 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851': Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit eea36d5154b6f910c7623333599066162ecbf6bb Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 15:36:39 2014 -0700 check field details renders something commit d7d110f9d967869952d532f495bdc711acb8a07f Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 14:17:38 2014 -0700 verifing fields loads are unique and complete commit e4c249817e09001e31b7f0fd446c85899d9db5cf Merge: cd2045d 9a02bbd Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 01:30:05 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d': Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit cd2045d746191a41f4dc8657984f8a3bf90bb88b Author: Musselwhizzle <jm@therealjoshua.com> Date: Mon Sep 15 18:29:28 2014 -0700 fixed a test bug commit d563da337b94dd7131efa4afda61000f600162bf Merge: e48219f 5b8d770 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 00:56:10 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273': Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit e48219f73ead40c975270d105c4e3d81f7e4f92e Author: Musselwhizzle <jm@therealjoshua.com> Date: Mon Sep 15 17:55:20 2014 -0700 added test for zoom on all fields and sorting by last24 next24 and workability commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f Merge: 4fd31c1 3fb9894 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Mon Sep 15 23:39:41 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8': Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master fix for update commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696 Author: Musselwhizzle <jm@therealjoshua.com> Date: Mon Sep 15 16:37:59 2014 -0700 added test for SaaS links commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a Merge: f688c1a 61e95c0 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Sat Sep 13 00:41:21 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '61e95c076c07105e33f71c06552bc0ee093e3a81': Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5 Merge: 5e7b62b c070bc7 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 12 17:39:50 2014 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 12 17:30:21 2014 -0700 cleaned up tests commit 777b80ce2b46ba3f28db8041a0a285e33039cd52 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 12 15:25:35 2014 -0700 udpated gradle to use test res commit d4092562a077dbe2c3f9a471e43f9a7b05a08766 Merge: 71d5f20 b8eb732 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Fri Sep 12 22:23:58 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6': fixed scouting delete scouting fix commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a Merge: 36774a5 3c318d5 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Thu Sep 11 22:41:08 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3c318d5c90998459b2463fb99e0d191fad34f649': Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master added code for fixing update scouting commit 36774a52a326a0baac0746df252c5eda2fe90d41 Merge: 79b5657 e5f845f Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Thu Sep 11 17:30:29 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'e5f845f242fdc19c844601124a47103964f053ec': Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3 commit 79b5657249e830bbc535c808d8a6a02b029962cf Author: Musselwhizzle <jm@therealjoshua.com> Date: Thu Sep 11 10:05:18 2014 -0700 map test consolidation commit 67aa159e3ad039af4b2c6e2694356defb2f41a51 Merge: 586a520 9b46015 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Thu Sep 11 17:04:04 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '9b4601584a795840815beb40d98ad57a3fba6a1a': Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master Incremented version commit 586a520d721c59a7e5186e9120ea6d57c54f6b26 Merge: f0cee81 3d01293 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 9 23:39:06 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3d012936a15290e1bc6a664ad4486e024607bc99': Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 9 16:37:57 2014 -0700 added returning to list after a scouting submit commit 433c4a0dd89f05593c5bff9db774e638d48a182e Merge: b1a99bf 108b943 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 9 21:59:23 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123': Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit b1a99bfb7736d92bbecaa27652f50b375513bdf4 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 9 14:58:33 2014 -0700 added deleting of scouting event commit c072e5241e776041a41fb68e7ec1abffa3cf4822 Merge: 7446fa4 f6ae870 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 9 21:54:52 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22': Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 7446fa48d55b6c27af16702e4235a938da4db7e5 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 9 14:53:21 2014 -0700 updated scouting for pics and refactored code commit 8909d2298520d03e2381af6f11d6a34b50cf5b10 Merge: acda078 305156d Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 9 00:36:17 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c': Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit acda0781dbedb1607d69201a119c44c5afcdebad Author: Musselwhizzle <jm@therealjoshua.com> Date: Mon Sep 8 17:35:27 2014 -0700 added test for imageviewer commit 489e17858e6351785a2cfe07ee66b406873492b7 Merge: 975f03c e37df5c Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Mon Sep 8 23:59:47 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20': Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5 Author: Musselwhizzle <jm@therealjoshua.com> Date: Mon Sep 8 16:58:43 2014 -0700 added image viewer for scouting commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252 Merge: c7e20ad 2597440 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Sat Sep 6 00:17:39 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '2597440bd31c195f298f5795832260361844e964': Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit c7e20ad22c700c30c570611c03e04e2f0cabdd83 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 5 15:12:52 2014 -0700 added test for MultipleField selectors commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 5 14:09:08 2014 -0700 fixed future radar bug. added tests for it commit c1c960659e5578f7a20347ec2bd412e633e6ffd8 Author: Richard Shin <rshin@climate.com> Date: Tue Sep 23 22:30:25 2014 +0000 Merge pull request #42 in MOB/climate-android from ~NROSENBERG/climate-android:MOB-576 to master Squashed commit of the following: commit 1295e7c792a1bdc77df1c0beda3609d32da45837 Author: Nicole Rosenberg <nrosenberg@climate.com> Date: Tue Sep 23 15:23:17 2014 -0700 [MOB-576] Updating 'last updated' date on SaaS agreement commit ae3d47a3d41a0bbe21174a768c126d94aa9641c6 Author: Curtis <cstuehrenberg@climate.com> Date: Wed Sep 24 17:03:54 2014 -0700 Added in a new delegate class to account for drawers not being visible enough to click commit dac6f17d5bcbf1e283ec1d58615f329db12355f3 Author: Curtis <cstuehrenberg@climate.com> Date: Wed Sep 24 12:06:03 2014 -0700 Adding in the fasterxml jackson libraries for test object purposes commit bd0a80654ecc90b03e755ad4d9ea567573759531 Author: Curtis Stuehrenberg <cstuehrenberg@climate.com> Date: Wed Sep 24 16:44:17 2014 +0000 Merge pull request #3 in ~CSTUEHRENBERG/climate-android from master to blue-129 Squashed commit of the following: commit a2a281d5a4590c02cc8d1e3126b4091938849050 Author: Curtis Stuehrenberg <cstuehrenberg@climate.com> Date: Wed Sep 24 15:16:04 2014 +0000 Merge pull request #43 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master Squashed commit of the following: commit e9fa699778ad683f7325803ae510fff5223b3ce8 Merge: f9fe1b8 c1c9606 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Wed Sep 24 00:17:33 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c1c960659e5578f7a20347ec2bd412e633e6ffd8': Merge pull request #42 in MOB/climate-android from ~NROSENBERG/climate-android:MOB-576 to master Merge pull request #41 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-122 to master commit f9fe1b877fa6209f90d6612959a76ad53c7d1b0f Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 23 17:15:31 2014 -0700 updated the ignore files commit b07c691bf2e41bffa4699f32955040d2022f7352 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 23 17:13:46 2014 -0700 removed build files commit fff2dfa5244b94c753da584e5bf26bac7362acc5 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 23 17:12:18 2014 -0700 added support for spoon taking screenshots on espresso failure commit 1f5c4a569e67c19325e1cbaf97439e7670400780 Merge: caa80d2 e5d0471 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Sat Sep 20 01:12:02 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'e5d047159080a320e90e8315365c539bfa3aff55': Merge pull request #40 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit caa80d2c66ccc0bf1c87964b196a5d5ec6670c08 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 18:11:20 2014 -0700 added test for multiple fields commit dc34634a0217c3e8ec5bcf0c2874719caa472a76 Merge: 13d554f 6b6efb0 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Sat Sep 20 01:04:09 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '6b6efb07787a2d7fefca17678003eb220fb44e62': Merge pull request #39 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 13d554fe2650bbdb6caab96dcd6f1aafbdea90b0 Merge: 3369de0 1474c28 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 18:03:04 2014 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/ui/PlantingFunctionalTest.java commit 3369de0739d65fac9f64fdb8f0ded7d361191521 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 17:58:32 2014 -0700 added test for adding multiple fields to a planting scout commit e1d446af4b113a15c3dd3deddb3a5b5422157a74 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 14:58:10 2014 -0700 added functional testing to the planting activity commit fddd54d99adb83d62012af60ad8dfb55ca50afad Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 14:57:08 2014 -0700 added functional testing to the planting activity commit 9ec9a84935db84ff4fd349c208477217f2183048 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 19 11:11:50 2014 -0700 fixed a test case I broke commit 317f95d2ce491cfaa0aab4a7ad41172245df0e68 Merge: a65c57e 82b9e64 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Fri Sep 19 17:41:39 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '82b9e643e56be19cfb156c61a514fede3955317e': Merge pull request #36 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit a65c57e0003fe33b7693555e653c5f2a094e5d99 Author: Musselwhizzle <jm@therealjoshua.com> Date: Thu Sep 18 17:01:38 2014 -0700 adjust validation on CLU Editor. Updated tests cases for it commit 272a0a1732c4d36a393b412ae4d322d42a267adb Merge: 4fd36c4 c0638c5 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Thu Sep 18 20:14:01 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c0638c5320261ea92c1ff871d32ea60d10a5e383': Merge pull request #35 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-177 to master Merge pull request #34 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 4fd36c44b9b9c1609439c0298748cb46ab3dbdab Merge: f239028 1599715 Author: Musselwhizzle <jm@therealjoshua.com> Date: Thu Sep 18 11:27:59 2014 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/ui/FieldsListSmokeTest.java commit f2390282424ff79771be0eb8f02c42052876d9b9 Author: Musselwhizzle <jm@therealjoshua.com> Date: Thu Sep 18 11:23:27 2014 -0700 added testing workability and sort order commit 2cf46a4a7d3a82753cc6c38385db7b8aa7b01a6d Author: Musselwhizzle <jm@therealjoshua.com> Date: Thu Sep 18 10:54:02 2014 -0700 minor test case change commit 1a46521938924c7d99b12990103b37a34f83a464 Merge: 28b60c6 43440f4 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Wed Sep 17 17:46:24 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '43440f4550f5f8a73f12df5c78c3bd30cd03a17b': Merge pull request #31 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 28b60c61c17c95741ec331373c964658cff8f828 Author: Musselwhizzle <jm@therealjoshua.com> Date: Wed Sep 17 10:44:35 2014 -0700 minor test change commit 8abc9dc519fd9823444a44b22a7da8bc33c8fc73 Merge: 9771b57 22195c3 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 23:46:27 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '22195c3204dd8f4955216cbbc9f523f6ced06c0b': Merge pull request #30 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 9771b57d37626c7168b9665cc30ce9f866c9e9c3 Merge: c5d6157 5d2bd65 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 16:45:41 2014 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android commit c5d6157e451ed03c08643ba3c629e717b89f15d0 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 16:45:12 2014 -0700 added additional logging for when test fails commit 5d2bd6556413d2aa0aedf714df85d39ffc2ac054 Merge: ca6a0f5 a759b85 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 23:15:43 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'a759b855cf60e894073a9b3756a0f13b1c5d3665': Merge pull request #29 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit ca6a0f5babbb8e9c0e15bdf5ddff4335acc9fe69 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 16:10:51 2014 -0700 merging down code commit de9f77e84d73e7bb5c8b0bb3b9d086ba004b443a Merge: 0ab6c52 c0327b4 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 16:06:06 2014 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~jmusselwhite/josh-android commit 0ab6c528769092fa8c22ab8c5c20b04221721f5d Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 16:06:02 2014 -0700 added login and out test flow commit c0327b4fc13c89418e08bf36533dd05722bc955c Merge: fef974b fdd7bd9 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 23:05:34 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fdd7bd99f182ea21798b7ba18b3035e9505cd30f': Merge pull request #28 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:blue-163 to master commit fef974ba5e14209211b9addc0d1563d3b3fcfccd Merge: eea36d5 45ae29a Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 22:38:52 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '45ae29a5daa70aa3b73e34f5d637afb858dd4851': Merge pull request #26 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit eea36d5154b6f910c7623333599066162ecbf6bb Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 15:36:39 2014 -0700 check field details renders something commit d7d110f9d967869952d532f495bdc711acb8a07f Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 16 14:17:38 2014 -0700 verifing fields loads are unique and complete commit e4c249817e09001e31b7f0fd446c85899d9db5cf Merge: cd2045d 9a02bbd Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 01:30:05 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '9a02bbd3766ef9f0d87a8138061515b0b5789f6d': Merge pull request #25 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit cd2045d746191a41f4dc8657984f8a3bf90bb88b Author: Musselwhizzle <jm@therealjoshua.com> Date: Mon Sep 15 18:29:28 2014 -0700 fixed a test bug commit d563da337b94dd7131efa4afda61000f600162bf Merge: e48219f 5b8d770 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 16 00:56:10 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '5b8d770b2e4fe858edc4a75cf4f882d8eebeb273': Merge pull request #24 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit e48219f73ead40c975270d105c4e3d81f7e4f92e Author: Musselwhizzle <jm@therealjoshua.com> Date: Mon Sep 15 17:55:20 2014 -0700 added test for zoom on all fields and sorting by last24 next24 and workability commit bc35c5f7b36e59ebb544968295b3ff346d29dc6f Merge: 4fd31c1 3fb9894 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Mon Sep 15 23:39:41 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3fb9894cabad0719cb279e7a8ade1d5aac5980a8': Merge pull request #23 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master fix for update commit 4fd31c1d6028122a9cbe0dee9bcedb4b366e5696 Author: Musselwhizzle <jm@therealjoshua.com> Date: Mon Sep 15 16:37:59 2014 -0700 added test for SaaS links commit 306c317c602c5f60fe4d719f4a3fafff2f26ba5a Merge: f688c1a 61e95c0 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Sat Sep 13 00:41:21 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '61e95c076c07105e33f71c06552bc0ee093e3a81': Merge pull request #22 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit f688c1a8df88c2844b0a2296fd55d0a9c7563ac5 Merge: 5e7b62b c070bc7 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 12 17:39:50 2014 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/ClimateGrowersApp.iml ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/androidTest/java/com/climate/growers/android/tests/functional/integration/smoke/MapSmokeTest.java commit 5e7b62ba1a9ccde821df1bd386c64e41bf3758ef Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 12 17:30:21 2014 -0700 cleaned up tests commit 777b80ce2b46ba3f28db8041a0a285e33039cd52 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 12 15:25:35 2014 -0700 udpated gradle to use test res commit d4092562a077dbe2c3f9a471e43f9a7b05a08766 Merge: 71d5f20 b8eb732 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Fri Sep 12 22:23:58 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'b8eb73268be5e122775e7fa82e7a8415609199a6': fixed scouting delete scouting fix commit 71d5f209bced297a2d1d393f22397c1eb1f92c4a Merge: 36774a5 3c318d5 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Thu Sep 11 22:41:08 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3c318d5c90998459b2463fb99e0d191fad34f649': Merge pull request #17 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master added code for fixing update scouting commit 36774a52a326a0baac0746df252c5eda2fe90d41 Merge: 79b5657 e5f845f Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Thu Sep 11 17:30:29 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'e5f845f242fdc19c844601124a47103964f053ec': Merge pull request #16 in MOB/climate-android from ~JMUSSELWHITE/josh-android:release/1.3 to release/1.3 commit 79b5657249e830bbc535c808d8a6a02b029962cf Author: Musselwhizzle <jm@therealjoshua.com> Date: Thu Sep 11 10:05:18 2014 -0700 map test consolidation commit 67aa159e3ad039af4b2c6e2694356defb2f41a51 Merge: 586a520 9b46015 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Thu Sep 11 17:04:04 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '9b4601584a795840815beb40d98ad57a3fba6a1a': Merge pull request #14 in MOB/climate-android from ~CSTUEHRENBERG/climate-android:master to master Incremented version commit 586a520d721c59a7e5186e9120ea6d57c54f6b26 Merge: f0cee81 3d01293 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 9 23:39:06 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3d012936a15290e1bc6a664ad4486e024607bc99': Merge pull request #13 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit f0cee814cc9a80cfaf38ef6334e85f83f692a8cd Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 9 16:37:57 2014 -0700 added returning to list after a scouting submit commit 433c4a0dd89f05593c5bff9db774e638d48a182e Merge: b1a99bf 108b943 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 9 21:59:23 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '108b943a0abe39b0c05247e3b4a2fcb9f2c81123': Merge pull request #12 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit b1a99bfb7736d92bbecaa27652f50b375513bdf4 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 9 14:58:33 2014 -0700 added deleting of scouting event commit c072e5241e776041a41fb68e7ec1abffa3cf4822 Merge: 7446fa4 f6ae870 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 9 21:54:52 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'f6ae8700fcf286023c4186250ddc0ab2b2b85b22': Merge pull request #11 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 7446fa48d55b6c27af16702e4235a938da4db7e5 Author: Musselwhizzle <jm@therealjoshua.com> Date: Tue Sep 9 14:53:21 2014 -0700 updated scouting for pics and refactored code commit 8909d2298520d03e2381af6f11d6a34b50cf5b10 Merge: acda078 305156d Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Tue Sep 9 00:36:17 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '305156de80a9f4cc22f3c504b6f9864092e6a64c': Merge pull request #10 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit acda0781dbedb1607d69201a119c44c5afcdebad Author: Musselwhizzle <jm@therealjoshua.com> Date: Mon Sep 8 17:35:27 2014 -0700 added test for imageviewer commit 489e17858e6351785a2cfe07ee66b406873492b7 Merge: 975f03c e37df5c Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Mon Sep 8 23:59:47 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'e37df5cf58e4cedcc38c3eaf769c92684e92ac20': Merge pull request #9 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit 975f03c2a184aeb39e2550d5a1d2ce5ecd4fc9d5 Author: Musselwhizzle <jm@therealjoshua.com> Date: Mon Sep 8 16:58:43 2014 -0700 added image viewer for scouting commit b783efdfe95bb8c40d5fe6ffed80e9bdb3fd5252 Merge: c7e20ad 2597440 Author: Joshua Musselwhite <jmusselwhite@climate.com> Date: Sat Sep 6 00:17:39 2014 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '2597440bd31c195f298f5795832260361844e964': Merge pull request #8 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master Merge pull request #7 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master commit c7e20ad22c700c30c570611c03e04e2f0cabdd83 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 5 15:12:52 2014 -0700 added test for MultipleField selectors commit fe0eebcd44428d5ad99cc8c599a7d3c69d7ed0b5 Author: Musselwhizzle <jm@therealjoshua.com> Date: Fri Sep 5 14:09:08 2014 -0700 fixed future radar bug. added tests for it commit c1c960659e5578f7a20347ec2bd412e633e6ffd8 Author: Richard Shin <rshin@climate.com> Date: Tue Sep 23 22:30:25 2014 +0000 Merge pull request #42 in MOB/climate-android from ~NROSENBERG/climate-android:MOB-576 to master Squashed commit of the following: commit 1295e7c792a1bdc77df1c0beda3609d32da45837 Author: Nicole Rosenberg <nrosenberg@climate.com> Date: Tue Sep 23 15:23:17 2014 -0700 [MOB-576] Updating 'last updated' date on SaaS agreement commit a1ecd2c9bb77ef9bb0528493fd6003b20beabe75 Author: Curtis <cstuehrenberg@climate.com> Date: Wed Sep 24 09:40:41 2014 -0700 Created a few test objects for use in testing. This is part of the decoupling from hardcoded values exercise necessary for completig [BLUE_129] correctly.
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…imate-android-matt:master to master Squashed commit of the following: commit 935feee7ddf2b2cae2756457ae63347d52b63314 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 21:04:42 2015 +0000 Merge pull request clojure#3 in ~MATT.REYNOLDS/climate-android-matt from nitrogen_fast_sql to master Squashed commit of the following: commit 1d333c75c03329b52d4cd954f868a54d4bbe457d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 13:09:14 2015 -0700 Fast SQL operations for NitrogenAdvisorCard new Nitrogen Advisor Library commit 9013c506d597e15dd57c6152f7ed6e3a7e090691 Merge: 93eb6a9 549cba5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 19:49:53 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '549cba52abe1abad5b4dd35e07fd0c3f17a1a2e6': Merge pull request #284 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 93eb6a90d5bdfea31e9f83555a27ef8753dc0ade Merge: 7746d9c 07e117e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:21:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '07e117e12c8ebbb45d0dda0f0ff487e47d9163d5': Merge pull request #282 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 7746d9c89be66bc1e85e8d3e05958d360c4be4df Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:06:53 2015 +0000 Merge pull request clojure#1 in ~MATT.REYNOLDS/climate-android-matt from na_provider_fixes to master Squashed commit of the following: commit cb286cd730c70329d3c4721d9aab6d1af886af00 Merge: c561808 a0ea318 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:54:17 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit c561808f7e2a179c86bdf581b87f5b62002d1fda Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:47:48 2015 -0700 Added reference to shinobicharts, which NitrogenAdvisor/NAChartView depends on. commit 8450ac2e7efe39e28832ec222e0849718cd5051a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:52:43 2015 -0700 Missed imports on merge commit dbdbf1ca86ce556856bbd2a9e8e501cd95108357 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:27:53 2015 -0700 build.gradle modifications for new nitrogen advisor with na_provider fixes commit 3b9d6dcfab218d38d4de88c9ec7408d62a0e9d21 Merge: 4750b5b babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 11:41:38 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit 4750b5baa3ee673ce3842125ee7b79f3afe97dfe Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Apr 30 17:45:06 2015 -0700 Fixes for provider and server names for the NitrogenAdvisor commit a0ea318ada3d597226733e094957e304822c800a Merge: 1e245a7 3e28a4f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 21:53:43 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3e28a4fe1d544f2c4e1b6baa3763855a69851ba5': Merge pull request #272 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 1e245a71e22ae75ca0ea557d47a8394745592998 Merge: f9c87a5 babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:32:06 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit f9c87a54b886c26f91e9032dabed6dffce7867b4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Apr 28 13:03:16 2015 -0700 build.gradle now points to maven repo for NitrogenAdvisor commit 79a315db0627df808af0b761dffff547d0b3f362 Merge: d2f29c0 16925e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:04:28 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit d2f29c0e38eecbe121bcf5e9dcf706a0219e3d44 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:02:21 2015 -0700 Renderer for the Nitrogen advisor card commit 762904e2ccaf24475ed667eb4735b8f8a8548d90 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:01:29 2015 -0700 Integrate NitrogenAdvisor
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…imate-android-matt:master to master Squashed commit of the following: commit 1090719dbbbe497860828ce6cf4dbca256123a0c Merge: d624716 c734f8f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 20:58:44 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c734f8fd43fabe80bafec1cd97dc7f130a466a21': Merge pull request #283 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1434 to master commit d6247168652ee0b013de5bf5fcb83653ce3e376b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 04:40:43 2015 +0000 Merge pull request clojure#4 in ~MATT.REYNOLDS/climate-android-matt from ui_fixes_and_perf to master Squashed commit of the following: commit 0a58baf7124ae517733cb73ca656bdd7604ef5c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 7 14:04:52 2015 -0700 Fixed margins in NitrogenAdvisorModuleCard Changed hardcoded view types to named constants in ModuleLauncherAdapter.java Changed switch statement to table lookup in ModuleLauncherAdapter.java Added upgrade message for basic users in NitrogenAdvisorModuleCard Changed reference to latest nitrogen advisor module in build.gradle commit e73c41ca178fc8bdd31c72e1fef0c3101d63a60d Merge: 935feee 21df0c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 6 22:34:13 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '21df0c5a2462fc298bd099079f207adef39bcb43': Merge pull request #292 in MOB/climate-android from ~DSLANE/climate-android:remove-fha-text to master Merge pull request #290 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 935feee7ddf2b2cae2756457ae63347d52b63314 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 21:04:42 2015 +0000 Merge pull request clojure#3 in ~MATT.REYNOLDS/climate-android-matt from nitrogen_fast_sql to master Squashed commit of the following: commit 1d333c75c03329b52d4cd954f868a54d4bbe457d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 13:09:14 2015 -0700 Fast SQL operations for NitrogenAdvisorCard new Nitrogen Advisor Library commit 9013c506d597e15dd57c6152f7ed6e3a7e090691 Merge: 93eb6a9 549cba5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 19:49:53 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '549cba52abe1abad5b4dd35e07fd0c3f17a1a2e6': Merge pull request #284 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 93eb6a90d5bdfea31e9f83555a27ef8753dc0ade Merge: 7746d9c 07e117e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:21:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '07e117e12c8ebbb45d0dda0f0ff487e47d9163d5': Merge pull request #282 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 7746d9c89be66bc1e85e8d3e05958d360c4be4df Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:06:53 2015 +0000 Merge pull request clojure#1 in ~MATT.REYNOLDS/climate-android-matt from na_provider_fixes to master Squashed commit of the following: commit cb286cd730c70329d3c4721d9aab6d1af886af00 Merge: c561808 a0ea318 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:54:17 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit c561808f7e2a179c86bdf581b87f5b62002d1fda Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:47:48 2015 -0700 Added reference to shinobicharts, which NitrogenAdvisor/NAChartView depends on. commit 8450ac2e7efe39e28832ec222e0849718cd5051a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:52:43 2015 -0700 Missed imports on merge commit dbdbf1ca86ce556856bbd2a9e8e501cd95108357 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:27:53 2015 -0700 build.gradle modifications for new nitrogen advisor with na_provider fixes commit 3b9d6dcfab218d38d4de88c9ec7408d62a0e9d21 Merge: 4750b5b babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 11:41:38 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit 4750b5baa3ee673ce3842125ee7b79f3afe97dfe Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Apr 30 17:45:06 2015 -0700 Fixes for provider and server names for the NitrogenAdvisor commit a0ea318ada3d597226733e094957e304822c800a Merge: 1e245a7 3e28a4f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 21:53:43 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3e28a4fe1d544f2c4e1b6baa3763855a69851ba5': Merge pull request #272 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 1e245a71e22ae75ca0ea557d47a8394745592998 Merge: f9c87a5 babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:32:06 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit f9c87a54b886c26f91e9032dabed6dffce7867b4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Apr 28 13:03:16 2015 -0700 build.gradle now points to maven repo for NitrogenAdvisor commit 79a315db0627df808af0b761dffff547d0b3f362 Merge: d2f29c0 16925e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:04:28 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit d2f29c0e38eecbe121bcf5e9dcf706a0219e3d44 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:02:21 2015 -0700 Renderer for the Nitrogen advisor card commit 762904e2ccaf24475ed667eb4735b8f8a8548d90 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:01:29 2015 -0700 Integrate NitrogenAdvisor
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…imate-android-matt:na_cosmetic_fixes to master Squashed commit of the following: commit 58f5ec9c78af2359097c7ddbdafcf7f1bed4ee47 Merge: 3cceff5 d18188c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 13 10:13:57 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_cosmetic_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java ClimateGrowersProject/ClimateGrowersApp/src/main/res/values/strings.xml commit 3cceff5661badb702ef22ea8a2130bde494f4cfe Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 12 17:21:40 2015 -0700 Changed NitrogenAdvisor to have an Activity name. Handled stale data in the nitrogen advisor card commit 1090719dbbbe497860828ce6cf4dbca256123a0c Merge: d624716 c734f8f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 20:58:44 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c734f8fd43fabe80bafec1cd97dc7f130a466a21': Merge pull request #283 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1434 to master commit d6247168652ee0b013de5bf5fcb83653ce3e376b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 04:40:43 2015 +0000 Merge pull request clojure#4 in ~MATT.REYNOLDS/climate-android-matt from ui_fixes_and_perf to master Squashed commit of the following: commit 0a58baf7124ae517733cb73ca656bdd7604ef5c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 7 14:04:52 2015 -0700 Fixed margins in NitrogenAdvisorModuleCard Changed hardcoded view types to named constants in ModuleLauncherAdapter.java Changed switch statement to table lookup in ModuleLauncherAdapter.java Added upgrade message for basic users in NitrogenAdvisorModuleCard Changed reference to latest nitrogen advisor module in build.gradle commit e73c41ca178fc8bdd31c72e1fef0c3101d63a60d Merge: 935feee 21df0c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 6 22:34:13 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '21df0c5a2462fc298bd099079f207adef39bcb43': Merge pull request #292 in MOB/climate-android from ~DSLANE/climate-android:remove-fha-text to master Merge pull request #290 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 935feee7ddf2b2cae2756457ae63347d52b63314 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 21:04:42 2015 +0000 Merge pull request clojure#3 in ~MATT.REYNOLDS/climate-android-matt from nitrogen_fast_sql to master Squashed commit of the following: commit 1d333c75c03329b52d4cd954f868a54d4bbe457d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 13:09:14 2015 -0700 Fast SQL operations for NitrogenAdvisorCard new Nitrogen Advisor Library commit 9013c506d597e15dd57c6152f7ed6e3a7e090691 Merge: 93eb6a9 549cba5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 19:49:53 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '549cba52abe1abad5b4dd35e07fd0c3f17a1a2e6': Merge pull request #284 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 93eb6a90d5bdfea31e9f83555a27ef8753dc0ade Merge: 7746d9c 07e117e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:21:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '07e117e12c8ebbb45d0dda0f0ff487e47d9163d5': Merge pull request #282 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 7746d9c89be66bc1e85e8d3e05958d360c4be4df Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:06:53 2015 +0000 Merge pull request clojure#1 in ~MATT.REYNOLDS/climate-android-matt from na_provider_fixes to master Squashed commit of the following: commit cb286cd730c70329d3c4721d9aab6d1af886af00 Merge: c561808 a0ea318 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:54:17 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit c561808f7e2a179c86bdf581b87f5b62002d1fda Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:47:48 2015 -0700 Added reference to shinobicharts, which NitrogenAdvisor/NAChartView depends on. commit 8450ac2e7efe39e28832ec222e0849718cd5051a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:52:43 2015 -0700 Missed imports on merge commit dbdbf1ca86ce556856bbd2a9e8e501cd95108357 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:27:53 2015 -0700 build.gradle modifications for new nitrogen advisor with na_provider fixes commit 3b9d6dcfab218d38d4de88c9ec7408d62a0e9d21 Merge: 4750b5b babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 11:41:38 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit 4750b5baa3ee673ce3842125ee7b79f3afe97dfe Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Apr 30 17:45:06 2015 -0700 Fixes for provider and server names for the NitrogenAdvisor commit a0ea318ada3d597226733e094957e304822c800a Merge: 1e245a7 3e28a4f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 21:53:43 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3e28a4fe1d544f2c4e1b6baa3763855a69851ba5': Merge pull request #272 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 1e245a71e22ae75ca0ea557d47a8394745592998 Merge: f9c87a5 babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:32:06 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit f9c87a54b886c26f91e9032dabed6dffce7867b4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Apr 28 13:03:16 2015 -0700 build.gradle now points to maven repo for NitrogenAdvisor commit 79a315db0627df808af0b761dffff547d0b3f362 Merge: d2f29c0 16925e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:04:28 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit d2f29c0e38eecbe121bcf5e9dcf706a0219e3d44 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:02:21 2015 -0700 Renderer for the Nitrogen advisor card commit 762904e2ccaf24475ed667eb4735b8f8a8548d90 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:01:29 2015 -0700 Integrate NitrogenAdvisor
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…imate-android-matt:na_quick_fixes to master Squashed commit of the following: commit 046c8da0b406fe1b205090ba4117a59660a2bfa1 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 19 01:11:46 2015 -0700 New NitrogenAdvisor changed Lbs to lbs in strings.xml commit ed513c5e2fbd90e411f96798f6d8595771c356ce Merge: 64b6d30 fbb0e34 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 15 00:28:09 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fbb0e3452cfa91e08bfc141e9963c0e82d0be449': Merge pull request #307 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_cosmetic_fixes to master commit 64b6d30966db097100a42fc883d1565ba946284a Merge: 1090719 d18188c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 13 00:25:23 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'd18188c67539d28a0e51abfa080fcca24d1250d9': Merge pull request #301 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1294 to master Merge pull request #297 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 1090719dbbbe497860828ce6cf4dbca256123a0c Merge: d624716 c734f8f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 20:58:44 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c734f8fd43fabe80bafec1cd97dc7f130a466a21': Merge pull request #283 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1434 to master commit d6247168652ee0b013de5bf5fcb83653ce3e376b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 04:40:43 2015 +0000 Merge pull request clojure#4 in ~MATT.REYNOLDS/climate-android-matt from ui_fixes_and_perf to master Squashed commit of the following: commit 0a58baf7124ae517733cb73ca656bdd7604ef5c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 7 14:04:52 2015 -0700 Fixed margins in NitrogenAdvisorModuleCard Changed hardcoded view types to named constants in ModuleLauncherAdapter.java Changed switch statement to table lookup in ModuleLauncherAdapter.java Added upgrade message for basic users in NitrogenAdvisorModuleCard Changed reference to latest nitrogen advisor module in build.gradle commit e73c41ca178fc8bdd31c72e1fef0c3101d63a60d Merge: 935feee 21df0c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 6 22:34:13 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '21df0c5a2462fc298bd099079f207adef39bcb43': Merge pull request #292 in MOB/climate-android from ~DSLANE/climate-android:remove-fha-text to master Merge pull request #290 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 935feee7ddf2b2cae2756457ae63347d52b63314 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 21:04:42 2015 +0000 Merge pull request clojure#3 in ~MATT.REYNOLDS/climate-android-matt from nitrogen_fast_sql to master Squashed commit of the following: commit 1d333c75c03329b52d4cd954f868a54d4bbe457d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 13:09:14 2015 -0700 Fast SQL operations for NitrogenAdvisorCard new Nitrogen Advisor Library commit 9013c506d597e15dd57c6152f7ed6e3a7e090691 Merge: 93eb6a9 549cba5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 19:49:53 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '549cba52abe1abad5b4dd35e07fd0c3f17a1a2e6': Merge pull request #284 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 93eb6a90d5bdfea31e9f83555a27ef8753dc0ade Merge: 7746d9c 07e117e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:21:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '07e117e12c8ebbb45d0dda0f0ff487e47d9163d5': Merge pull request #282 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 7746d9c89be66bc1e85e8d3e05958d360c4be4df Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:06:53 2015 +0000 Merge pull request clojure#1 in ~MATT.REYNOLDS/climate-android-matt from na_provider_fixes to master Squashed commit of the following: commit cb286cd730c70329d3c4721d9aab6d1af886af00 Merge: c561808 a0ea318 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:54:17 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit c561808f7e2a179c86bdf581b87f5b62002d1fda Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:47:48 2015 -0700 Added reference to shinobicharts, which NitrogenAdvisor/NAChartView depends on. commit 8450ac2e7efe39e28832ec222e0849718cd5051a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:52:43 2015 -0700 Missed imports on merge commit dbdbf1ca86ce556856bbd2a9e8e501cd95108357 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:27:53 2015 -0700 build.gradle modifications for new nitrogen advisor with na_provider fixes commit 3b9d6dcfab218d38d4de88c9ec7408d62a0e9d21 Merge: 4750b5b babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 11:41:38 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit 4750b5baa3ee673ce3842125ee7b79f3afe97dfe Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Apr 30 17:45:06 2015 -0700 Fixes for provider and server names for the NitrogenAdvisor commit a0ea318ada3d597226733e094957e304822c800a Merge: 1e245a7 3e28a4f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 21:53:43 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3e28a4fe1d544f2c4e1b6baa3763855a69851ba5': Merge pull request #272 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 1e245a71e22ae75ca0ea557d47a8394745592998 Merge: f9c87a5 babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:32:06 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit f9c87a54b886c26f91e9032dabed6dffce7867b4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Apr 28 13:03:16 2015 -0700 build.gradle now points to maven repo for NitrogenAdvisor commit 79a315db0627df808af0b761dffff547d0b3f362 Merge: d2f29c0 16925e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:04:28 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit d2f29c0e38eecbe121bcf5e9dcf706a0219e3d44 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:02:21 2015 -0700 Renderer for the Nitrogen advisor card commit 762904e2ccaf24475ed667eb4735b8f8a8548d90 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:01:29 2015 -0700 Integrate NitrogenAdvisor
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…imate-android-matt:na_quick_fixes to master Squashed commit of the following: commit f53e27a024497185104e911c8cc4ea249df24115 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 14:29:38 2015 -0700 2 versions of the reflection SQL library commit 67ae5b2b0293dd447bb464706fe2c054d118c311 Merge: 4a2479c 7e8713c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:52:47 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_quick_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 4a2479c326659db945d62f8f9780931b5be8ce8d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:34:59 2015 -0700 removed commented out code. commit c495cc66eea75c8d3eae940d4e53ce8057d3e740 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:30:37 2015 -0700 Fixed WHITE-1231, WHITE-1234 commit 0a37f01e9f4c0a53ec92b6356e19bc27dcc1b0d8 Merge: a6cfcb0 28ce59d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 21 18:27:36 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_quick_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit a6cfcb0c8a66dadfce92c10c184b1cafb618de5a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 21 17:56:40 2015 -0700 new NitrogenAdvisor and new ReflectionSQL commit 28ce59dc95b13c2e4359d1b3390001eab9d5200c Merge: ed513c5 441c9e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 00:55:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '441c9e4e6c9828a700d3a706fcc6924a3a1095fe': Merge pull request #313 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1582 to master Merge pull request #310 in MOB/climate-android from ~CHRIS.PICK/climate-android:basic-1592 to master Merge pull request #312 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_quick_fixes to master commit 046c8da0b406fe1b205090ba4117a59660a2bfa1 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 19 01:11:46 2015 -0700 New NitrogenAdvisor changed Lbs to lbs in strings.xml commit ed513c5e2fbd90e411f96798f6d8595771c356ce Merge: 64b6d30 fbb0e34 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 15 00:28:09 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fbb0e3452cfa91e08bfc141e9963c0e82d0be449': Merge pull request #307 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_cosmetic_fixes to master commit 64b6d30966db097100a42fc883d1565ba946284a Merge: 1090719 d18188c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 13 00:25:23 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'd18188c67539d28a0e51abfa080fcca24d1250d9': Merge pull request #301 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1294 to master Merge pull request #297 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 1090719dbbbe497860828ce6cf4dbca256123a0c Merge: d624716 c734f8f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 20:58:44 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c734f8fd43fabe80bafec1cd97dc7f130a466a21': Merge pull request #283 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1434 to master commit d6247168652ee0b013de5bf5fcb83653ce3e376b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 04:40:43 2015 +0000 Merge pull request clojure#4 in ~MATT.REYNOLDS/climate-android-matt from ui_fixes_and_perf to master Squashed commit of the following: commit 0a58baf7124ae517733cb73ca656bdd7604ef5c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 7 14:04:52 2015 -0700 Fixed margins in NitrogenAdvisorModuleCard Changed hardcoded view types to named constants in ModuleLauncherAdapter.java Changed switch statement to table lookup in ModuleLauncherAdapter.java Added upgrade message for basic users in NitrogenAdvisorModuleCard Changed reference to latest nitrogen advisor module in build.gradle commit e73c41ca178fc8bdd31c72e1fef0c3101d63a60d Merge: 935feee 21df0c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 6 22:34:13 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '21df0c5a2462fc298bd099079f207adef39bcb43': Merge pull request #292 in MOB/climate-android from ~DSLANE/climate-android:remove-fha-text to master Merge pull request #290 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 935feee7ddf2b2cae2756457ae63347d52b63314 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 21:04:42 2015 +0000 Merge pull request clojure#3 in ~MATT.REYNOLDS/climate-android-matt from nitrogen_fast_sql to master Squashed commit of the following: commit 1d333c75c03329b52d4cd954f868a54d4bbe457d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 13:09:14 2015 -0700 Fast SQL operations for NitrogenAdvisorCard new Nitrogen Advisor Library commit 9013c506d597e15dd57c6152f7ed6e3a7e090691 Merge: 93eb6a9 549cba5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 19:49:53 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '549cba52abe1abad5b4dd35e07fd0c3f17a1a2e6': Merge pull request #284 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 93eb6a90d5bdfea31e9f83555a27ef8753dc0ade Merge: 7746d9c 07e117e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:21:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '07e117e12c8ebbb45d0dda0f0ff487e47d9163d5': Merge pull request #282 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 7746d9c89be66bc1e85e8d3e05958d360c4be4df Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:06:53 2015 +0000 Merge pull request clojure#1 in ~MATT.REYNOLDS/climate-android-matt from na_provider_fixes to master Squashed commit of the following: commit cb286cd730c70329d3c4721d9aab6d1af886af00 Merge: c561808 a0ea318 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:54:17 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit c561808f7e2a179c86bdf581b87f5b62002d1fda Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:47:48 2015 -0700 Added reference to shinobicharts, which NitrogenAdvisor/NAChartView depends on. commit 8450ac2e7efe39e28832ec222e0849718cd5051a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:52:43 2015 -0700 Missed imports on merge commit dbdbf1ca86ce556856bbd2a9e8e501cd95108357 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:27:53 2015 -0700 build.gradle modifications for new nitrogen advisor with na_provider fixes commit 3b9d6dcfab218d38d4de88c9ec7408d62a0e9d21 Merge: 4750b5b babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 11:41:38 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit 4750b5baa3ee673ce3842125ee7b79f3afe97dfe Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Apr 30 17:45:06 2015 -0700 Fixes for provider and server names for the NitrogenAdvisor commit a0ea318ada3d597226733e094957e304822c800a Merge: 1e245a7 3e28a4f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 21:53:43 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3e28a4fe1d544f2c4e1b6baa3763855a69851ba5': Merge pull request #272 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 1e245a71e22ae75ca0ea557d47a8394745592998 Merge: f9c87a5 babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:32:06 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit f9c87a54b886c26f91e9032dabed6dffce7867b4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Apr 28 13:03:16 2015 -0700 build.gradle now points to maven repo for NitrogenAdvisor commit 79a315db0627df808af0b761dffff547d0b3f362 Merge: d2f29c0 16925e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:04:28 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit d2f29c0e38eecbe121bcf5e9dcf706a0219e3d44 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:02:21 2015 -0700 Renderer for the Nitrogen advisor card commit 762904e2ccaf24475ed667eb4735b8f8a8548d90 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:01:29 2015 -0700 Integrate NitrogenAdvisor
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…imate-android-matt:na_quick_fixes to release/2.2.2 Squashed commit of the following: commit 2f3cb740754bd6166bf0333e9152a41197c327f0 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 28 12:27:40 2015 -0700 changed screen orientation to use resource commit 3395a215f83fc7c3c7152b79e287ac164ac39441 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 27 16:53:50 2015 -0700 Bug fix for WHITE-1380, WHITE-1281. commit fc4a9d3c0d19bb53a7a9fbf31429a68ef9cf3874 Merge: f53e27a a959063 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 27 16:11:40 2015 -0700 Merge branch 'release/2.2.2' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_quick_fixes commit f53e27a024497185104e911c8cc4ea249df24115 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 14:29:38 2015 -0700 2 versions of the reflection SQL library commit 67ae5b2b0293dd447bb464706fe2c054d118c311 Merge: 4a2479c 7e8713c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:52:47 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_quick_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 4a2479c326659db945d62f8f9780931b5be8ce8d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:34:59 2015 -0700 removed commented out code. commit c495cc66eea75c8d3eae940d4e53ce8057d3e740 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:30:37 2015 -0700 Fixed WHITE-1231, WHITE-1234 commit 0a37f01e9f4c0a53ec92b6356e19bc27dcc1b0d8 Merge: a6cfcb0 28ce59d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 21 18:27:36 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_quick_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit a6cfcb0c8a66dadfce92c10c184b1cafb618de5a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 21 17:56:40 2015 -0700 new NitrogenAdvisor and new ReflectionSQL commit 28ce59dc95b13c2e4359d1b3390001eab9d5200c Merge: ed513c5 441c9e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 00:55:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '441c9e4e6c9828a700d3a706fcc6924a3a1095fe': Merge pull request #313 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1582 to master Merge pull request #310 in MOB/climate-android from ~CHRIS.PICK/climate-android:basic-1592 to master Merge pull request #312 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_quick_fixes to master commit 046c8da0b406fe1b205090ba4117a59660a2bfa1 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 19 01:11:46 2015 -0700 New NitrogenAdvisor changed Lbs to lbs in strings.xml commit ed513c5e2fbd90e411f96798f6d8595771c356ce Merge: 64b6d30 fbb0e34 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 15 00:28:09 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fbb0e3452cfa91e08bfc141e9963c0e82d0be449': Merge pull request #307 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_cosmetic_fixes to master commit 64b6d30966db097100a42fc883d1565ba946284a Merge: 1090719 d18188c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 13 00:25:23 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'd18188c67539d28a0e51abfa080fcca24d1250d9': Merge pull request #301 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1294 to master Merge pull request #297 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 1090719dbbbe497860828ce6cf4dbca256123a0c Merge: d624716 c734f8f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 20:58:44 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c734f8fd43fabe80bafec1cd97dc7f130a466a21': Merge pull request #283 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1434 to master commit d6247168652ee0b013de5bf5fcb83653ce3e376b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 04:40:43 2015 +0000 Merge pull request clojure#4 in ~MATT.REYNOLDS/climate-android-matt from ui_fixes_and_perf to master Squashed commit of the following: commit 0a58baf7124ae517733cb73ca656bdd7604ef5c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 7 14:04:52 2015 -0700 Fixed margins in NitrogenAdvisorModuleCard Changed hardcoded view types to named constants in ModuleLauncherAdapter.java Changed switch statement to table lookup in ModuleLauncherAdapter.java Added upgrade message for basic users in NitrogenAdvisorModuleCard Changed reference to latest nitrogen advisor module in build.gradle commit e73c41ca178fc8bdd31c72e1fef0c3101d63a60d Merge: 935feee 21df0c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 6 22:34:13 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '21df0c5a2462fc298bd099079f207adef39bcb43': Merge pull request #292 in MOB/climate-android from ~DSLANE/climate-android:remove-fha-text to master Merge pull request #290 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 935feee7ddf2b2cae2756457ae63347d52b63314 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 21:04:42 2015 +0000 Merge pull request clojure#3 in ~MATT.REYNOLDS/climate-android-matt from nitrogen_fast_sql to master Squashed commit of the following: commit 1d333c75c03329b52d4cd954f868a54d4bbe457d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 13:09:14 2015 -0700 Fast SQL operations for NitrogenAdvisorCard new Nitrogen Advisor Library commit 9013c506d597e15dd57c6152f7ed6e3a7e090691 Merge: 93eb6a9 549cba5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 19:49:53 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '549cba52abe1abad5b4dd35e07fd0c3f17a1a2e6': Merge pull request #284 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 93eb6a90d5bdfea31e9f83555a27ef8753dc0ade Merge: 7746d9c 07e117e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:21:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '07e117e12c8ebbb45d0dda0f0ff487e47d9163d5': Merge pull request #282 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 7746d9c89be66bc1e85e8d3e05958d360c4be4df Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:06:53 2015 +0000 Merge pull request clojure#1 in ~MATT.REYNOLDS/climate-android-matt from na_provider_fixes to master Squashed commit of the following: commit cb286cd730c70329d3c4721d9aab6d1af886af00 Merge: c561808 a0ea318 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:54:17 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit c561808f7e2a179c86bdf581b87f5b62002d1fda Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:47:48 2015 -0700 Added reference to shinobicharts, which NitrogenAdvisor/NAChartView depends on. commit 8450ac2e7efe39e28832ec222e0849718cd5051a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:52:43 2015 -0700 Missed imports on merge commit dbdbf1ca86ce556856bbd2a9e8e501cd95108357 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:27:53 2015 -0700 build.gradle modifications for new nitrogen advisor with na_provider fixes commit 3b9d6dcfab218d38d4de88c9ec7408d62a0e9d21 Merge: 4750b5b babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 11:41:38 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit 4750b5baa3ee673ce3842125ee7b79f3afe97dfe Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Apr 30 17:45:06 2015 -0700 Fixes for provider and server names for the NitrogenAdvisor commit a0ea318ada3d597226733e094957e304822c800a Merge: 1e245a7 3e28a4f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 21:53:43 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3e28a4fe1d544f2c4e1b6baa3763855a69851ba5': Merge pull request #272 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 1e245a71e22ae75ca0ea557d47a8394745592998 Merge: f9c87a5 babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:32:06 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit f9c87a54b886c26f91e9032dabed6dffce7867b4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Apr 28 13:03:16 2015 -0700 build.gradle now points to maven repo for NitrogenAdvisor commit 79a315db0627df808af0b761dffff547d0b3f362 Merge: d2f29c0 16925e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:04:28 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit d2f29c0e38eecbe121bcf5e9dcf706a0219e3d44 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:02:21 2015 -0700 Renderer for the Nitrogen advisor card commit 762904e2ccaf24475ed667eb4735b8f8a8548d90 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:01:29 2015 -0700 Integrate NitrogenAdvisor
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…imate-android-matt:na_quick_fixes to release/2.2.2 Squashed commit of the following: commit b0f29d544a42fe952aeb3b6bf028bbaab006899c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 28 12:54:48 2015 -0700 New Nitrogen Advisor with Analytics commit 2f3cb740754bd6166bf0333e9152a41197c327f0 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 28 12:27:40 2015 -0700 changed screen orientation to use resource commit 3395a215f83fc7c3c7152b79e287ac164ac39441 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 27 16:53:50 2015 -0700 Bug fix for WHITE-1380, WHITE-1281. commit fc4a9d3c0d19bb53a7a9fbf31429a68ef9cf3874 Merge: f53e27a a959063 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 27 16:11:40 2015 -0700 Merge branch 'release/2.2.2' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_quick_fixes commit f53e27a024497185104e911c8cc4ea249df24115 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 14:29:38 2015 -0700 2 versions of the reflection SQL library commit 67ae5b2b0293dd447bb464706fe2c054d118c311 Merge: 4a2479c 7e8713c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:52:47 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_quick_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 4a2479c326659db945d62f8f9780931b5be8ce8d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:34:59 2015 -0700 removed commented out code. commit c495cc66eea75c8d3eae940d4e53ce8057d3e740 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:30:37 2015 -0700 Fixed WHITE-1231, WHITE-1234 commit 0a37f01e9f4c0a53ec92b6356e19bc27dcc1b0d8 Merge: a6cfcb0 28ce59d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 21 18:27:36 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_quick_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit a6cfcb0c8a66dadfce92c10c184b1cafb618de5a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 21 17:56:40 2015 -0700 new NitrogenAdvisor and new ReflectionSQL commit 28ce59dc95b13c2e4359d1b3390001eab9d5200c Merge: ed513c5 441c9e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 00:55:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '441c9e4e6c9828a700d3a706fcc6924a3a1095fe': Merge pull request #313 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1582 to master Merge pull request #310 in MOB/climate-android from ~CHRIS.PICK/climate-android:basic-1592 to master Merge pull request #312 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_quick_fixes to master commit 046c8da0b406fe1b205090ba4117a59660a2bfa1 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 19 01:11:46 2015 -0700 New NitrogenAdvisor changed Lbs to lbs in strings.xml commit ed513c5e2fbd90e411f96798f6d8595771c356ce Merge: 64b6d30 fbb0e34 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 15 00:28:09 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fbb0e3452cfa91e08bfc141e9963c0e82d0be449': Merge pull request #307 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_cosmetic_fixes to master commit 64b6d30966db097100a42fc883d1565ba946284a Merge: 1090719 d18188c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 13 00:25:23 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'd18188c67539d28a0e51abfa080fcca24d1250d9': Merge pull request #301 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1294 to master Merge pull request #297 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 1090719dbbbe497860828ce6cf4dbca256123a0c Merge: d624716 c734f8f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 20:58:44 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c734f8fd43fabe80bafec1cd97dc7f130a466a21': Merge pull request #283 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1434 to master commit d6247168652ee0b013de5bf5fcb83653ce3e376b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 04:40:43 2015 +0000 Merge pull request clojure#4 in ~MATT.REYNOLDS/climate-android-matt from ui_fixes_and_perf to master Squashed commit of the following: commit 0a58baf7124ae517733cb73ca656bdd7604ef5c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 7 14:04:52 2015 -0700 Fixed margins in NitrogenAdvisorModuleCard Changed hardcoded view types to named constants in ModuleLauncherAdapter.java Changed switch statement to table lookup in ModuleLauncherAdapter.java Added upgrade message for basic users in NitrogenAdvisorModuleCard Changed reference to latest nitrogen advisor module in build.gradle commit e73c41ca178fc8bdd31c72e1fef0c3101d63a60d Merge: 935feee 21df0c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 6 22:34:13 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '21df0c5a2462fc298bd099079f207adef39bcb43': Merge pull request #292 in MOB/climate-android from ~DSLANE/climate-android:remove-fha-text to master Merge pull request #290 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 935feee7ddf2b2cae2756457ae63347d52b63314 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 21:04:42 2015 +0000 Merge pull request clojure#3 in ~MATT.REYNOLDS/climate-android-matt from nitrogen_fast_sql to master Squashed commit of the following: commit 1d333c75c03329b52d4cd954f868a54d4bbe457d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 13:09:14 2015 -0700 Fast SQL operations for NitrogenAdvisorCard new Nitrogen Advisor Library commit 9013c506d597e15dd57c6152f7ed6e3a7e090691 Merge: 93eb6a9 549cba5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 19:49:53 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '549cba52abe1abad5b4dd35e07fd0c3f17a1a2e6': Merge pull request #284 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 93eb6a90d5bdfea31e9f83555a27ef8753dc0ade Merge: 7746d9c 07e117e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:21:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '07e117e12c8ebbb45d0dda0f0ff487e47d9163d5': Merge pull request #282 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 7746d9c89be66bc1e85e8d3e05958d360c4be4df Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:06:53 2015 +0000 Merge pull request clojure#1 in ~MATT.REYNOLDS/climate-android-matt from na_provider_fixes to master Squashed commit of the following: commit cb286cd730c70329d3c4721d9aab6d1af886af00 Merge: c561808 a0ea318 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:54:17 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit c561808f7e2a179c86bdf581b87f5b62002d1fda Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:47:48 2015 -0700 Added reference to shinobicharts, which NitrogenAdvisor/NAChartView depends on. commit 8450ac2e7efe39e28832ec222e0849718cd5051a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:52:43 2015 -0700 Missed imports on merge commit dbdbf1ca86ce556856bbd2a9e8e501cd95108357 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:27:53 2015 -0700 build.gradle modifications for new nitrogen advisor with na_provider fixes commit 3b9d6dcfab218d38d4de88c9ec7408d62a0e9d21 Merge: 4750b5b babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 11:41:38 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit 4750b5baa3ee673ce3842125ee7b79f3afe97dfe Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Apr 30 17:45:06 2015 -0700 Fixes for provider and server names for the NitrogenAdvisor commit a0ea318ada3d597226733e094957e304822c800a Merge: 1e245a7 3e28a4f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 21:53:43 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3e28a4fe1d544f2c4e1b6baa3763855a69851ba5': Merge pull request #272 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 1e245a71e22ae75ca0ea557d47a8394745592998 Merge: f9c87a5 babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:32:06 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit f9c87a54b886c26f91e9032dabed6dffce7867b4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Apr 28 13:03:16 2015 -0700 build.gradle now points to maven repo for NitrogenAdvisor commit 79a315db0627df808af0b761dffff547d0b3f362 Merge: d2f29c0 16925e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:04:28 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit d2f29c0e38eecbe121bcf5e9dcf706a0219e3d44 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:02:21 2015 -0700 Renderer for the Nitrogen advisor card commit 762904e2ccaf24475ed667eb4735b8f8a8548d90 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:01:29 2015 -0700 Integrate NitrogenAdvisor
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…imate-android-matt:na_quick_fixes to release/2.2.2 Squashed commit of the following: commit f24c32e4cd21be14dda1ab1ca8832d022ea7e6e3 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 28 13:24:22 2015 -0700 restored the screen orientation integer commit b0f29d544a42fe952aeb3b6bf028bbaab006899c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 28 12:54:48 2015 -0700 New Nitrogen Advisor with Analytics commit 2f3cb740754bd6166bf0333e9152a41197c327f0 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 28 12:27:40 2015 -0700 changed screen orientation to use resource commit 3395a215f83fc7c3c7152b79e287ac164ac39441 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 27 16:53:50 2015 -0700 Bug fix for WHITE-1380, WHITE-1281. commit fc4a9d3c0d19bb53a7a9fbf31429a68ef9cf3874 Merge: f53e27a a959063 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 27 16:11:40 2015 -0700 Merge branch 'release/2.2.2' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_quick_fixes commit f53e27a024497185104e911c8cc4ea249df24115 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 14:29:38 2015 -0700 2 versions of the reflection SQL library commit 67ae5b2b0293dd447bb464706fe2c054d118c311 Merge: 4a2479c 7e8713c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:52:47 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_quick_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 4a2479c326659db945d62f8f9780931b5be8ce8d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:34:59 2015 -0700 removed commented out code. commit c495cc66eea75c8d3eae940d4e53ce8057d3e740 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:30:37 2015 -0700 Fixed WHITE-1231, WHITE-1234 commit 0a37f01e9f4c0a53ec92b6356e19bc27dcc1b0d8 Merge: a6cfcb0 28ce59d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 21 18:27:36 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_quick_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit a6cfcb0c8a66dadfce92c10c184b1cafb618de5a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 21 17:56:40 2015 -0700 new NitrogenAdvisor and new ReflectionSQL commit 28ce59dc95b13c2e4359d1b3390001eab9d5200c Merge: ed513c5 441c9e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 00:55:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '441c9e4e6c9828a700d3a706fcc6924a3a1095fe': Merge pull request #313 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1582 to master Merge pull request #310 in MOB/climate-android from ~CHRIS.PICK/climate-android:basic-1592 to master Merge pull request #312 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_quick_fixes to master commit 046c8da0b406fe1b205090ba4117a59660a2bfa1 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 19 01:11:46 2015 -0700 New NitrogenAdvisor changed Lbs to lbs in strings.xml commit ed513c5e2fbd90e411f96798f6d8595771c356ce Merge: 64b6d30 fbb0e34 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 15 00:28:09 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fbb0e3452cfa91e08bfc141e9963c0e82d0be449': Merge pull request #307 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_cosmetic_fixes to master commit 64b6d30966db097100a42fc883d1565ba946284a Merge: 1090719 d18188c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 13 00:25:23 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'd18188c67539d28a0e51abfa080fcca24d1250d9': Merge pull request #301 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1294 to master Merge pull request #297 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 1090719dbbbe497860828ce6cf4dbca256123a0c Merge: d624716 c734f8f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 20:58:44 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c734f8fd43fabe80bafec1cd97dc7f130a466a21': Merge pull request #283 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1434 to master commit d6247168652ee0b013de5bf5fcb83653ce3e376b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 04:40:43 2015 +0000 Merge pull request clojure#4 in ~MATT.REYNOLDS/climate-android-matt from ui_fixes_and_perf to master Squashed commit of the following: commit 0a58baf7124ae517733cb73ca656bdd7604ef5c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 7 14:04:52 2015 -0700 Fixed margins in NitrogenAdvisorModuleCard Changed hardcoded view types to named constants in ModuleLauncherAdapter.java Changed switch statement to table lookup in ModuleLauncherAdapter.java Added upgrade message for basic users in NitrogenAdvisorModuleCard Changed reference to latest nitrogen advisor module in build.gradle commit e73c41ca178fc8bdd31c72e1fef0c3101d63a60d Merge: 935feee 21df0c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 6 22:34:13 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '21df0c5a2462fc298bd099079f207adef39bcb43': Merge pull request #292 in MOB/climate-android from ~DSLANE/climate-android:remove-fha-text to master Merge pull request #290 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 935feee7ddf2b2cae2756457ae63347d52b63314 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 21:04:42 2015 +0000 Merge pull request clojure#3 in ~MATT.REYNOLDS/climate-android-matt from nitrogen_fast_sql to master Squashed commit of the following: commit 1d333c75c03329b52d4cd954f868a54d4bbe457d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 13:09:14 2015 -0700 Fast SQL operations for NitrogenAdvisorCard new Nitrogen Advisor Library commit 9013c506d597e15dd57c6152f7ed6e3a7e090691 Merge: 93eb6a9 549cba5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 19:49:53 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '549cba52abe1abad5b4dd35e07fd0c3f17a1a2e6': Merge pull request #284 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 93eb6a90d5bdfea31e9f83555a27ef8753dc0ade Merge: 7746d9c 07e117e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:21:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '07e117e12c8ebbb45d0dda0f0ff487e47d9163d5': Merge pull request #282 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 7746d9c89be66bc1e85e8d3e05958d360c4be4df Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:06:53 2015 +0000 Merge pull request clojure#1 in ~MATT.REYNOLDS/climate-android-matt from na_provider_fixes to master Squashed commit of the following: commit cb286cd730c70329d3c4721d9aab6d1af886af00 Merge: c561808 a0ea318 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:54:17 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit c561808f7e2a179c86bdf581b87f5b62002d1fda Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:47:48 2015 -0700 Added reference to shinobicharts, which NitrogenAdvisor/NAChartView depends on. commit 8450ac2e7efe39e28832ec222e0849718cd5051a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:52:43 2015 -0700 Missed imports on merge commit dbdbf1ca86ce556856bbd2a9e8e501cd95108357 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:27:53 2015 -0700 build.gradle modifications for new nitrogen advisor with na_provider fixes commit 3b9d6dcfab218d38d4de88c9ec7408d62a0e9d21 Merge: 4750b5b babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 11:41:38 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit 4750b5baa3ee673ce3842125ee7b79f3afe97dfe Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Apr 30 17:45:06 2015 -0700 Fixes for provider and server names for the NitrogenAdvisor commit a0ea318ada3d597226733e094957e304822c800a Merge: 1e245a7 3e28a4f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 21:53:43 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3e28a4fe1d544f2c4e1b6baa3763855a69851ba5': Merge pull request #272 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 1e245a71e22ae75ca0ea557d47a8394745592998 Merge: f9c87a5 babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:32:06 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit f9c87a54b886c26f91e9032dabed6dffce7867b4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Apr 28 13:03:16 2015 -0700 build.gradle now points to maven repo for NitrogenAdvisor commit 79a315db0627df808af0b761dffff547d0b3f362 Merge: d2f29c0 16925e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:04:28 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit d2f29c0e38eecbe121bcf5e9dcf706a0219e3d44 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:02:21 2015 -0700 Renderer for the Nitrogen advisor card commit 762904e2ccaf24475ed667eb4735b8f8a8548d90 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:01:29 2015 -0700 Integrate NitrogenAdvisor
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…imate-android-matt:na_quick_fixes to release/2.2.2 Squashed commit of the following: commit 673345b3f60d8b16c4a0117215363083d98146ae Merge: c406378 78d904b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jun 2 10:57:50 2015 -0700 Merge branch 'release/2.2.2' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_quick_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit c406378bdf90b8993e1d3b520707466d53ba0e46 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Jun 1 19:02:22 2015 -0700 New NitrogenAdvisor library commit f24c32e4cd21be14dda1ab1ca8832d022ea7e6e3 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 28 13:24:22 2015 -0700 restored the screen orientation integer commit b0f29d544a42fe952aeb3b6bf028bbaab006899c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 28 12:54:48 2015 -0700 New Nitrogen Advisor with Analytics commit 2f3cb740754bd6166bf0333e9152a41197c327f0 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 28 12:27:40 2015 -0700 changed screen orientation to use resource commit 3395a215f83fc7c3c7152b79e287ac164ac39441 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 27 16:53:50 2015 -0700 Bug fix for WHITE-1380, WHITE-1281. commit fc4a9d3c0d19bb53a7a9fbf31429a68ef9cf3874 Merge: f53e27a a959063 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 27 16:11:40 2015 -0700 Merge branch 'release/2.2.2' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_quick_fixes commit f53e27a024497185104e911c8cc4ea249df24115 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 14:29:38 2015 -0700 2 versions of the reflection SQL library commit 67ae5b2b0293dd447bb464706fe2c054d118c311 Merge: 4a2479c 7e8713c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:52:47 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_quick_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 4a2479c326659db945d62f8f9780931b5be8ce8d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:34:59 2015 -0700 removed commented out code. commit c495cc66eea75c8d3eae940d4e53ce8057d3e740 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:30:37 2015 -0700 Fixed WHITE-1231, WHITE-1234 commit 0a37f01e9f4c0a53ec92b6356e19bc27dcc1b0d8 Merge: a6cfcb0 28ce59d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 21 18:27:36 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_quick_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit a6cfcb0c8a66dadfce92c10c184b1cafb618de5a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 21 17:56:40 2015 -0700 new NitrogenAdvisor and new ReflectionSQL commit 28ce59dc95b13c2e4359d1b3390001eab9d5200c Merge: ed513c5 441c9e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 00:55:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '441c9e4e6c9828a700d3a706fcc6924a3a1095fe': Merge pull request #313 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1582 to master Merge pull request #310 in MOB/climate-android from ~CHRIS.PICK/climate-android:basic-1592 to master Merge pull request #312 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_quick_fixes to master commit 046c8da0b406fe1b205090ba4117a59660a2bfa1 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 19 01:11:46 2015 -0700 New NitrogenAdvisor changed Lbs to lbs in strings.xml commit ed513c5e2fbd90e411f96798f6d8595771c356ce Merge: 64b6d30 fbb0e34 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 15 00:28:09 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fbb0e3452cfa91e08bfc141e9963c0e82d0be449': Merge pull request #307 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_cosmetic_fixes to master commit 64b6d30966db097100a42fc883d1565ba946284a Merge: 1090719 d18188c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 13 00:25:23 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'd18188c67539d28a0e51abfa080fcca24d1250d9': Merge pull request #301 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1294 to master Merge pull request #297 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 1090719dbbbe497860828ce6cf4dbca256123a0c Merge: d624716 c734f8f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 20:58:44 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c734f8fd43fabe80bafec1cd97dc7f130a466a21': Merge pull request #283 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1434 to master commit d6247168652ee0b013de5bf5fcb83653ce3e376b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 04:40:43 2015 +0000 Merge pull request clojure#4 in ~MATT.REYNOLDS/climate-android-matt from ui_fixes_and_perf to master Squashed commit of the following: commit 0a58baf7124ae517733cb73ca656bdd7604ef5c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 7 14:04:52 2015 -0700 Fixed margins in NitrogenAdvisorModuleCard Changed hardcoded view types to named constants in ModuleLauncherAdapter.java Changed switch statement to table lookup in ModuleLauncherAdapter.java Added upgrade message for basic users in NitrogenAdvisorModuleCard Changed reference to latest nitrogen advisor module in build.gradle commit e73c41ca178fc8bdd31c72e1fef0c3101d63a60d Merge: 935feee 21df0c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 6 22:34:13 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '21df0c5a2462fc298bd099079f207adef39bcb43': Merge pull request #292 in MOB/climate-android from ~DSLANE/climate-android:remove-fha-text to master Merge pull request #290 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 935feee7ddf2b2cae2756457ae63347d52b63314 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 21:04:42 2015 +0000 Merge pull request clojure#3 in ~MATT.REYNOLDS/climate-android-matt from nitrogen_fast_sql to master Squashed commit of the following: commit 1d333c75c03329b52d4cd954f868a54d4bbe457d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 13:09:14 2015 -0700 Fast SQL operations for NitrogenAdvisorCard new Nitrogen Advisor Library commit 9013c506d597e15dd57c6152f7ed6e3a7e090691 Merge: 93eb6a9 549cba5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 19:49:53 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '549cba52abe1abad5b4dd35e07fd0c3f17a1a2e6': Merge pull request #284 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 93eb6a90d5bdfea31e9f83555a27ef8753dc0ade Merge: 7746d9c 07e117e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:21:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '07e117e12c8ebbb45d0dda0f0ff487e47d9163d5': Merge pull request #282 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 7746d9c89be66bc1e85e8d3e05958d360c4be4df Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:06:53 2015 +0000 Merge pull request clojure#1 in ~MATT.REYNOLDS/climate-android-matt from na_provider_fixes to master Squashed commit of the following: commit cb286cd730c70329d3c4721d9aab6d1af886af00 Merge: c561808 a0ea318 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:54:17 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit c561808f7e2a179c86bdf581b87f5b62002d1fda Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:47:48 2015 -0700 Added reference to shinobicharts, which NitrogenAdvisor/NAChartView depends on. commit 8450ac2e7efe39e28832ec222e0849718cd5051a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:52:43 2015 -0700 Missed imports on merge commit dbdbf1ca86ce556856bbd2a9e8e501cd95108357 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:27:53 2015 -0700 build.gradle modifications for new nitrogen advisor with na_provider fixes commit 3b9d6dcfab218d38d4de88c9ec7408d62a0e9d21 Merge: 4750b5b babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 11:41:38 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit 4750b5baa3ee673ce3842125ee7b79f3afe97dfe Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Apr 30 17:45:06 2015 -0700 Fixes for provider and server names for the NitrogenAdvisor commit a0ea318ada3d597226733e094957e304822c800a Merge: 1e245a7 3e28a4f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 21:53:43 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3e28a4fe1d544f2c4e1b6baa3763855a69851ba5': Merge pull request #272 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 1e245a71e22ae75ca0ea557d47a8394745592998 Merge: f9c87a5 babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:32:06 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit f9c87a54b886c26f91e9032dabed6dffce7867b4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Apr 28 13:03:16 2015 -0700 build.gradle now points to maven repo for NitrogenAdvisor commit 79a315db0627df808af0b761dffff547d0b3f362 Merge: d2f29c0 16925e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:04:28 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit d2f29c0e38eecbe121bcf5e9dcf706a0219e3d44 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:02:21 2015 -0700 Renderer for the Nitrogen advisor card commit 762904e2ccaf24475ed667eb4735b8f8a8548d90 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:01:29 2015 -0700 Integrate NitrogenAdvisor
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…imate-android-matt:master to master Squashed commit of the following: commit 024c2b08f969a269a3b4be4d3978b6ef576b4b4f Merge: 0a0f0ca c1c28aa Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 16:26:12 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 0a0f0caef3cad2286ace656abe36c5754f0d7916 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 16:23:18 2015 -0700 delete this file commit 024d435055fd5141e6053894afcdc3f79d3599b0 Merge: 9e904ef 4b20755 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 16:19:39 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android commit c1c28aa6d0889d853f7b0c82a85861ce982c8704 Merge: 7c2d9e4 cd37e07 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 23:04:09 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'cd37e07a0361e65b8044f9cedfc9210282f8f57c': Merge pull request #378 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1164 to master Merge pull request #387 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1862 to master Merge pull request #386 in MOB/climate-android from ~CHRIS.PICK/climate-android:update_auth_version to master commit 7c2d9e446f4809db44a6592686c334ddd7b395d2 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 22:54:25 2015 +0000 Merge pull request clojure#6 in ~MATT.REYNOLDS/climate-android-matt from new_nitro_notifications to master Squashed commit of the following: commit 44c29ae287566c1a7d9e9dd350c9efa013c867e3 Merge: 5f85963 9e904ef Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 15:27:01 2015 -0700 Merge branch 'master' into new_nitro_notifications Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/ClimateApplication.java commit 5f85963ee1ff2aa106f5bfbe95e554151426f6f7 Merge: e4bbe0b befa26f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 15:06:38 2015 -0700 Merge branch 'master' into new_nitro_notifications Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/MainActivity.java ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/SettingsFragment.java ClimateGrowersProject/ClimateGrowersApp/src/main/res/layout/frag_settings.xml ClimateGrowersProject/ClimateGrowersApp/src/main/res/values/environment.xml commit e4bbe0b4946a1d23ef9c7dafb8847bdc189bb621 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 10:15:29 2015 -0700 Fixes for PR commit 5ebbfda0f9b3147f2c66c23fd851eb070d96cefb Merge: 5c9a98e e61007e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 2 12:32:42 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into new_nitro_notifications Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/ClimateApplication.java commit 5c9a98ed55fc5350e173fb3966318b8d73776157 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 2 12:20:18 2015 -0700 New NitrogenAdvisor and Notification libraries commit 9e904ef864053fb4c08bca8e31895054b1388cea Merge: befa26f 16cfa27 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 22:14:05 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '16cfa275427da07e9b33bc18095214d4b1b2f866': Merge pull request #385 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master Merge pull request #383 in MOB/climate-android from ~MANAV.SINGHAL/climate-android:scouting-lib-update to master Merge pull request #384 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master Merge pull request #382 in MOB/climate-android from ~CHRIS.PICK/climate-android:FDI-1584 to master commit befa26f6f09f0b2463cecd714049a68e2f8d4fb2 Merge: 2da4625 fdfab67 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 17:07:31 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fdfab67ceebb3cd98d73f7376e20edba7755ab46': Merge pull request #369 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1139 to master commit 2da4625f55ab9cc2ce4d26d36e625da51e718f4f Merge: 7f938a7 e018412 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 00:53:04 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'e018412d606a28deff1878cc0e90969398bec063': Merge pull request #381 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1832 to master Merge pull request #380 in MOB/climate-android from ~WILL.BENDICK/climate-android:registertask to master commit 7f938a70dc4507829dd04400cc1d6e45e3360470 Merge: 4473102 e61007e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 2 12:24:16 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 44731025726208e75031f9f498571a5403e26dc6 Merge: 8c7ac2d fe0edb6 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jun 30 19:48:12 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fe0edb631ee88cc321d9f64338cb0ae778732e53': Merge pull request #377 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1764 to master Merge pull request #367 in MOB/climate-android from release/2.3 to master commit 8c7ac2df872023723643d9cef2599c2a1a5a50cf Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jun 17 17:43:51 2015 -0700 ooops commit 518477e1b8058be1547cafb4d8cdab00084fe065 Merge: b23cdd3 f83f82f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jun 17 17:38:30 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/ClimateApplication.java commit b23cdd31f0ac5519b5b244177f6892f247a6d996 Merge: 35a9ebc e4a5577 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jun 2 17:45:26 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'e4a5577e8047d519a9803a13c1bf3dae53988c6e': Merge pull request #335 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:docs-update to master commit 35a9ebc0c8213c4152d18171f7621d9d4d8a8953 Merge: a4bd112 f8afe42 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 29 21:50:28 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'f8afe42a4f621c3072205eab05d470c17ea88d74': Merge pull request #333 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1288 to master commit a4bd1126e5082acb2bf70f5313db7bf2da9a6108 Merge: 181cf61 36ed77b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 26 16:32:49 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/ClimateApplication.java ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/login/LoginActivity.java commit 181cf61c6557be3a479a8d2884e5c482395f53b5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 26 16:27:12 2015 -0700 gradle 1.2.0 commit fbcbca2bbc3c1afd088ba5057aad6aebd823534f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 26 16:26:33 2015 -0700 Integration for new notification library commit 36ed77b2976150bf4b45088f539a4f9f21de6430 Merge: 0f7e52e 1e1fb78 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 26 23:24:10 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '1e1fb78e9a694fb9e4c9d2a4238857b887cc8c94': Merge pull request #322 in MOB/climate-android from ~RJOSHI/climate-android:merge-hotfix2.2.1 to master Merge pull request #320 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_quick_fixes to master commit 0f7e52eee79f169f89b9ae4a8285739b56faf62b Merge: bb691f5 d8e8815 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:49:32 2015 -0700 Merge https://stash.ci.climatedna.net/scm/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit bb691f54c6ed9d17d647b50860dddff8bbe168d1 Merge: ed513c5 7e8713c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:39:28 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android commit d8e8815623d9611ccd1633183e1d8f87446826b0 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 16:09:56 2015 +0000 Merge pull request clojure#5 in ~MATT.REYNOLDS/climate-android-matt from na_quick_fixes to master Squashed commit of the following: commit 0a37f01e9f4c0a53ec92b6356e19bc27dcc1b0d8 Merge: a6cfcb0 28ce59d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 21 18:27:36 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_quick_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit a6cfcb0c8a66dadfce92c10c184b1cafb618de5a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 21 17:56:40 2015 -0700 new NitrogenAdvisor and new ReflectionSQL commit 046c8da0b406fe1b205090ba4117a59660a2bfa1 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 19 01:11:46 2015 -0700 New NitrogenAdvisor changed Lbs to lbs in strings.xml commit 28ce59dc95b13c2e4359d1b3390001eab9d5200c Merge: ed513c5 441c9e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 00:55:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '441c9e4e6c9828a700d3a706fcc6924a3a1095fe': Merge pull request #313 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1582 to master Merge pull request #310 in MOB/climate-android from ~CHRIS.PICK/climate-android:basic-1592 to master Merge pull request #312 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_quick_fixes to master commit ed513c5e2fbd90e411f96798f6d8595771c356ce Merge: 64b6d30 fbb0e34 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 15 00:28:09 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fbb0e3452cfa91e08bfc141e9963c0e82d0be449': Merge pull request #307 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_cosmetic_fixes to master commit 64b6d30966db097100a42fc883d1565ba946284a Merge: 1090719 d18188c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 13 00:25:23 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'd18188c67539d28a0e51abfa080fcca24d1250d9': Merge pull request #301 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1294 to master Merge pull request #297 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 1090719dbbbe497860828ce6cf4dbca256123a0c Merge: d624716 c734f8f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 20:58:44 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c734f8fd43fabe80bafec1cd97dc7f130a466a21': Merge pull request #283 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1434 to master commit d6247168652ee0b013de5bf5fcb83653ce3e376b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 04:40:43 2015 +0000 Merge pull request clojure#4 in ~MATT.REYNOLDS/climate-android-matt from ui_fixes_and_perf to master Squashed commit of the following: commit 0a58baf7124ae517733cb73ca656bdd7604ef5c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 7 14:04:52 2015 -0700 Fixed margins in NitrogenAdvisorModuleCard Changed hardcoded view types to named constants in ModuleLauncherAdapter.java Changed switch statement to table lookup in ModuleLauncherAdapter.java Added upgrade message for basic users in NitrogenAdvisorModuleCard Changed reference to latest nitrogen advisor module in build.gradle commit e73c41ca178fc8bdd31c72e1fef0c3101d63a60d Merge: 935feee 21df0c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 6 22:34:13 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '21df0c5a2462fc298bd099079f207adef39bcb43': Merge pull request #292 in MOB/climate-android from ~DSLANE/climate-android:remove-fha-text to master Merge pull request #290 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 935feee7ddf2b2cae2756457ae63347d52b63314 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 21:04:42 2015 +0000 Merge pull request clojure#3 in ~MATT.REYNOLDS/climate-android-matt from nitrogen_fast_sql to master Squashed commit of the following: commit 1d333c75c03329b52d4cd954f868a54d4bbe457d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 13:09:14 2015 -0700 Fast SQL operations for NitrogenAdvisorCard new Nitrogen Advisor Library commit 9013c506d597e15dd57c6152f7ed6e3a7e090691 Merge: 93eb6a9 549cba5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 19:49:53 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '549cba52abe1abad5b4dd35e07fd0c3f17a1a2e6': Merge pull request #284 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 93eb6a90d5bdfea31e9f83555a27ef8753dc0ade Merge: 7746d9c 07e117e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:21:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '07e117e12c8ebbb45d0dda0f0ff487e47d9163d5': Merge pull request #282 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 7746d9c89be66bc1e85e8d3e05958d360c4be4df Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:06:53 2015 +0000 Merge pull request clojure#1 in ~MATT.REYNOLDS/climate-android-matt from na_provider_fixes to master Squashed commit of the following: commit cb286cd730c70329d3c4721d9aab6d1af886af00 Merge: c561808 a0ea318 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:54:17 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit c561808f7e2a179c86bdf581b87f5b62002d1fda Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:47:48 2015 -0700 Added reference to shinobicharts, which NitrogenAdvisor/NAChartView depends on. commit 8450ac2e7efe39e28832ec222e0849718cd5051a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:52:43 2015 -0700 Missed imports on merge commit dbdbf1ca86ce556856bbd2a9e8e501cd95108357 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:27:53 2015 -0700 build.gradle modifications for new nitrogen advisor with na_provider fixes commit 3b9d6dcfab218d38d4de88c9ec7408d62a0e9d21 Merge: 4750b5b babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 11:41:38 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit 4750b5baa3ee673ce3842125ee7b79f3afe97dfe Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Apr 30 17:45:06 2015 -0700 Fixes for provider and server names for the NitrogenAdvisor commit a0ea318ada3d597226733e094957e304822c800a Merge: 1e245a7 3e28a4f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 21:53:43 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3e28a4fe1d544f2c4e1b6baa3763855a69851ba5': Merge pull request #272 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 1e245a71e22ae75ca0ea557d47a8394745592998 Merge: f9c87a5 babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:32:06 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit f9c87a54b886c26f91e9032dabed6dffce7867b4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Apr 28 13:03:16 2015 -0700 build.gradle now points to maven repo for NitrogenAdvisor commit 79a315db0627df808af0b761dffff547d0b3f362 Merge: d2f29c0 16925e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:04:28 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit d2f29c0e38eecbe121bcf5e9dcf706a0219e3d44 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:02:21 2015 -0700 Renderer for the Nitrogen advisor card commit 762904e2ccaf24475ed667eb4735b8f8a8548d90 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:01:29 2015 -0700 Integrate NitrogenAdvisor
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…master Squashed commit of the following: commit a1227d7ccf252a6d0401d1f759934f55738f4789 Merge: c65fd5d 43105cb Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 27 11:46:57 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into release/2.3.1 Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit c65fd5d17f1627b3741c96e42b4c8ea578dd0586 Author: Christopher Pick <chris.pick@climate.com> Date: Thu Jul 23 23:15:11 2015 +0000 Merge pull request #412 in MOB/climate-android from ~CHRIS.PICK/climate-android:versions to release/2.3.1 Squashed commit of the following: commit a3aff66dd0eef8c35d1e676b8543f086aa60c19e Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 23 16:13:18 2015 -0700 update versions commit 19b7203e5b781029c0c8768ec9ce833eb1156389 Merge: 625ac0e aa7b021 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 23 09:53:42 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 625ac0e13f9a031488f4bdffca3dc1246d6b87a7 Merge: 16447db a74533d Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 22 14:20:41 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 16447db9daa7430e31abc2c272d50a12616e7737 Merge: 057346e a6f9b14 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:13:08 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 057346e72a1bd764e9c14db8a27f7cff90f79431 Merge: ce8da53 12b771b Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:51:34 2015 -0700 oMerge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ce8da53b514a297480ddce6b068f26370a1fc00c Merge: 6f27293 bf515e8 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:25:14 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6f272935b1242f0e59dc880c5d5d9ae74183bc70 Merge: 44a8d1d 65ecae6 Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 09:36:13 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit aa7b0219114f490d7cf89a79dbf49e2b5e30e0f5 Author: Christopher Pick <chris.pick@climate.com> Date: Wed Jul 22 21:29:13 2015 +0000 Merge pull request #411 in MOB/climate-android from ~CHRIS.PICK/climate-android:WHITE-1745 to release/2.3.1 Squashed commit of the following: commit a969404f44765699a8602cb542539aea9f9219b8 Merge: c60a04f 625ac0e Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 22 14:25:35 2015 -0700 merge commit 625ac0e13f9a031488f4bdffca3dc1246d6b87a7 Merge: 16447db a74533d Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 22 14:20:41 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c60a04f77cbf8dc43a1dfdababbfb153acdcc64b Merge: 040836f 16447db Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:14:23 2015 -0700 merge commit 16447db9daa7430e31abc2c272d50a12616e7737 Merge: 057346e a6f9b14 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:13:08 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 040836f85fb65565d2795eb1bb7a72ecb9f97253 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:12:51 2015 -0700 more versions commit be762e052f25079c04b077b1d51e451e64342988 Merge: 7726e02 057346e Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:52:20 2015 -0700 Merge branch '2.3.1' into WHITE-1745 Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 057346e72a1bd764e9c14db8a27f7cff90f79431 Merge: ce8da53 12b771b Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:51:34 2015 -0700 oMerge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 7726e02d4cde040439c3f053f087126c08bc41fb Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:47:05 2015 -0700 fix build versions commit c8d34b11454604620f3d28898aa069a4b6646e66 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:28:35 2015 -0700 WHITE-1745 update dependencies commit ce8da53b514a297480ddce6b068f26370a1fc00c Merge: 6f27293 bf515e8 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:25:14 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6f272935b1242f0e59dc880c5d5d9ae74183bc70 Merge: 44a8d1d 65ecae6 Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 09:36:13 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit a74533d298a379b3aee56c301a3b1d55a606960c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jul 22 06:03:28 2015 +0000 Merge pull request #410 in MOB/climate-android from notification_field_summary to release/2.3.1 Squashed commit of the following: commit bdd0f0e2f6c89eebc3a1957d37087b8cfc1e5a5b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 21 21:44:29 2015 -0700 updated notificationlib version commit cbb2ba3296766fcc217db08696a6ac443d4c3b47 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 21 21:34:24 2015 -0700 fixed settings.gradle commit 2f216e439a292775a69af5cf96fa9e5a04eb3fa1 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 21 21:29:00 2015 -0700 NotificationService needs to query the field summary commit 8f47ad096935aa0e4d66003b488dad1ba3b244a8 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 21 14:01:58 2015 -0700 removed unused project refs commit 4c3dfc6dc4eeac566179ccb87d03df1ae2724142 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jul 22 04:36:03 2015 +0000 Merge pull request #409 in MOB/climate-android from notification_field_summary to release/2.3.1 Squashed commit of the following: commit cbb2ba3296766fcc217db08696a6ac443d4c3b47 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 21 21:34:24 2015 -0700 fixed settings.gradle commit 2f216e439a292775a69af5cf96fa9e5a04eb3fa1 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 21 21:29:00 2015 -0700 NotificationService needs to query the field summary commit 8f47ad096935aa0e4d66003b488dad1ba3b244a8 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 21 14:01:58 2015 -0700 removed unused project refs commit 4d723196c2f7fb607e2cb44a7331eb1ebbabdfac Author: Christopher Pick <chris.pick@climate.com> Date: Tue Jul 21 02:21:21 2015 +0000 Merge pull request #408 in MOB/climate-android from ~CHRIS.PICK/climate-android:WHITE-1745 to release/2.3.1 Squashed commit of the following: commit c60a04f77cbf8dc43a1dfdababbfb153acdcc64b Merge: 040836f 16447db Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:14:23 2015 -0700 merge commit 16447db9daa7430e31abc2c272d50a12616e7737 Merge: 057346e a6f9b14 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:13:08 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 040836f85fb65565d2795eb1bb7a72ecb9f97253 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:12:51 2015 -0700 more versions commit be762e052f25079c04b077b1d51e451e64342988 Merge: 7726e02 057346e Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:52:20 2015 -0700 Merge branch '2.3.1' into WHITE-1745 Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 057346e72a1bd764e9c14db8a27f7cff90f79431 Merge: ce8da53 12b771b Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:51:34 2015 -0700 oMerge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 7726e02d4cde040439c3f053f087126c08bc41fb Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:47:05 2015 -0700 fix build versions commit c8d34b11454604620f3d28898aa069a4b6646e66 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:28:35 2015 -0700 WHITE-1745 update dependencies commit ce8da53b514a297480ddce6b068f26370a1fc00c Merge: 6f27293 bf515e8 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:25:14 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6f272935b1242f0e59dc880c5d5d9ae74183bc70 Merge: 44a8d1d 65ecae6 Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 09:36:13 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit a6f9b14c54a00edf096ce49ba9b5bf92af885433 Author: Christopher Pick <chris.pick@climate.com> Date: Tue Jul 21 00:55:12 2015 +0000 Merge pull request #407 in MOB/climate-android from ~CHRIS.PICK/climate-android:WHITE-1745 to release/2.3.1 Squashed commit of the following: commit be762e052f25079c04b077b1d51e451e64342988 Merge: 7726e02 057346e Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:52:20 2015 -0700 Merge branch '2.3.1' into WHITE-1745 Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 057346e72a1bd764e9c14db8a27f7cff90f79431 Merge: ce8da53 12b771b Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:51:34 2015 -0700 oMerge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 7726e02d4cde040439c3f053f087126c08bc41fb Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:47:05 2015 -0700 fix build versions commit c8d34b11454604620f3d28898aa069a4b6646e66 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:28:35 2015 -0700 WHITE-1745 update dependencies commit ce8da53b514a297480ddce6b068f26370a1fc00c Merge: 6f27293 bf515e8 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:25:14 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6f272935b1242f0e59dc880c5d5d9ae74183bc70 Merge: 44a8d1d 65ecae6 Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 09:36:13 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit 12b771beef1ea8c9b4188006a57d4dbccd7a2330 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Jul 20 23:32:49 2015 +0000 Merge pull request #406 in MOB/climate-android from ~CHRIS.PICK/climate-android:WHITE-1745 to release/2.3.1 Squashed commit of the following: commit c8d34b11454604620f3d28898aa069a4b6646e66 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:28:35 2015 -0700 WHITE-1745 update dependencies commit ce8da53b514a297480ddce6b068f26370a1fc00c Merge: 6f27293 bf515e8 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:25:14 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6f272935b1242f0e59dc880c5d5d9ae74183bc70 Merge: 44a8d1d 65ecae6 Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 09:36:13 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit bf515e8623488f27b07098cb95a0e0081a096695 Author: Christopher Pick <chris.pick@climate.com> Date: Fri Jul 17 18:15:46 2015 +0000 Merge pull request #405 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1903 to release/2.3.1 Squashed commit of the following: commit c72c3056ba4ce42814d77fa1e2e9b0d61239719d Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 11:07:00 2015 -0700 Disable login/register buttons, remove add fields from menu, clean up imports commit 6f272935b1242f0e59dc880c5d5d9ae74183bc70 Merge: 44a8d1d 65ecae6 Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 09:36:13 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit 65ecae6121a2519d286685c6de1e6d9d85b8af52 Author: Christopher Pick <chris.pick@climate.com> Date: Wed Jul 15 20:03:15 2015 +0000 Merge pull request #404 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1893 to release/2.3.1 Squashed commit of the following: commit 401a8bc4b921bed06053d71f3a739b8b5ce903ac Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 12:55:46 2015 -0700 CR Comment commit 2a050c3debf4d9353bd852b247a4e8cbb3a977cb Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 11:43:18 2015 -0700 cleanup const commit bde5c5a6e2f0aa35877cb466cab949b601c25a63 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 11:42:18 2015 -0700 update nav drawer, doc plus null check. commit 48180cc7dc225006f01474bf5165a4864c0723e9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 11:40:07 2015 -0700 cleanup imports / change to spaces from tabs commit 895ed1b744e17215ff2ed892c69426e1bf1edd38 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 11:38:19 2015 -0700 fix closing nav commit 3b845aacb58151cbc2892101d292bafa627ec81d Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 11:28:55 2015 -0700 update code commit 955b30ef79e03fa1f8d9ac4451042e214dc97c88 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 11:26:18 2015 -0700 BASIC-1893 moved add fields from overflow to nav menu commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit 8eabab945e7051be2615a8e4a90d93cdf00028b6 Author: Christopher Pick <chris.pick@climate.com> Date: Tue Jul 14 16:54:36 2015 +0000 Merge pull request #402 in MOB/climate-android from ~CHRIS.PICK/climate-android:FDI-1606 to release/2.3.1 Squashed commit of the following: commit 0b80e4c5438d52d12868bca2f56d3cfd7d2064a5 Merge: 1aea690 25dedc7 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:07 2015 -0700 Merge branch '2.3.1' into FDI-1606 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 1aea6907c35c504b9ae2167935606b743ec689e3 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:52:42 2015 -0700 FDI-1606 update string commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit 6212f29531e73b84ca722cd6c85f625417b6b4b2 Author: Christopher Pick <chris.pick@climate.com> Date: Tue Jul 14 16:52:19 2015 +0000 Merge pull request #401 in MOB/climate-android from ~CHRIS.PICK/climate-android:FDI-1588 to release/2.3.1 Squashed commit of the following: commit 4f011c1dfc25d53fbb07c177faf7748d2f59349e Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:56:07 2015 -0700 Fix version number error commit 88344097778945cca6712a5906983eb004ab9714 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:51:18 2015 -0700 FDI-1588 move add field to overflow menu commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit 8a9aecb80afbf58c67afcd87a550f22bbc8ef68a Author: Christopher Pick <chris.pick@climate.com> Date: Mon Jul 13 22:29:22 2015 +0000 Merge pull request #400 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1753 to release/2.3.1 Squashed commit of the following: commit 542ccfdfcc511db5c72dfd928d9014e5a981a940 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 13 15:28:08 2015 -0700 Fix notification lib version commit a356b27b9b9db4698cb447a0f818ba4d4197ca86 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 13 14:23:42 2015 -0700 BASIC-1753 work around commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit f9fa12e84fd19e3b061095750264d42179f4f35c Author: William Bendick <will.bendick@climate.com> Date: Fri Jul 10 23:09:27 2015 +0000 Merge pull request #398 in MOB/climate-android from master to release/2.3.1 Squashed commit of the following: commit e9ae87b2ef61f4c04dcdcd171991806d647bcdfd Author: William Bendick <will.bendick@climate.com> Date: Fri Jul 10 22:59:55 2015 +0000 Merge pull request #397 in MOB/climate-android from ~WILL.BENDICK/climate-android:mfsblockers to master Squashed commit of the following: commit f948158f85058e15b7491caed219c9b493653cc9 Author: Will Bendick <will.bendick@climate.com> Date: Fri Jul 10 15:58:42 2015 -0700 refactors string to constant and makes method public commit 03fcb83bef5fded85499cc6027686bea450a37d1 Author: Will Bendick <will.bendick@climate.com> Date: Fri Jul 10 15:45:19 2015 -0700 refactors custom constructor out of RegisterDialogFragment and adds a request focus to fields that have errors commit d23d46445c1fe11604bee3668b212c7998f4153b Author: Will Bendick <will.bendick@climate.com> Date: Fri Jul 10 15:05:37 2015 -0700 moves client auth to registration flow to fix FDI-1617 commit 6076da98997d81e61466de5b2c9a6b254f999718 Author: Will Bendick <will.bendick@climate.com> Date: Fri Jul 10 13:13:10 2015 -0700 updates mfs to version 29 commit 3f44efbd92ffbf1afa6ed18c9705efd8e2c4e7b4 Author: William Bendick <will.bendick@climate.com> Date: Thu Jul 9 18:30:08 2015 +0000 Merge pull request #393 in MOB/climate-android from ~WILL.BENDICK/climate-android:newauthcreds to master Squashed commit of the following: commit daace68285c7434f887f47d5788edfa1ebf597cb Author: Will Bendick <will.bendick@climate.com> Date: Thu Jul 9 11:14:09 2015 -0700 updatespwd auth credentials commit f735050439aecff070ddca210125b090fb4269ac Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 9 22:02:12 2015 +0000 Merge pull request #396 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:chart_scaling_fix to release/2.3.1 Squashed commit of the following: commit 45c19e1c0fef2b18e81ffc391b98ec3b0e2174be Merge: 1dc5e59 3ce7779 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 9 14:53:01 2015 -0700 Merge branch 'release/2.3.1' of ssh://stash.ci.climatedna.net:7999/mob/climate-android into chart_scaling_fix Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 1dc5e59fc069fc622f9e0338d0c2ef9920b089bb Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 9 14:49:38 2015 -0700 New nitrogen advisor with chart scaling fix commit 62133f942de2225c68c4a52eaeda86385b0ab9e9 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 9 10:27:18 2015 -0700 Fix for WHITE-1734 commit 142bcceda436841880db274890479508e5407f98 Merge: 6d3909b 0d6fbca Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 9 10:15:50 2015 -0700 Merge branch 'release/2.3.1' of ssh://stash.ci.climatedna.net:7999/mob/climate-android into nitrogen_edit commit 6d3909babd420504632d9c25c47ae9af03213ee9 Merge: 51f2d40 7762206 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 9 10:14:41 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into nitrogen_edit commit 51f2d40741fab7444eefca27198046e617985a36 Merge: 22e7283 31de09b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jul 8 16:49:46 2015 -0700 Merge branch 'release/2.3.1' of ssh://stash.ci.climatedna.net:7999/mob/climate-android into notification_settings Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/SettingsFragment.java ClimateGrowersProject/ClimateGrowersApp/src/main/res/layout/frag_settings.xml commit 77622069e5c25771bb632c88946ffbcb78a01e1b Merge: 024c2b0 5142e1c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jul 8 22:47:56 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '5142e1cbd0f5cbc96079596a3759f1132afc005b': Merge pull request #388 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 22e7283c122190af1c6e14d6b65f8d69d4c78924 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jul 8 15:46:53 2015 -0700 Fixes from a bad merge for NotificationSettings commit 024c2b08f969a269a3b4be4d3978b6ef576b4b4f Merge: 0a0f0ca c1c28aa Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 16:26:12 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 0a0f0caef3cad2286ace656abe36c5754f0d7916 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 16:23:18 2015 -0700 delete this file commit 024d435055fd5141e6053894afcdc3f79d3599b0 Merge: 9e904ef 4b20755 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 16:19:39 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android commit c1c28aa6d0889d853f7b0c82a85861ce982c8704 Merge: 7c2d9e4 cd37e07 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 23:04:09 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'cd37e07a0361e65b8044f9cedfc9210282f8f57c': Merge pull request #378 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1164 to master Merge pull request #387 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1862 to master Merge pull request #386 in MOB/climate-android from ~CHRIS.PICK/climate-android:update_auth_version to master commit 7c2d9e446f4809db44a6592686c334ddd7b395d2 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 22:54:25 2015 +0000 Merge pull request #6 in ~MATT.REYNOLDS/climate-android-matt from new_nitro_notifications to master Squashed commit of the following: commit 44c29ae287566c1a7d9e9dd350c9efa013c867e3 Merge: 5f85963 9e904ef Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 15:27:01 2015 -0700 Merge branch 'master' into new_nitro_notifications Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/ClimateApplication.java commit 5f85963ee1ff2aa106f5bfbe95e554151426f6f7 Merge: e4bbe0b befa26f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 15:06:38 2015 -0700 Merge branch 'master' into new_nitro_notifications Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/MainActivity.java ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/SettingsFragment.java ClimateGrowersProject/ClimateGrowersApp/src/main/res/layout/frag_settings.xml ClimateGrowersProject/ClimateGrowersApp/src/main/res/values/environment.xml commit e4bbe0b4946a1d23ef9c7dafb8847bdc189bb621 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 10:15:29 2015 -0700 Fixes for PR commit 5ebbfda0f9b3147f2c66c23fd851eb070d96cefb Merge: 5c9a98e e61007e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 2 12:32:42 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into new_nitro_notifications Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/ClimateApplication.java commit 5c9a98ed55fc5350e173fb3966318b8d73776157 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 2 12:20:18 2015 -0700 New NitrogenAdvisor and Notification libraries commit 9e904ef864053fb4c08bca8e31895054b1388cea Merge: befa26f 16cfa27 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 22:14:05 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '16cfa275427da07e9b33bc18095214d4b1b2f866': Merge pull request #385 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master Merge pull request #383 in MOB/climate-android from ~MANAV.SINGHAL/climate-android:scouting-lib-update to master Merge pull request #384 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master Merge pull request #382 in MOB/climate-android from ~CHRIS.PICK/climate-android:FDI-1584 to master commit befa26f6f09f0b2463cecd714049a68e2f8d4fb2 Merge: 2da4625 fdfab67 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 17:07:31 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fdfab67ceebb3cd98d73f7376e20edba7755ab46': Merge pull request #369 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1139 to master commit 2da4625f55ab9cc2ce4d26d36e625da51e718f4f Merge: 7f938a7 e018412 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 00:53:04 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'e018412d606a28deff1878cc0e90969398bec063': Merge pull request #381 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1832 to master Merge pull request #380 in MOB/climate-android from ~WILL.BENDICK/climate-android:registertask to master commit 7f938a70dc4507829dd04400cc1d6e45e3360470 Merge: 4473102 e61007e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 2 12:24:16 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 44731025726208e75031f9f498571a5403e26dc6 Merge: 8c7ac2d fe0edb6 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jun 30 19:48:12 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fe0edb631ee88cc321d9f64338cb0ae778732e53': Merge pull request #377 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1764 to master Merge pull request #367 in MOB/climate-android from release/2.3 to master commit 8c7ac2df872023723643d9cef2599c2a1a5a50cf Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jun 17 17:43:51 2015 -0700 ooops commit 518477e1b8058be1547cafb4d8cdab00084fe065 Merge: b23cdd3 f83f82f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jun 17 17:38:30 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/ClimateApplication.java commit b23cdd31f0ac5519b5b244177f6892f247a6d996 Merge: 35a9ebc e4a5577 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jun 2 17:45:26 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'e4a5577e8047d519a9803a13c1bf3dae53988c6e': Merge pull request #335 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:docs-update to master commit 35a9ebc0c8213c4152d18171f7621d9d4d8a8953 Merge: a4bd112 f8afe42 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 29 21:50:28 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'f8afe42a4f621c3072205eab05d470c17ea88d74': Merge pull request #333 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1288 to master commit a4bd1126e5082acb2bf70f5313db7bf2da9a6108 Merge: 181cf61 36ed77b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 26 16:32:49 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/ClimateApplication.java ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/login/LoginActivity.java commit 181cf61c6557be3a479a8d2884e5c482395f53b5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 26 16:27:12 2015 -0700 gradle 1.2.0 commit fbcbca2bbc3c1afd088ba5057aad6aebd823534f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 26 16:26:33 2015 -0700 Integration for new notification library commit 36ed77b2976150bf4b45088f539a4f9f21de6430 Merge: 0f7e52e 1e1fb78 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 26 23:24:10 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '1e1fb78e9a694fb9e4c9d2a4238857b887cc8c94': Merge pull request #322 in MOB/climate-android from ~RJOSHI/climate-android:merge-hotfix2.2.1 to master Merge pull request #320 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_quick_fixes to master commit 0f7e52eee79f169f89b9ae4a8285739b56faf62b Merge: bb691f5 d8e8815 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:49:32 2015 -0700 Merge https://stash.ci.climatedna.net/scm/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit bb691f54c6ed9d17d647b50860dddff8bbe168d1 Merge: ed513c5 7e8713c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:39:28 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android commit d8e8815623d9611ccd1633183e1d8f87446826b0 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 16:09:56 2015 +0000 Merge pull request #5 in ~MATT.REYNOLDS/climate-android-matt from na_quick_fixes to master Squashed commit of the following: commit 0a37f01e9f4c0a53ec92b6356e19bc27dcc1b0d8 Merge: a6cfcb0 28ce59d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 21 18:27:36 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_quick_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit a6cfcb0c8a66dadfce92c10c184b1cafb618de5a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 21 17:56:40 2015 -0700 new NitrogenAdvisor and new ReflectionSQL commit 046c8da0b406fe1b205090ba4117a59660a2bfa1 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 19 01:11:46 2015 -0700 New NitrogenAdvisor changed Lbs to lbs in strings.xml commit 28ce59dc95b13c2e4359d1b3390001eab9d5200c Merge: ed513c5 441c9e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 00:55:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '441c9e4e6c9828a700d3a706fcc6924a3a1095fe': Merge pull request #313 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1582 to master Merge pull request #310 in MOB/climate-android from ~CHRIS.PICK/climate-android:basic-1592 to master Merge pull request #312 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_quick_fixes to master commit ed513c5e2fbd90e411f96798f6d8595771c356ce Merge: 64b6d30 fbb0e34 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 15 00:28:09 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fbb0e3452cfa91e08bfc141e9963c0e82d0be449': Merge pull request #307 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_cosmetic_fixes to master commit 64b6d30966db097100a42fc883d1565ba946284a Merge: 1090719 d18188c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 13 00:25:23 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'd18188c67539d28a0e51abfa080fcca24d1250d9': Merge pull request #301 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1294 to master Merge pull request #297 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 1090719dbbbe497860828ce6cf4dbca256123a0c Merge: d624716 c734f8f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 20:58:44 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c734f8fd43fabe80bafec1cd97dc7f130a466a21': Merge pull request #283 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1434 to master commit d6247168652ee0b013de5bf5fcb83653ce3e376b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 04:40:43 2015 +0000 Merge pull request #4 in ~MATT.REYNOLDS/climate-android-matt from ui_fixes_and_perf to master Squashed commit of the following: commit 0a58baf7124ae517733cb73ca656bdd7604ef5c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 7 14:04:52 2015 -0700 Fixed margins in NitrogenAdvisorModuleCard Changed hardcoded view types to named constants in ModuleLauncherAdapter.java Changed switch statement to table lookup in ModuleLauncherAdapter.java Added upgrade message for basic users in NitrogenAdvisorModuleCard Changed reference to latest nitrogen advisor module in build.gradle commit e73c41ca178fc8bdd31c72e1fef0c3101d63a60d Merge: 935feee 21df0c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 6 22:34:13 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '21df0c5a2462fc298bd099079f207adef39bcb43': Merge pull request #292 in MOB/climate-android from ~DSLANE/climate-android:remove-fha-text to master Merge pull request #290 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 935feee7ddf2b2cae2756457ae63347d52b63314 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 21:04:42 2015 +0000 Merge pull request #3 in ~MATT.REYNOLDS/climate-android-matt from nitrogen_fast_sql to master Squashed commit of the following: commit 1d333c75c03329b52d4cd954f868a54d4bbe457d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 13:09:14 2015 -0700 Fast SQL operations for NitrogenAdvisorCard new Nitrogen Advisor Library commit 9013c506d597e15dd57c6152f7ed6e3a7e090691 Merge: 93eb6a9 549cba5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 19:49:53 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '549cba52abe1abad5b4dd35e07fd0c3f17a1a2e6': Merge pull request #284 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 93eb6a90d5bdfea31e9f83555a27ef8753dc0ade Merge: 7746d9c 07e117e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:21:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '07e117e12c8ebbb45d0dda0f0ff487e47d9163d5': Merge pull request #282 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 7746d9c89be66bc1e85e8d3e05958d360c4be4df Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:06:53 2015 +0000 Merge pull request #1 in ~MATT.REYNOLDS/climate-android-matt from na_provider_fixes to master Squashed commit of the following: commit cb286cd730c70329d3c4721d9aab6d1af886af00 Merge: c561808 a0ea318 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:54:17 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit c561808f7e2a179c86bdf581b87f5b62002d1fda Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 10:47:48 2015 -0700 Added reference to shinobicharts, which NitrogenAdvisor/NAChartView depends on. commit 8450ac2e7efe39e28832ec222e0849718cd5051a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:52:43 2015 -0700 Missed imports on merge commit dbdbf1ca86ce556856bbd2a9e8e501cd95108357 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:27:53 2015 -0700 build.gradle modifications for new nitrogen advisor with na_provider fixes commit 3b9d6dcfab218d38d4de88c9ec7408d62a0e9d21 Merge: 4750b5b babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 11:41:38 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into na_provider_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit 4750b5baa3ee673ce3842125ee7b79f3afe97dfe Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Apr 30 17:45:06 2015 -0700 Fixes for provider and server names for the NitrogenAdvisor commit a0ea318ada3d597226733e094957e304822c800a Merge: 1e245a7 3e28a4f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 21:53:43 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '3e28a4fe1d544f2c4e1b6baa3763855a69851ba5': Merge pull request #272 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_provider_fixes to master commit 1e245a71e22ae75ca0ea557d47a8394745592998 Merge: f9c87a5 babeb28 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Sun May 3 14:32:06 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java commit f9c87a54b886c26f91e9032dabed6dffce7867b4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Apr 28 13:03:16 2015 -0700 build.gradle now points to maven repo for NitrogenAdvisor commit 79a315db0627df808af0b761dffff547d0b3f362 Merge: d2f29c0 16925e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:04:28 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit d2f29c0e38eecbe121bcf5e9dcf706a0219e3d44 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:02:21 2015 -0700 Renderer for the Nitrogen advisor card commit 762904e2ccaf24475ed667eb4735b8f8a8548d90 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Apr 27 17:01:29 2015 -0700 Integrate NitrogenAdvisor commit 3ce777996afa4f10eec02bef0444fb899eeb9a22 Author: Christopher Pick <chris.pick@climate.com> Date: Thu Jul 9 20:56:52 2015 +0000 Merge pull request #395 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1882 to release/2.3.1 Squashed commit of the following: commit cb451dcd22005c8d59f0e021d88b2d4a9f434f36 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:55:13 2015 -0700 CR comment commit bff884b009e72d9dcb161303d7ffebacfed5aa61 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:52:00 2015 -0700 CR comment commit 750ac18b7c93969d8a22c05baf4de73b7dc654ac Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:43:57 2015 -0700 BASIC-1882 planting activity lifecycle commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit 3c2f5c42783c2ce03d3d3a3a0fc23d3233207a16 Author: William Bendick <will.bendick@climate.com> Date: Thu Jul 9 19:31:02 2015 +0000 Merge pull request #394 in MOB/climate-android from master to release/2.3.1 Squashed commit of the following: commit 3f44efbd92ffbf1afa6ed18c9705efd8e2c4e7b4 Author: William Bendick <will.bendick@climate.com> Date: Thu Jul 9 18:30:08 2015 +0000 Merge pull request #393 in MOB/climate-android from ~WILL.BENDICK/climate-android:newauthcreds to master Squashed commit of the following: commit daace68285c7434f887f47d5788edfa1ebf597cb Author: Will Bendick <will.bendick@climate.com> Date: Thu Jul 9 11:14:09 2015 -0700 updatespwd auth credentials commit 83f0445299c8b9287922834d8ca056bb9a62e6c9 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 9 17:39:40 2015 +0000 Merge pull request #392 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:notification_badge_fix to release/2.3.1 Squashed commit of the following: commit 62133f942de2225c68c4a52eaeda86385b0ab9e9 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 9 10:27:18 2015 -0700 Fix for WHITE-1734 commit 142bcceda436841880db274890479508e5407f98 Merge: 6d3909b 0d6fbca Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 9 10:15:50 2015 -0700 Merge branch 'release/2.3.1' of ssh://stash.ci.climatedna.net:7999/mob/climate-android into nitrogen_edit commit 6d3909babd420504632d9c25c47ae9af03213ee9 Merge: 51f2d40 7762206 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 9 10:14:41 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into nitrogen_edit commit 51f2d40741fab7444eefca27198046e617985a36 Merge: 22e7283 31de09b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jul 8 16:49:46 2015 -0700 Merge branch 'release/2.3.1' of ssh://stash.ci.climatedna.net:7999/mob/climate-android into notification_settings Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/SettingsFragment.java ClimateGrowersProject/ClimateGrowersApp/src/main/res/layout/frag_settings.xml commit 77622069e5c25771bb632c88946ffbcb78a01e1b Merge: 024c2b0 5142e1c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jul 8 22:47:56 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '5142e1cbd0f5cbc96079596a3759f1132afc005b': Merge pull request #388 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 22e7283c122190af1c6e14d6b65f8d69d4c78924 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jul 8 15:46:53 2015 -0700 Fixes from a bad merge for NotificationSettings commit 024c2b08f969a269a3b4be4d3978b6ef576b4b4f Merge: 0a0f0ca c1c28aa Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 16:26:12 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 0a0f0caef3cad2286ace656abe36c5754f0d7916 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 16:23:18 2015 -0700 delete this file commit 024d435055fd5141e6053894afcdc3f79d3599b0 Merge: 9e904ef 4b20755 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 16:19:39 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android commit c1c28aa6d0889d853f7b0c82a85861ce982c8704 Merge: 7c2d9e4 cd37e07 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 23:04:09 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'cd37e07a0361e65b8044f9cedfc9210282f8f57c': Merge pull request #378 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1164 to master Merge pull request #387 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1862 to master Merge pull request #386 in MOB/climate-android from ~CHRIS.PICK/climate-android:update_auth_version to master commit 7c2d9e446f4809db44a6592686c334ddd7b395d2 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 22:54:25 2015 +0000 Merge pull request #6 in ~MATT.REYNOLDS/climate-android-matt from new_nitro_notifications to master Squashed commit of the following: commit 44c29ae287566c1a7d9e9dd350c9efa013c867e3 Merge: 5f85963 9e904ef Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 15:27:01 2015 -0700 Merge branch 'master' into new_nitro_notifications Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/ClimateApplication.java commit 5f85963ee1ff2aa106f5bfbe95e554151426f6f7 Merge: e4bbe0b befa26f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 15:06:38 2015 -0700 Merge branch 'master' into new_nitro_notifications Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/MainActivity.java ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/SettingsFragment.java ClimateGrowersProject/ClimateGrowersApp/src/main/res/layout/frag_settings.xml ClimateGrowersProject/ClimateGrowersApp/src/main/res/values/environment.xml commit e4bbe0b4946a1d23ef9c7dafb8847bdc189bb621 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 10:15:29 2015 -0700 Fixes for PR commit 5ebbfda0f9b3147f2c66c23fd851eb070d96cefb Merge: 5c9a98e e61007e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 2 12:32:42 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into new_nitro_notifications Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/ClimateApplication.java commit 5c9a98ed55fc5350e173fb3966318b8d73776157 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 2 12:20:18 2015 -0700 New NitrogenAdvisor and Notification libraries commit 9e904ef864053fb4c08bca8e31895054b1388cea Merge: befa26f 16cfa27 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 22:14:05 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '16cfa275427da07e9b33bc18095214d4b1b2f866': Merge pull request #385 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master Merge pull request #383 in MOB/climate-android from ~MANAV.SINGHAL/climate-android:scouting-lib-update to ma…
MichaelBlume
pushed a commit
to MichaelBlume/clojure
that referenced
this pull request
Feb 2, 2016
…te-android:release_merge to master Squashed commit of the following: commit e1bdbb7ce73a7b7ab0e5a904f4def282984053c8 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 30 14:56:24 2015 -0700 fix missing merge conflict commit f8b7c7c6d9f024be733d1957e6c84c810492c793 Merge: 1ec74ef 5071bbd Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 30 14:48:54 2015 -0700 Merge remote-tracking branch 'origin/bugfix/2.3.1.2' into release_merge commit 1ec74ef0426257e2a3d0fbc268056184c07ed0ba Merge: 8e87bf3 ab5d27f Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 30 14:46:49 2015 -0700 Merge remote-tracking branch 'origin/2.3.1.1' into release_merge Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 5071bbdf9840ff0e8cc0386faa533ed9090d2234 Author: Christopher Pick <chris.pick@climate.com> Date: Thu Jul 30 20:56:55 2015 +0000 Merge pull request #420 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1954 to bugfix/2.3.1.2 Squashed commit of the following: commit 0fbab1fa97007ea1e8fd008b690f245a532bac73 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 30 13:49:09 2015 -0700 fix commit bfc3d8ab5e1869db14fc9e9bd43b7baff028ec2f Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 30 13:46:15 2015 -0700 Prevent Crash commit 6d6d02b7f3687d98074ab2f10c3c274c85854cca Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 30 13:22:14 2015 -0700 BASIC-1954 - update build version commit d70b8ba0305d99c4d8c57af6f0cd46ea7d083ec0 Author: Christopher Pick <chris.pick@climate.com> Date: Wed Jul 29 19:40:53 2015 +0000 Merge pull request #417 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1954 to 2.3.1.1 Squashed commit of the following: commit b18bafc26c15e8bddda37c08ae97fc22e5a1d887 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 29 12:39:49 2015 -0700 BASIC-1954 - added comment commit ee19c15ba131ea00dd98ab349ff59a800dd2c53a Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 29 12:28:35 2015 -0700 BASIC-1954 - added log commit 97ff44dd7614c3750a8d2e3b955eba889f46861c Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 29 12:25:58 2015 -0700 BASIC-1954 - fix race condition logout (temp fix) commit ab5d27f9b552e11e657a1adace02656688371200 Merge: 19b7203 c65fd5d Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 27 11:31:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 19b7203e5b781029c0c8768ec9ce833eb1156389 Merge: 625ac0e aa7b021 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 23 09:53:42 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 625ac0e13f9a031488f4bdffca3dc1246d6b87a7 Merge: 16447db a74533d Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 22 14:20:41 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 16447db9daa7430e31abc2c272d50a12616e7737 Merge: 057346e a6f9b14 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:13:08 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 057346e72a1bd764e9c14db8a27f7cff90f79431 Merge: ce8da53 12b771b Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:51:34 2015 -0700 oMerge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ce8da53b514a297480ddce6b068f26370a1fc00c Merge: 6f27293 bf515e8 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:25:14 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6f272935b1242f0e59dc880c5d5d9ae74183bc70 Merge: 44a8d1d 65ecae6 Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 09:36:13 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit a76f3c429c0a1dd8e73fb92e189324aa27f11c2b Author: Christopher Pick <chris.pick@climate.com> Date: Wed Jul 29 16:41:26 2015 +0000 Merge pull request #416 in MOB/climate-android from ~CHRIS.PICK/climate-android:PROD-2431 to 2.3.1.1 Squashed commit of the following: commit 6bf4c70956c2512f3a95c3bbe114b80a2edae78d Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 29 09:34:52 2015 -0700 2.3.1.1 version number commit 9d7b8e67d86db56d30209311627f86796555e00f Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 29 09:34:19 2015 -0700 PROD-2431 - update tile server URL commit ab5d27f9b552e11e657a1adace02656688371200 Merge: 19b7203 c65fd5d Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 27 11:31:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 19b7203e5b781029c0c8768ec9ce833eb1156389 Merge: 625ac0e aa7b021 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 23 09:53:42 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 625ac0e13f9a031488f4bdffca3dc1246d6b87a7 Merge: 16447db a74533d Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 22 14:20:41 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 16447db9daa7430e31abc2c272d50a12616e7737 Merge: 057346e a6f9b14 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:13:08 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 057346e72a1bd764e9c14db8a27f7cff90f79431 Merge: ce8da53 12b771b Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:51:34 2015 -0700 oMerge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ce8da53b514a297480ddce6b068f26370a1fc00c Merge: 6f27293 bf515e8 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:25:14 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6f272935b1242f0e59dc880c5d5d9ae74183bc70 Merge: 44a8d1d 65ecae6 Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 09:36:13 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit ab5d27f9b552e11e657a1adace02656688371200 Merge: 19b7203 c65fd5d Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 27 11:31:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c65fd5d17f1627b3741c96e42b4c8ea578dd0586 Author: Christopher Pick <chris.pick@climate.com> Date: Thu Jul 23 23:15:11 2015 +0000 Merge pull request #412 in MOB/climate-android from ~CHRIS.PICK/climate-android:versions to release/2.3.1 Squashed commit of the following: commit a3aff66dd0eef8c35d1e676b8543f086aa60c19e Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 23 16:13:18 2015 -0700 update versions commit 19b7203e5b781029c0c8768ec9ce833eb1156389 Merge: 625ac0e aa7b021 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 23 09:53:42 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 625ac0e13f9a031488f4bdffca3dc1246d6b87a7 Merge: 16447db a74533d Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 22 14:20:41 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 16447db9daa7430e31abc2c272d50a12616e7737 Merge: 057346e a6f9b14 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:13:08 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 057346e72a1bd764e9c14db8a27f7cff90f79431 Merge: ce8da53 12b771b Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:51:34 2015 -0700 oMerge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ce8da53b514a297480ddce6b068f26370a1fc00c Merge: 6f27293 bf515e8 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:25:14 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6f272935b1242f0e59dc880c5d5d9ae74183bc70 Merge: 44a8d1d 65ecae6 Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 09:36:13 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit 19b7203e5b781029c0c8768ec9ce833eb1156389 Merge: 625ac0e aa7b021 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 23 09:53:42 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit aa7b0219114f490d7cf89a79dbf49e2b5e30e0f5 Author: Christopher Pick <chris.pick@climate.com> Date: Wed Jul 22 21:29:13 2015 +0000 Merge pull request #411 in MOB/climate-android from ~CHRIS.PICK/climate-android:WHITE-1745 to release/2.3.1 Squashed commit of the following: commit a969404f44765699a8602cb542539aea9f9219b8 Merge: c60a04f 625ac0e Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 22 14:25:35 2015 -0700 merge commit 625ac0e13f9a031488f4bdffca3dc1246d6b87a7 Merge: 16447db a74533d Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 22 14:20:41 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c60a04f77cbf8dc43a1dfdababbfb153acdcc64b Merge: 040836f 16447db Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:14:23 2015 -0700 merge commit 16447db9daa7430e31abc2c272d50a12616e7737 Merge: 057346e a6f9b14 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:13:08 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 040836f85fb65565d2795eb1bb7a72ecb9f97253 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:12:51 2015 -0700 more versions commit be762e052f25079c04b077b1d51e451e64342988 Merge: 7726e02 057346e Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:52:20 2015 -0700 Merge branch '2.3.1' into WHITE-1745 Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 057346e72a1bd764e9c14db8a27f7cff90f79431 Merge: ce8da53 12b771b Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:51:34 2015 -0700 oMerge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 7726e02d4cde040439c3f053f087126c08bc41fb Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:47:05 2015 -0700 fix build versions commit c8d34b11454604620f3d28898aa069a4b6646e66 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:28:35 2015 -0700 WHITE-1745 update dependencies commit ce8da53b514a297480ddce6b068f26370a1fc00c Merge: 6f27293 bf515e8 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:25:14 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6f272935b1242f0e59dc880c5d5d9ae74183bc70 Merge: 44a8d1d 65ecae6 Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 09:36:13 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit 625ac0e13f9a031488f4bdffca3dc1246d6b87a7 Merge: 16447db a74533d Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 22 14:20:41 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit a74533d298a379b3aee56c301a3b1d55a606960c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jul 22 06:03:28 2015 +0000 Merge pull request #410 in MOB/climate-android from notification_field_summary to release/2.3.1 Squashed commit of the following: commit bdd0f0e2f6c89eebc3a1957d37087b8cfc1e5a5b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 21 21:44:29 2015 -0700 updated notificationlib version commit cbb2ba3296766fcc217db08696a6ac443d4c3b47 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 21 21:34:24 2015 -0700 fixed settings.gradle commit 2f216e439a292775a69af5cf96fa9e5a04eb3fa1 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 21 21:29:00 2015 -0700 NotificationService needs to query the field summary commit 8f47ad096935aa0e4d66003b488dad1ba3b244a8 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 21 14:01:58 2015 -0700 removed unused project refs commit 4c3dfc6dc4eeac566179ccb87d03df1ae2724142 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jul 22 04:36:03 2015 +0000 Merge pull request #409 in MOB/climate-android from notification_field_summary to release/2.3.1 Squashed commit of the following: commit cbb2ba3296766fcc217db08696a6ac443d4c3b47 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 21 21:34:24 2015 -0700 fixed settings.gradle commit 2f216e439a292775a69af5cf96fa9e5a04eb3fa1 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 21 21:29:00 2015 -0700 NotificationService needs to query the field summary commit 8f47ad096935aa0e4d66003b488dad1ba3b244a8 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 21 14:01:58 2015 -0700 removed unused project refs commit 4d723196c2f7fb607e2cb44a7331eb1ebbabdfac Author: Christopher Pick <chris.pick@climate.com> Date: Tue Jul 21 02:21:21 2015 +0000 Merge pull request #408 in MOB/climate-android from ~CHRIS.PICK/climate-android:WHITE-1745 to release/2.3.1 Squashed commit of the following: commit c60a04f77cbf8dc43a1dfdababbfb153acdcc64b Merge: 040836f 16447db Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:14:23 2015 -0700 merge commit 16447db9daa7430e31abc2c272d50a12616e7737 Merge: 057346e a6f9b14 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:13:08 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 040836f85fb65565d2795eb1bb7a72ecb9f97253 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:12:51 2015 -0700 more versions commit be762e052f25079c04b077b1d51e451e64342988 Merge: 7726e02 057346e Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:52:20 2015 -0700 Merge branch '2.3.1' into WHITE-1745 Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 057346e72a1bd764e9c14db8a27f7cff90f79431 Merge: ce8da53 12b771b Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:51:34 2015 -0700 oMerge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 7726e02d4cde040439c3f053f087126c08bc41fb Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:47:05 2015 -0700 fix build versions commit c8d34b11454604620f3d28898aa069a4b6646e66 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:28:35 2015 -0700 WHITE-1745 update dependencies commit ce8da53b514a297480ddce6b068f26370a1fc00c Merge: 6f27293 bf515e8 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:25:14 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6f272935b1242f0e59dc880c5d5d9ae74183bc70 Merge: 44a8d1d 65ecae6 Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 09:36:13 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit 16447db9daa7430e31abc2c272d50a12616e7737 Merge: 057346e a6f9b14 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 19:13:08 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit a6f9b14c54a00edf096ce49ba9b5bf92af885433 Author: Christopher Pick <chris.pick@climate.com> Date: Tue Jul 21 00:55:12 2015 +0000 Merge pull request #407 in MOB/climate-android from ~CHRIS.PICK/climate-android:WHITE-1745 to release/2.3.1 Squashed commit of the following: commit be762e052f25079c04b077b1d51e451e64342988 Merge: 7726e02 057346e Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:52:20 2015 -0700 Merge branch '2.3.1' into WHITE-1745 Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 057346e72a1bd764e9c14db8a27f7cff90f79431 Merge: ce8da53 12b771b Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:51:34 2015 -0700 oMerge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 7726e02d4cde040439c3f053f087126c08bc41fb Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:47:05 2015 -0700 fix build versions commit c8d34b11454604620f3d28898aa069a4b6646e66 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:28:35 2015 -0700 WHITE-1745 update dependencies commit ce8da53b514a297480ddce6b068f26370a1fc00c Merge: 6f27293 bf515e8 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:25:14 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6f272935b1242f0e59dc880c5d5d9ae74183bc70 Merge: 44a8d1d 65ecae6 Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 09:36:13 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit 057346e72a1bd764e9c14db8a27f7cff90f79431 Merge: ce8da53 12b771b Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 17:51:34 2015 -0700 oMerge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 12b771beef1ea8c9b4188006a57d4dbccd7a2330 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon Jul 20 23:32:49 2015 +0000 Merge pull request #406 in MOB/climate-android from ~CHRIS.PICK/climate-android:WHITE-1745 to release/2.3.1 Squashed commit of the following: commit c8d34b11454604620f3d28898aa069a4b6646e66 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:28:35 2015 -0700 WHITE-1745 update dependencies commit ce8da53b514a297480ddce6b068f26370a1fc00c Merge: 6f27293 bf515e8 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:25:14 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6f272935b1242f0e59dc880c5d5d9ae74183bc70 Merge: 44a8d1d 65ecae6 Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 09:36:13 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit ce8da53b514a297480ddce6b068f26370a1fc00c Merge: 6f27293 bf515e8 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 20 16:25:14 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit bf515e8623488f27b07098cb95a0e0081a096695 Author: Christopher Pick <chris.pick@climate.com> Date: Fri Jul 17 18:15:46 2015 +0000 Merge pull request #405 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1903 to release/2.3.1 Squashed commit of the following: commit c72c3056ba4ce42814d77fa1e2e9b0d61239719d Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 11:07:00 2015 -0700 Disable login/register buttons, remove add fields from menu, clean up imports commit 6f272935b1242f0e59dc880c5d5d9ae74183bc70 Merge: 44a8d1d 65ecae6 Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 09:36:13 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit 6f272935b1242f0e59dc880c5d5d9ae74183bc70 Merge: 44a8d1d 65ecae6 Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 17 09:36:13 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 65ecae6121a2519d286685c6de1e6d9d85b8af52 Author: Christopher Pick <chris.pick@climate.com> Date: Wed Jul 15 20:03:15 2015 +0000 Merge pull request #404 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1893 to release/2.3.1 Squashed commit of the following: commit 401a8bc4b921bed06053d71f3a739b8b5ce903ac Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 12:55:46 2015 -0700 CR Comment commit 2a050c3debf4d9353bd852b247a4e8cbb3a977cb Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 11:43:18 2015 -0700 cleanup const commit bde5c5a6e2f0aa35877cb466cab949b601c25a63 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 11:42:18 2015 -0700 update nav drawer, doc plus null check. commit 48180cc7dc225006f01474bf5165a4864c0723e9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 11:40:07 2015 -0700 cleanup imports / change to spaces from tabs commit 895ed1b744e17215ff2ed892c69426e1bf1edd38 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 11:38:19 2015 -0700 fix closing nav commit 3b845aacb58151cbc2892101d292bafa627ec81d Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 11:28:55 2015 -0700 update code commit 955b30ef79e03fa1f8d9ac4451042e214dc97c88 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 11:26:18 2015 -0700 BASIC-1893 moved add fields from overflow to nav menu commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit 44a8d1d8aa9c9a4faa2ce1858d952f404f0ebd09 Merge: 25dedc7 8eabab9 Author: Chris Pick <chris.pick@climate.com> Date: Wed Jul 15 09:45:50 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 8eabab945e7051be2615a8e4a90d93cdf00028b6 Author: Christopher Pick <chris.pick@climate.com> Date: Tue Jul 14 16:54:36 2015 +0000 Merge pull request #402 in MOB/climate-android from ~CHRIS.PICK/climate-android:FDI-1606 to release/2.3.1 Squashed commit of the following: commit 0b80e4c5438d52d12868bca2f56d3cfd7d2064a5 Merge: 1aea690 25dedc7 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:07 2015 -0700 Merge branch '2.3.1' into FDI-1606 commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 1aea6907c35c504b9ae2167935606b743ec689e3 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:52:42 2015 -0700 FDI-1606 update string commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit 25dedc7a980dd09b7672c43c10535343f0a461e0 Merge: 3f26267 6212f29 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 09:53:00 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6212f29531e73b84ca722cd6c85f625417b6b4b2 Author: Christopher Pick <chris.pick@climate.com> Date: Tue Jul 14 16:52:19 2015 +0000 Merge pull request #401 in MOB/climate-android from ~CHRIS.PICK/climate-android:FDI-1588 to release/2.3.1 Squashed commit of the following: commit 4f011c1dfc25d53fbb07c177faf7748d2f59349e Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:56:07 2015 -0700 Fix version number error commit 88344097778945cca6712a5906983eb004ab9714 Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:51:18 2015 -0700 FDI-1588 move add field to overflow menu commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit 3f2626772f117e7dd7fd7156df28e571ed498890 Merge: ecf6fcb 8a9aecb Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 14 08:49:38 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 8a9aecb80afbf58c67afcd87a550f22bbc8ef68a Author: Christopher Pick <chris.pick@climate.com> Date: Mon Jul 13 22:29:22 2015 +0000 Merge pull request #400 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1753 to release/2.3.1 Squashed commit of the following: commit 542ccfdfcc511db5c72dfd928d9014e5a981a940 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 13 15:28:08 2015 -0700 Fix notification lib version commit a356b27b9b9db4698cb447a0f818ba4d4197ca86 Author: Chris Pick <chris.pick@climate.com> Date: Mon Jul 13 14:23:42 2015 -0700 BASIC-1753 work around commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit c08556df96eb3caa4c6a615d589b8d5577983b83 Merge: 6812e14 3c2f5c4 Author: Chris Pick <chris.pick@climate.com> Date: Thu Jul 9 13:31:03 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit 6812e14c6f735cd44b383270b5cc7bffe94ddbcf Author: Chris Pick <chris.pick@climate.com> Date: Tue Jul 7 18:47:20 2015 -0700 update build version commit ecf6fcbd117eded31ee7e5ab756f3bed47702ca0 Merge: c08556d f9fa12e Author: Chris Pick <chris.pick@climate.com> Date: Fri Jul 10 17:09:34 2015 -0700 Merge branch 'release/2.3.1' of https://stash.ci.climatedna.net/scm/~chris.pick/climate-android into 2.3.1 commit f9fa12e84fd19e3b061095750264d42179f4f35c Author: William Bendick <will.bendick@climate.com> Date: Fri Jul 10 23:09:27 2015 +0000 Merge pull request #398 in MOB/climate-android from master to release/2.3.1 Squashed commit of the following: commit e9ae87b2ef61f4c04dcdcd171991806d647bcdfd Author: William Bendick <will.bendick@climate.com> Date: Fri Jul 10 22:59:55 2015 +0000 Merge pull request #397 in MOB/climate-android from ~WILL.BENDICK/climate-android:mfsblockers to master Squashed commit of the following: commit f948158f85058e15b7491caed219c9b493653cc9 Author: Will Bendick <will.bendick@climate.com> Date: Fri Jul 10 15:58:42 2015 -0700 refactors string to constant and makes method public commit 03fcb83bef5fded85499cc6027686bea450a37d1 Author: Will Bendick <will.bendick@climate.com> Date: Fri Jul 10 15:45:19 2015 -0700 refactors custom constructor out of RegisterDialogFragment and adds a request focus to fields that have errors commit d23d46445c1fe11604bee3668b212c7998f4153b Author: Will Bendick <will.bendick@climate.com> Date: Fri Jul 10 15:05:37 2015 -0700 moves client auth to registration flow to fix FDI-1617 commit 6076da98997d81e61466de5b2c9a6b254f999718 Author: Will Bendick <will.bendick@climate.com> Date: Fri Jul 10 13:13:10 2015 -0700 updates mfs to version 29 commit 3f44efbd92ffbf1afa6ed18c9705efd8e2c4e7b4 Author: William Bendick <will.bendick@climate.com> Date: Thu Jul 9 18:30:08 2015 +0000 Merge pull request #393 in MOB/climate-android from ~WILL.BENDICK/climate-android:newauthcreds to master Squashed commit of the following: commit daace68285c7434f887f47d5788edfa1ebf597cb Author: Will Bendick <will.bendick@climate.com> Date: Thu Jul 9 11:14:09 2015 -0700 updatespwd auth credentials commit f735050439aecff070ddca210125b090fb4269ac Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 9 22:02:12 2015 +0000 Merge pull request #396 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:chart_scaling_fix to release/2.3.1 Squashed commit of the following: commit 45c19e1c0fef2b18e81ffc391b98ec3b0e2174be Merge: 1dc5e59 3ce7779 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 9 14:53:01 2015 -0700 Merge branch 'release/2.3.1' of ssh://stash.ci.climatedna.net:7999/mob/climate-android into chart_scaling_fix Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 1dc5e59fc069fc622f9e0338d0c2ef9920b089bb Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 9 14:49:38 2015 -0700 New nitrogen advisor with chart scaling fix commit 62133f942de2225c68c4a52eaeda86385b0ab9e9 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 9 10:27:18 2015 -0700 Fix for WHITE-1734 commit 142bcceda436841880db274890479508e5407f98 Merge: 6d3909b 0d6fbca Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 9 10:15:50 2015 -0700 Merge branch 'release/2.3.1' of ssh://stash.ci.climatedna.net:7999/mob/climate-android into nitrogen_edit commit 6d3909babd420504632d9c25c47ae9af03213ee9 Merge: 51f2d40 7762206 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 9 10:14:41 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into nitrogen_edit commit 51f2d40741fab7444eefca27198046e617985a36 Merge: 22e7283 31de09b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jul 8 16:49:46 2015 -0700 Merge branch 'release/2.3.1' of ssh://stash.ci.climatedna.net:7999/mob/climate-android into notification_settings Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/SettingsFragment.java ClimateGrowersProject/ClimateGrowersApp/src/main/res/layout/frag_settings.xml commit 77622069e5c25771bb632c88946ffbcb78a01e1b Merge: 024c2b0 5142e1c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jul 8 22:47:56 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '5142e1cbd0f5cbc96079596a3759f1132afc005b': Merge pull request #388 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 22e7283c122190af1c6e14d6b65f8d69d4c78924 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jul 8 15:46:53 2015 -0700 Fixes from a bad merge for NotificationSettings commit 024c2b08f969a269a3b4be4d3978b6ef576b4b4f Merge: 0a0f0ca c1c28aa Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 16:26:12 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 0a0f0caef3cad2286ace656abe36c5754f0d7916 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 16:23:18 2015 -0700 delete this file commit 024d435055fd5141e6053894afcdc3f79d3599b0 Merge: 9e904ef 4b20755 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 16:19:39 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android commit c1c28aa6d0889d853f7b0c82a85861ce982c8704 Merge: 7c2d9e4 cd37e07 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 23:04:09 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'cd37e07a0361e65b8044f9cedfc9210282f8f57c': Merge pull request #378 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1164 to master Merge pull request #387 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1862 to master Merge pull request #386 in MOB/climate-android from ~CHRIS.PICK/climate-android:update_auth_version to master commit 7c2d9e446f4809db44a6592686c334ddd7b395d2 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 22:54:25 2015 +0000 Merge pull request #6 in ~MATT.REYNOLDS/climate-android-matt from new_nitro_notifications to master Squashed commit of the following: commit 44c29ae287566c1a7d9e9dd350c9efa013c867e3 Merge: 5f85963 9e904ef Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 15:27:01 2015 -0700 Merge branch 'master' into new_nitro_notifications Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/ClimateApplication.java commit 5f85963ee1ff2aa106f5bfbe95e554151426f6f7 Merge: e4bbe0b befa26f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 15:06:38 2015 -0700 Merge branch 'master' into new_nitro_notifications Conflicts: ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/MainActivity.java ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/content/SettingsFragment.java ClimateGrowersProject/ClimateGrowersApp/src/main/res/layout/frag_settings.xml ClimateGrowersProject/ClimateGrowersApp/src/main/res/values/environment.xml commit e4bbe0b4946a1d23ef9c7dafb8847bdc189bb621 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 10:15:29 2015 -0700 Fixes for PR commit 5ebbfda0f9b3147f2c66c23fd851eb070d96cefb Merge: 5c9a98e e61007e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 2 12:32:42 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android into new_nitro_notifications Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/ClimateApplication.java commit 5c9a98ed55fc5350e173fb3966318b8d73776157 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 2 12:20:18 2015 -0700 New NitrogenAdvisor and Notification libraries commit 9e904ef864053fb4c08bca8e31895054b1388cea Merge: befa26f 16cfa27 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 22:14:05 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '16cfa275427da07e9b33bc18095214d4b1b2f866': Merge pull request #385 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master Merge pull request #383 in MOB/climate-android from ~MANAV.SINGHAL/climate-android:scouting-lib-update to master Merge pull request #384 in MOB/climate-android from ~JMUSSELWHITE/josh-android:master to master Merge pull request #382 in MOB/climate-android from ~CHRIS.PICK/climate-android:FDI-1584 to master commit befa26f6f09f0b2463cecd714049a68e2f8d4fb2 Merge: 2da4625 fdfab67 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 17:07:31 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fdfab67ceebb3cd98d73f7376e20edba7755ab46': Merge pull request #369 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1139 to master commit 2da4625f55ab9cc2ce4d26d36e625da51e718f4f Merge: 7f938a7 e018412 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jul 7 00:53:04 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'e018412d606a28deff1878cc0e90969398bec063': Merge pull request #381 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1832 to master Merge pull request #380 in MOB/climate-android from ~WILL.BENDICK/climate-android:registertask to master commit 7f938a70dc4507829dd04400cc1d6e45e3360470 Merge: 4473102 e61007e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu Jul 2 12:24:16 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit 44731025726208e75031f9f498571a5403e26dc6 Merge: 8c7ac2d fe0edb6 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jun 30 19:48:12 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fe0edb631ee88cc321d9f64338cb0ae778732e53': Merge pull request #377 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1764 to master Merge pull request #367 in MOB/climate-android from release/2.3 to master commit 8c7ac2df872023723643d9cef2599c2a1a5a50cf Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jun 17 17:43:51 2015 -0700 ooops commit 518477e1b8058be1547cafb4d8cdab00084fe065 Merge: b23cdd3 f83f82f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed Jun 17 17:38:30 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/ClimateApplication.java commit b23cdd31f0ac5519b5b244177f6892f247a6d996 Merge: 35a9ebc e4a5577 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue Jun 2 17:45:26 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'e4a5577e8047d519a9803a13c1bf3dae53988c6e': Merge pull request #335 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:docs-update to master commit 35a9ebc0c8213c4152d18171f7621d9d4d8a8953 Merge: a4bd112 f8afe42 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 29 21:50:28 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'f8afe42a4f621c3072205eab05d470c17ea88d74': Merge pull request #333 in MOB/climate-android from ~ZIFENG.HUANG/climate-android:BASIC-1288 to master commit a4bd1126e5082acb2bf70f5313db7bf2da9a6108 Merge: 181cf61 36ed77b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 26 16:32:49 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/renderers/NitrogenAdvisorModuleCard.java ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/ClimateApplication.java ClimateGrowersProject/ClimateGrowersApp/src/main/java/com/climate/growers/android/ui/login/LoginActivity.java commit 181cf61c6557be3a479a8d2884e5c482395f53b5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 26 16:27:12 2015 -0700 gradle 1.2.0 commit fbcbca2bbc3c1afd088ba5057aad6aebd823534f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 26 16:26:33 2015 -0700 Integration for new notification library commit 36ed77b2976150bf4b45088f539a4f9f21de6430 Merge: 0f7e52e 1e1fb78 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 26 23:24:10 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '1e1fb78e9a694fb9e4c9d2a4238857b887cc8c94': Merge pull request #322 in MOB/climate-android from ~RJOSHI/climate-android:merge-hotfix2.2.1 to master Merge pull request #320 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_quick_fixes to master commit 0f7e52eee79f169f89b9ae4a8285739b56faf62b Merge: bb691f5 d8e8815 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:49:32 2015 -0700 Merge https://stash.ci.climatedna.net/scm/~matt.reynolds/climate-android-matt Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit bb691f54c6ed9d17d647b50860dddff8bbe168d1 Merge: ed513c5 7e8713c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 13:39:28 2015 -0700 Merge branch 'master' of https://stash.ci.climatedna.net/scm/mob/climate-android commit d8e8815623d9611ccd1633183e1d8f87446826b0 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 16:09:56 2015 +0000 Merge pull request #5 in ~MATT.REYNOLDS/climate-android-matt from na_quick_fixes to master Squashed commit of the following: commit 0a37f01e9f4c0a53ec92b6356e19bc27dcc1b0d8 Merge: a6cfcb0 28ce59d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 21 18:27:36 2015 -0700 Merge branch 'master' of ssh://stash.ci.climatedna.net:7999/~matt.reynolds/climate-android-matt into na_quick_fixes Conflicts: ClimateGrowersProject/ClimateGrowersApp/build.gradle commit a6cfcb0c8a66dadfce92c10c184b1cafb618de5a Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 21 17:56:40 2015 -0700 new NitrogenAdvisor and new ReflectionSQL commit 046c8da0b406fe1b205090ba4117a59660a2bfa1 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 19 01:11:46 2015 -0700 New NitrogenAdvisor changed Lbs to lbs in strings.xml commit 28ce59dc95b13c2e4359d1b3390001eab9d5200c Merge: ed513c5 441c9e4 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 22 00:55:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '441c9e4e6c9828a700d3a706fcc6924a3a1095fe': Merge pull request #313 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1582 to master Merge pull request #310 in MOB/climate-android from ~CHRIS.PICK/climate-android:basic-1592 to master Merge pull request #312 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_quick_fixes to master commit ed513c5e2fbd90e411f96798f6d8595771c356ce Merge: 64b6d30 fbb0e34 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 15 00:28:09 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'fbb0e3452cfa91e08bfc141e9963c0e82d0be449': Merge pull request #307 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:na_cosmetic_fixes to master commit 64b6d30966db097100a42fc883d1565ba946284a Merge: 1090719 d18188c Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 13 00:25:23 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'd18188c67539d28a0e51abfa080fcca24d1250d9': Merge pull request #301 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1294 to master Merge pull request #297 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 1090719dbbbe497860828ce6cf4dbca256123a0c Merge: d624716 c734f8f Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 20:58:44 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit 'c734f8fd43fabe80bafec1cd97dc7f130a466a21': Merge pull request #283 in MOB/climate-android from ~CHRIS.PICK/climate-android:BASIC-1434 to master commit d6247168652ee0b013de5bf5fcb83653ce3e376b Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Fri May 8 04:40:43 2015 +0000 Merge pull request #4 in ~MATT.REYNOLDS/climate-android-matt from ui_fixes_and_perf to master Squashed commit of the following: commit 0a58baf7124ae517733cb73ca656bdd7604ef5c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Thu May 7 14:04:52 2015 -0700 Fixed margins in NitrogenAdvisorModuleCard Changed hardcoded view types to named constants in ModuleLauncherAdapter.java Changed switch statement to table lookup in ModuleLauncherAdapter.java Added upgrade message for basic users in NitrogenAdvisorModuleCard Changed reference to latest nitrogen advisor module in build.gradle commit e73c41ca178fc8bdd31c72e1fef0c3101d63a60d Merge: 935feee 21df0c5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Wed May 6 22:34:13 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '21df0c5a2462fc298bd099079f207adef39bcb43': Merge pull request #292 in MOB/climate-android from ~DSLANE/climate-android:remove-fha-text to master Merge pull request #290 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 935feee7ddf2b2cae2756457ae63347d52b63314 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 21:04:42 2015 +0000 Merge pull request #3 in ~MATT.REYNOLDS/climate-android-matt from nitrogen_fast_sql to master Squashed commit of the following: commit 1d333c75c03329b52d4cd954f868a54d4bbe457d Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 13:09:14 2015 -0700 Fast SQL operations for NitrogenAdvisorCard new Nitrogen Advisor Library commit 9013c506d597e15dd57c6152f7ed6e3a7e090691 Merge: 93eb6a9 549cba5 Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Tue May 5 19:49:53 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '549cba52abe1abad5b4dd35e07fd0c3f17a1a2e6': Merge pull request #284 in MOB/climate-android from ~MATT.REYNOLDS/climate-android-matt:master to master commit 93eb6a90d5bdfea31e9f83555a27ef8753dc0ade Merge: 7746d9c 07e117e Author: Matthew Reynolds <matt.reynolds@climate.com> Date: Mon May 4 18:21:50 2015 +0000 Merging in latest from upstream (MOB/climate-android:refs/heads/master) * commit '07e117e12c8ebbb45d0dda0f0ff487e47d9163d5': Mer…
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch removes the call to 'count' during an agent's processing, which is just an 'is-empty' test, which can also be achieved by a null test on the peek.
Overall, 'count' seems to generate a lot of garbage, the holistic reduction of which would be out-of-scope for a simple patch on a maintenance branch.