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

Development master #80

Merged
merged 27 commits into from
May 5, 2023
Merged

Development master #80

merged 27 commits into from
May 5, 2023

Commits on Dec 13, 2022

  1. add 'number' option

    Annabel Westermann authored and Annabel Westermann committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    39a8c9f View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2023

  1. adjust ISRate

    Annabel Westermann authored and Annabel Westermann committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    70c8f52 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. change function

    Annabel Westermann authored and Annabel Westermann committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    552e00f View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. update

    Annabel Westermann authored and Annabel Westermann committed Feb 28, 2023
    Configuration menu
    Copy the full SHA
    493e137 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. tests, documentation and errror handling written for ISRate

    Annabel Westermann authored and Annabel Westermann committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    3faf1a0 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. Merged in updates from v1.4.2.9003 

    Merge branch 'DEVELOPMENT_MASTER' into dev_isr_no5yrbreakdowns

# Conflicts:
#	DESCRIPTION
#	R/ISRate.R
#	R/sysdata.rda
    @PHEgeorginaanderson
    PHEgeorginaanderson committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    90d6754 View commit details
    Browse the repository at this point in the history

  2. deleted random file isr_sheet.csv as not being used.

    @PHEgeorginaanderson
    PHEgeorginaanderson committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    aab9685 View commit details
    Browse the repository at this point in the history

  3. Merged in updates from release v2.0.0 

    Merge branch 'DEVELOPMENT_MASTER' into dev_isr_no5yrbreakdowns

# Conflicts:
#	DESCRIPTION
#	NEWS.md
    @PHEgeorginaanderson
    PHEgeorginaanderson committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    4c713a8 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. Merge branch 'master' into dev_isr_no5yrbreakdowns

    @PHEgeorginaanderson
    PHEgeorginaanderson committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    4340b45 View commit details
    Browse the repository at this point in the history

  2. Updated test following removal of ISRate observed_totals_join_cols ar… 

    …gument.
    @PHEgeorginaanderson
    PHEgeorginaanderson committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    9b94d56 View commit details
    Browse the repository at this point in the history

  3. updated minimum package versions in DECSCRIPTION

    @PHEgeorginaanderson
    PHEgeorginaanderson committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    6dc2ad7 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. Updates from QA - argument definitions, errorhandling check corrected.

    @PHEgeorginaanderson
    PHEgeorginaanderson committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    211d3de View commit details
    Browse the repository at this point in the history

  2. Updated ISRate argument definitions

    @PHEgeorginaanderson
    PHEgeorginaanderson committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    40cbf0a View commit details
    Browse the repository at this point in the history

  3. Amended ISRate test for observed_event argument

    @PHEgeorginaanderson
    PHEgeorginaanderson committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    239429c View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. update ISRatio

    (DHSC) Annabel Westermann authored and (DHSC) Annabel Westermann committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    8c0295b View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2023

  1. update tests

    (DHSC) Annabel Westermann authored and (DHSC) Annabel Westermann committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    16e31dd View commit details
    Browse the repository at this point in the history

  2. Updated for release with updates to ISRatio QAd. Need to fix Covr badge.

    @PHEgeorginaanderson
    PHEgeorginaanderson committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    f45c2ad View commit details
    Browse the repository at this point in the history

  3. removed commented out code from ISRate and ISRatio.

    @PHEgeorginaanderson
    PHEgeorginaanderson committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    b4f4e8b View commit details
    Browse the repository at this point in the history

  4. updated cran comments for release WIP

    @PHEgeorginaanderson
    PHEgeorginaanderson committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    4b1fd5d View commit details
    Browse the repository at this point in the history

  5. Updated version for CRAN testing

    @PHEgeorginaanderson
    PHEgeorginaanderson committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    e9ce8f8 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2023

  1. Updated cran comments and Read me for release. Just GitHub Actions to… 

    … check.
    @PHEgeorginaanderson
    PHEgeorginaanderson committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    757bd74 View commit details
    Browse the repository at this point in the history

  2. Removed redundant comments from calculate_ISRate and calculate_ISRatio

    @PHEgeorginaanderson
    PHEgeorginaanderson committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    5f76c3f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #77 from ukhsa-collaboration/dev_isr_no5yrbreakdowns 

    Dev isr no5yrbreakdowns
    @PHEgeorginaanderson
    PHEgeorginaanderson committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    c7c9f1a View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. Update test-coverage.yaml 

    Updated to match fingertipscharts.
    @PHEgeorginaanderson
    PHEgeorginaanderson committed May 5, 2023
    Configuration menu
    Copy the full SHA
    b01397a View commit details
    Browse the repository at this point in the history

  2. Update R-CMD-check.yaml 

    Applied R CMD check workflow from https://github.com/ukhsa-collaboration/r-lib-actions/tree/v2/examples
    @PHEgeorginaanderson
    PHEgeorginaanderson committed May 5, 2023
    Configuration menu
    Copy the full SHA
    60559d7 View commit details
    Browse the repository at this point in the history

  3. Update test-coverage.yaml 

    Updated from https://github.com/ukhsa-collaboration/r-lib-actions/blob/v2-branch/.github/workflows/test-coverage.yaml
    @PHEgeorginaanderson
    PHEgeorginaanderson committed May 5, 2023
    Configuration menu
    Copy the full SHA
    7c52027 View commit details
    Browse the repository at this point in the history

  4. Update test-coverage.yaml 

    Removed redundant footer text from test-coverage.yaml GitHub Action workflow.
    @PHEgeorginaanderson
    PHEgeorginaanderson committed May 5, 2023
    Configuration menu
    Copy the full SHA
    7e6e976 View commit details
    Browse the repository at this point in the history