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

merge from main #39

Merged
merged 32 commits into from
Jan 30, 2016
Merged

merge from main #39

merged 32 commits into from
Jan 30, 2016

Commits on Jan 29, 2016

  1. Merge pull request #10 from africanmathsinitiative/master 

    updating my repo
    @nyagishira
    nyagishira committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    ccb6a02 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #11 from africanmathsinitiative/master 

    updating my repo
    @nyagishira
    nyagishira committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    641b664 View commit details
    Browse the repository at this point in the history

  3. Tagging and fixing naming convention

    Mary Mutahi committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    eb21a7c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #12 from africanmathsinitiative/master 

    updating my repo
    @nyagishira
    nyagishira committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    ecaf56d View commit details
    Browse the repository at this point in the history

  5. customizing ucrBase

    Mary Mutahi committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    0654f77 View commit details
    Browse the repository at this point in the history

  6. Customizing ucrBase

    Mary Mutahi committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    d9432dd View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dlgWindrose'

    Mary Mutahi committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    e1fb2db View commit details
    Browse the repository at this point in the history

  8. customizing ucrBase

    Mary Mutahi committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    0997201 View commit details
    Browse the repository at this point in the history

  9. customizing ucrBase

    Mary Mutahi committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    f195f8e View commit details
    Browse the repository at this point in the history

  10. customizing ucrBase

    Mary Mutahi committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    d1ca333 View commit details
    Browse the repository at this point in the history

  11. correcting naming convention requirements

    Mary Mutahi committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    61189b5 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #615 from nyagishira/sdgBoxplot 

    sdgBoxplot-taging and fixing naming conventions
    @dannyparsons
    dannyparsons committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    c7118bf View commit details
    Browse the repository at this point in the history

  13. Merge pull request #616 from nyagishira/dlgWindrose 

    dlgWindrose-customizing ucrBase
    @dannyparsons
    dannyparsons committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    50a6b73 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #617 from nyagishira/dlgWaterSatisfactionIndex 

    dlgWaterSatisfactionIndex-customizing ucrBase
    @dannyparsons
    dannyparsons committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    c3f5acd View commit details
    Browse the repository at this point in the history

  15. Merge pull request #618 from nyagishira/dlgWaterBalance 

    dlgWaterBalance-customizing ucrBase
    @dannyparsons
    dannyparsons committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    e9cd9bf View commit details
    Browse the repository at this point in the history

  16. Merge pull request #619 from nyagishira/dlgYearRainCount 

    dlgYearRaincount-customizing ucrBase
    @dannyparsons
    dannyparsons committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    b874d62 View commit details
    Browse the repository at this point in the history

  17. correcting on naming convention

    Mary Mutahi committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    68acb40 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #620 from nyagishira/dlgUnstackDailyData 

    dlgUnstackDailyData-customizing ucrBase
    @dannyparsons
    dannyparsons committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    4396941 View commit details
    Browse the repository at this point in the history

  19. Merge pull request #621 from nyagishira/dlgUnstack 

    dlgUnstack-correcting naming convention requirements
    @dannyparsons
    dannyparsons committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    8eba7ba View commit details
    Browse the repository at this point in the history

  20. Merge pull request #622 from nyagishira/dlgTransform 

    dlgTransform-correcting on naming convention requirements
    @dannyparsons
    dannyparsons committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    8a15299 View commit details
    Browse the repository at this point in the history

  21. customizing and naming ucrBase

    Mary Mutahi committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    727e424 View commit details
    Browse the repository at this point in the history

  22. customizing ucrBase

    Mary Mutahi committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    d4b1b40 View commit details
    Browse the repository at this point in the history

  23. customizing ucrBase

    Mary Mutahi committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    53d2be3 View commit details
    Browse the repository at this point in the history

  24. naming

    Mary Mutahi committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    03d9533 View commit details
    Browse the repository at this point in the history

  25. updating multiple receiver

    @dannyparsons
    dannyparsons committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    70d9e76 View commit details
    Browse the repository at this point in the history

  26. adding a ucrBase in the dialog

    Mary Mutahi committed Jan 29, 2016
    Configuration menu
    Copy the full SHA
    6e8fec6 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2016

  1. updated receivers and use on Stack

    @dannyparsons
    dannyparsons committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    a60d87f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #634 from dannyparsons/dialogs_with_new_receiver_code 

    Updated receivers and corrected on dlgStack
    @dannyparsons
    dannyparsons committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    bd0df82 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #623 from nyagishira/dlgTotals 

    customizing and naming ucrBase
    @dannyparsons
    dannyparsons committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    f60051f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #624 from nyagishira/dlgTimeSeriesPlot 

    dlgTimeSeriesPlot-customizing ucrBase
    @dannyparsons
    dannyparsons committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    06d1ebe View commit details
    Browse the repository at this point in the history

  5. Merge pull request #625 from nyagishira/dlgThreeSummaries 

    dlgThreeSummaries-customizing ucrBase
    @dannyparsons
    dannyparsons committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    9d89e68 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #626 from nyagishira/dlgSummary 

    dlgSummary-adding a ucrBase
    @dannyparsons
    dannyparsons committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    430cda1 View commit details
    Browse the repository at this point in the history