Skip to content
New issue

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

Sign up for GitHub

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

Jump to bottom

updating master #3

Merged
merged 48 commits into from
Aug 18, 2017
Merged

updating master #3

merged 48 commits into from
Aug 18, 2017

Commits on Jun 19, 2017

  1. End of Rains update

    Lily authored and Lily committed Jun 19, 2017
    Configuration menu
    Copy the full SHA
    55d7121 View commit details
    Browse the repository at this point in the history

  2. fix

    Lily authored and Lily committed Jun 19, 2017
    Configuration menu
    Copy the full SHA
    d50a90b View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2017

  1. Merge pull request #594 from lilyclements/frmMain 

    End of Rains
    @lilyclements
    lilyclements authored Jun 23, 2017
    Configuration menu
    Copy the full SHA
    84354a2 View commit details
    Browse the repository at this point in the history

  2. eor

    Lily authored and Lily committed Jun 23, 2017
    Configuration menu
    Copy the full SHA
    914139d View commit details
    Browse the repository at this point in the history

  3. Water Balance update

    Lily authored and Lily committed Jun 23, 2017
    Configuration menu
    Copy the full SHA
    5389d57 View commit details
    Browse the repository at this point in the history

  4. WB update

    Lily authored and Lily committed Jun 23, 2017
    Configuration menu
    Copy the full SHA
    f5439c1 View commit details
    Browse the repository at this point in the history

  5. function_exp, str fixes

    Lily authored and Lily committed Jun 23, 2017
    Configuration menu
    Copy the full SHA
    2adb8ae View commit details
    Browse the repository at this point in the history

  6. Water balance update

    Lily authored and Lily committed Jun 23, 2017
    Configuration menu
    Copy the full SHA
    51177f0 View commit details
    Browse the repository at this point in the history

  7. EoR

    Lily authored and Lily committed Jun 23, 2017
    Configuration menu
    Copy the full SHA
    e6e2ade View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2017

  1. Water Balance completion

    Lily authored and Lily committed Jun 25, 2017
    Configuration menu
    Copy the full SHA
    2599a98 View commit details
    Browse the repository at this point in the history

  2. Water balance tweaks

    Lily authored and Lily committed Jun 25, 2017
    Configuration menu
    Copy the full SHA
    746088c View commit details
    Browse the repository at this point in the history

  3. End of Rains started

    Lily authored and Lily committed Jun 25, 2017
    Configuration menu
    Copy the full SHA
    e2da1aa View commit details
    Browse the repository at this point in the history

  4. Water balance fix

    Lily authored and Lily committed Jun 25, 2017
    Configuration menu
    Copy the full SHA
    03fbdcd View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2017

  1. Merge pull request #597 from africanmathsinitiative/master 

    merge from mc
    @lilyclements
    lilyclements authored Jun 27, 2017
    Configuration menu
    Copy the full SHA
    b6b201c View commit details
    Browse the repository at this point in the history

  2. Update

    Lily authored and Lily committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    866dd98 View commit details
    Browse the repository at this point in the history

  3. Fixes/update

    Lily authored and Lily committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    62f2587 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2017

  1. headings

    Lily authored and Lily committed Jul 3, 2017
    Configuration menu
    Copy the full SHA
    26f248e View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2017

  1. Merge pull request #621 from lilyclements/frmMain 

    Merge from MC
    @lilyclements
    lilyclements authored Jul 10, 2017
    Configuration menu
    Copy the full SHA
    13529cc View commit details
    Browse the repository at this point in the history

  2. testok fix

    Lily authored and Lily committed Jul 10, 2017
    Configuration menu
    Copy the full SHA
    52a4b8c View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2017

  1. Merge pull request #626 from africanmathsinitiative/master 

    merge from mc
    @lilyclements
    lilyclements authored Jul 15, 2017
    Configuration menu
    Copy the full SHA
    e898f6b View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2017

  1. Merge pull request #640 from lilyclements/frmMain 

    merge from mc
    @lilyclements
    lilyclements authored Jul 17, 2017
    Configuration menu
    Copy the full SHA
    180852f View commit details
    Browse the repository at this point in the history

  2. Removing End of Rains to make just Water Balance

    Lily authored and Lily committed Jul 17, 2017
    Configuration menu
    Copy the full SHA
    3974b89 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2017

  1. Revert commit

    Lily authored and Lily committed Jul 20, 2017
    Configuration menu
    Copy the full SHA
    1c8a38c View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2017

  1. fixes

    Lily authored and Lily committed Jul 26, 2017
    Configuration menu
    Copy the full SHA
    a48a962 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2017

  1. Merge pull request #671 from africanmathsinitiative/master 

    merge from mc
    @lilyclements
    lilyclements authored Aug 14, 2017
    Configuration menu
    Copy the full SHA
    c64b7f4 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2017

  1. Merge pull request #673 from africanmathsinitiative/master 

    merge from mc
    @lilyclements
    lilyclements authored Aug 15, 2017
    Configuration menu
    Copy the full SHA
    a568522 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2017

  1. Merge pull request #674 from africanmathsinitiative/master 

    merge from mc
    @lilyclements
    lilyclements authored Aug 16, 2017
    Configuration menu
    Copy the full SHA
    d4f75f0 View commit details
    Browse the repository at this point in the history

  2. fixes

    Lily authored and Lily committed Aug 16, 2017
    Configuration menu
    Copy the full SHA
    6387f91 View commit details
    Browse the repository at this point in the history

  3. layout edits

    Lily authored and Lily committed Aug 16, 2017
    Configuration menu
    Copy the full SHA
    6893eec View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2017

  1. Merge pull request #750 from africanmathsinitiative/master 

    merge from main
    @dannyparsons
    dannyparsons authored Aug 17, 2017
    Configuration menu
    Copy the full SHA
    cc1692b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #675 from africanmathsinitiative/master 

    merge from mc
    @lilyclements
    lilyclements authored Aug 17, 2017
    Configuration menu
    Copy the full SHA
    60847dd View commit details
    Browse the repository at this point in the history

  3. parameter positions

    Lily authored and Lily committed Aug 17, 2017
    Configuration menu
    Copy the full SHA
    662833f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3819 from lilyclements/frmMain 

    SoR - parameter positions
    @dannyparsons
    dannyparsons authored Aug 17, 2017
    Configuration menu
    Copy the full SHA
    2265954 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #751 from africanmathsinitiative/master 

    merge from main
    @dannyparsons
    dannyparsons authored Aug 17, 2017
    Configuration menu
    Copy the full SHA
    2334f1f View commit details
    Browse the repository at this point in the history

  6. Reset fix

    shadrack kibet committed Aug 17, 2017
    Configuration menu
    Copy the full SHA
    cfbb8a5 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2017

  1. added randomness and messages to waiting dialog

    @dannyparsons
    dannyparsons committed Aug 18, 2017
    Configuration menu
    Copy the full SHA
    f2223c8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3477 from lilyclements/EndOfRains 

    End of rains
    @dannyparsons
    dannyparsons authored Aug 18, 2017
    Configuration menu
    Copy the full SHA
    4d0f186 View commit details
    Browse the repository at this point in the history

  3. rewording one message

    @dannyparsons
    dannyparsons committed Aug 18, 2017
    Configuration menu
    Copy the full SHA
    27a2cbe View commit details
    Browse the repository at this point in the history

  4. changes to wording of messages

    @dannyparsons
    dannyparsons committed Aug 18, 2017
    Configuration menu
    Copy the full SHA
    c6584eb View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3820 from dannyparsons/waiting 

    added randomness and messages to waiting dialog
    @dannyparsons
    dannyparsons authored Aug 18, 2017
    Configuration menu
    Copy the full SHA
    8d1617c View commit details
    Browse the repository at this point in the history

  6. Merge pull request #752 from africanmathsinitiative/master 

    merge from main
    @dannyparsons
    dannyparsons authored Aug 18, 2017
    Configuration menu
    Copy the full SHA
    113c472 View commit details
    Browse the repository at this point in the history

  7. added some IRLI data to library

    @dannyparsons
    dannyparsons committed Aug 18, 2017
    Configuration menu
    Copy the full SHA
    4183788 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #3825 from dannyparsons/irli 

    added ILRI data sets to library
    @dannyparsons
    dannyparsons authored Aug 18, 2017
    Configuration menu
    Copy the full SHA
    901c54e View commit details
    Browse the repository at this point in the history

  9. Merge pull request #753 from africanmathsinitiative/master 

    merge from main
    @dannyparsons
    dannyparsons authored Aug 18, 2017
    Configuration menu
    Copy the full SHA
    4657f8c View commit details
    Browse the repository at this point in the history

  10. updated R packages and added library dialog packages

    @dannyparsons
    dannyparsons committed Aug 18, 2017
    Configuration menu
    Copy the full SHA
    9bee545 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #3826 from dannyparsons/packsupdate 

    updated R packages
    @dannyparsons
    dannyparsons authored Aug 18, 2017
    Configuration menu
    Copy the full SHA
    1ca7e73 View commit details
    Browse the repository at this point in the history

  12. Renaming a panel and setting receiver focus.

    shadrack kibet committed Aug 18, 2017
    Configuration menu
    Copy the full SHA
    b709cde View commit details
    Browse the repository at this point in the history

  13. Merge pull request #3818 from shadrackkibet/climaticSummary 

    Climatic Summary
    @dannyparsons
    dannyparsons authored Aug 18, 2017
    Configuration menu
    Copy the full SHA
    9c4b897 View commit details
    Browse the repository at this point in the history