Skip to content

Commit

Permalink
Merge pull request #421 in MOB/climate-android from ~CHRIS.PICK/clima…
Browse files Browse the repository at this point in the history 
…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…
  • Loading branch information
Christopher Pick committed Jul 31, 2015
1 parent 8e87bf3 commit 744bca5
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 23 deletions.
6 changes: 4 additions & 2 deletions ClimateGrowersProject/ClimateGrowersApp/build.gradle
View file
Expand Up @@ -55,7 +55,7 @@ android {
minSdkVersion 14
targetSdkVersion 21
versionCode System.getenv("BUILD_NUMBER") as Integer ?: 12
versionName "2.3.1"
versionName "2.3.1.2"
multiDexEnabled true

testApplicationId "com.climate.growers.android.tests"
Expand Down Expand Up @@ -240,6 +240,9 @@ dependencies {
compile 'com.android.support:appcompat-v7:21.0.3'
compile 'org.json:org.json:chargebee-1.0'
compile 'org.wololo:jts2geojson:0.5.0'
compile 'com.climate.homestead:homestead-android:29'
compile 'com.climate.homestead:mfs-android:29'
compile 'com.climate.moriarty:moriarty-android:29'
compile 'com.climate.android.mirageext:mirage-ext:32d1c7b@aar'
// develop version of notifications still not on build # on jenkins
compile 'com.climate.android.reflectionsql:reflectionsql:26@aar'
Expand All @@ -250,7 +253,6 @@ dependencies {
compile 'com.climate.homestead:homestead-android:30'
compile 'com.climate.homestead:mfs-android:30'
compile 'com.climate.moriarty:moriarty-android:30'

}

spoon {
Expand Down
35 changes: 27 additions & 8 deletions ...t/ClimateGrowersApp/src/main/java/com/climate/growers/android/biz/ClimateBaseRequest.java
View file
Expand Up @@ -3,6 +3,7 @@
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import android.util.Log;
import android.widget.Toast;
Expand All @@ -17,6 +18,7 @@
import com.climate.growers.android.R;
import com.climate.growers.android.ui.ClimateApplication;
import com.climate.growers.android.ui.login.LoginActivity;
import com.crashlytics.android.Crashlytics;

import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
Expand Down Expand Up @@ -87,14 +89,31 @@ public void deliverError(VolleyError error) {
// meh
if (error.networkResponse != null &&
error.networkResponse.statusCode == 401) {
if (context.getApplicationContext() instanceof ClimateApplication) {
ClimateApplication app = (ClimateApplication)context.getApplicationContext();
app.clearMemory();
}
AuthTokenHelper.deleteAuthToken(context);
Intent intent = LoginActivity.createStartActivityIntent(context);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
context.startActivity(intent);
Crashlytics.log("Base Request null or 401");

Log.e("ClimateBaseRequest","Base Request null or 401");

// This is being thrown onto the main looper (i.e. the UI Thread) as we are getting a
// race condition during fragment inflation (i.e. UI Thread) where this is running on
// a separate thread and deleting the auth token between a null check and accessing the
// auth object. This will post it to the UI thread, and effectively queue it either
// before or after our race condition.
// "We are getting a race condition where the UI thread accesses the login object"
// "Effectively queue it before the login object it accessed by the other thread".
Handler handler = new Handler(Looper.getMainLooper());
handler.post(new Runnable() {
public void run() {
if (context.getApplicationContext() instanceof ClimateApplication) {
ClimateApplication app = (ClimateApplication) context.getApplicationContext();
app.clearMemory();
}
AuthTokenHelper.deleteAuthToken(context);
Intent intent = LoginActivity.createStartActivityIntent(context);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
context.startActivity(intent);
}
});

}
}

Expand Down
1 change: 1 addition & 0 deletions ...rowersApp/src/main/java/com/climate/growers/android/ui/content/DashboardListFragment.java
View file
Expand Up @@ -482,6 +482,7 @@ public void onResponse(ClimateResponse<VersionData> response) {
PlayStoreDialogFragment dialogFragment = new PlayStoreDialogFragment();
Bundle args = new Bundle();
args.putBoolean(PlayStoreDialogFragment.EXTRA_MANDATORY, majorMandatoryVersion > appMajorVersion);
// FIXME: Need to make sure that app is visible when we display this (this happens if we try to launch while screen locked).
dialogFragment.setArguments(args);
getActivity().getSupportFragmentManager().beginTransaction().add(dialogFragment, "playStoreDialog").commit();
}
Expand Down
29 changes: 18 additions & 11 deletions ...GrowersApp/src/main/java/com/climate/growers/android/ui/content/DashboardMapFragment.java
View file
Expand Up @@ -360,11 +360,18 @@ public void onRequestAnimationState() {
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
scoutingConfig = new ScoutingLibraryConfiguration.Builder(getActivity())
.setTracker(getManagers().getTracker())
.setBaseURL(getString(R.string.scouting_url))
.setUserId(getManagers().getStoreManager().getLogin().getLongUserId())
.build();

}

private ScoutingLibraryConfiguration getScoutingConfig() {
if (scoutingConfig == null && getManagers().getStoreManager().getLogin() != null) {
scoutingConfig = new ScoutingLibraryConfiguration.Builder(getActivity())
.setTracker(getManagers().getTracker())
.setBaseURL(getString(R.string.scouting_url))
.setUserId(getManagers().getStoreManager().getLogin().getLongUserId())
.build();
}
return scoutingConfig;
}

private void bindLegendVisibility(boolean isVisible, int selectedWeatherType) {
Expand Down Expand Up @@ -508,8 +515,8 @@ protected void requeststartNewScoutingActivity() {
isLocationRequestPending = true;
googleApiClient.connect();
} else {
if (getCurrentLocation() == null ) {
Intent intent = NewScoutingReportActivity.createStartIntent(getActivity(), false, scoutingConfig);
if (getCurrentLocation() == null && getScoutingConfig() != null) {
Intent intent = NewScoutingReportActivity.createStartIntent(getActivity(), false, getScoutingConfig());
startActivity(intent);
}
else {
Expand Down Expand Up @@ -570,14 +577,14 @@ private Location getCurrentLocation() {

private void startNewScoutingActivity(Location location, FieldSummary summary)
{
if (location != null && summary != null) {
if (location != null && summary != null && getScoutingConfig() != null) {
ScoutingActivityInfo scoutingActivityInfo = new ScoutingActivityInfo();
scoutingActivityInfo.setLongitude(location.getLongitude());
scoutingActivityInfo.setLatitude(location.getLatitude());
scoutingActivityInfo.setFieldId(summary.getGroupId());
scoutingActivityInfo.setFieldName(summary.getName());

Intent intent = NewScoutingReportActivity.createStartIntent(getActivity(), scoutingActivityInfo, true, scoutingConfig);
Intent intent = NewScoutingReportActivity.createStartIntent(getActivity(), scoutingActivityInfo, true, getScoutingConfig());
startActivity(intent);
} else {
Toast.makeText(getClimateApplication(), R.string.no_fields_message, Toast.LENGTH_LONG).show();
Expand Down Expand Up @@ -883,8 +890,8 @@ public void onConnected(Bundle bundle) {
super.onConnected(bundle);

if (isLocationRequestPending) {
if ((getCurrentLocation() == null) && (getActivity()!= null)) {
Intent intent = NewScoutingReportActivity.createStartIntent(getActivity(), false, scoutingConfig);
if ((getCurrentLocation() == null) && (getActivity()!= null) && (getScoutingConfig() != null)) {
Intent intent = NewScoutingReportActivity.createStartIntent(getActivity(), false, getScoutingConfig());
startActivity(intent);
}
else {
Expand Down
2 changes: 1 addition & 1 deletion ClimateGrowersProject/ClimateGrowersApp/src/main/res/values/environment.xml
View file
Expand Up @@ -16,7 +16,7 @@
<!--<string name="base_url">https://api.climate.com/apps/mobile</string>-->
<string name="base_radar_tile_url">http://climate.com</string>
<string name="tile_server_base_url">http://climatecorp.wdtinc.com</string>
<string name="tile_radar_server_base_url">http://api.climate.com/assets/future-radar</string>
<string name="tile_radar_server_base_url">https://static.climate.com/assets/future-radar</string>
<string name="flurry_api_key">686K2Z4TJ4SP7NB8YTGQ</string>
<string name="forgot_password_url">https://qa1-api.climate.com/apps/users/password</string>
<string name="notifications_base_url">https://qa1.climate.com/api/notifications</string>
Expand Down
2 changes: 1 addition & 1 deletion ClimateGrowersProject/ClimateGrowersApp/src/release/res/values/environment.xml
View file
Expand Up @@ -6,7 +6,7 @@
<string name="base_url">https://api.climate.com/apps/mobile</string>
<string name="thumbnail_service_url">https://api.climate.com/api/thumbnail/v1</string>
<string name="weather_service_url">https://api.climate.com/api/weather/v1</string>
<string name="tile_radar_server_base_url">http://api.climate.com/assets/future-radar</string>
<string name="tile_radar_server_base_url">https://static.climate.com/assets/future-radar</string>
<string name="nitrogen_advisor_url">@string/nitrogen_advisor_base_url_release</string>
<string name="na_sync_authority">@string/na_sync_authority_release</string>
<string name="flurry_api_key">HT4W8N7HKPHCMBJ99ZPW</string>
Expand Down

0 comments on commit 744bca5

Please sign in to comment.