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

Refactor standard stages2 #96

Closed
wants to merge 35 commits into from
Closed

Refactor standard stages2 #96

wants to merge 35 commits into from

Commits on Feb 15, 2021

  1. Merge pull request jonesor#2 from jonesor/devel 

    re-sync branches
    @levisc8
    levisc8 committed Feb 15, 2021
    Copy the full SHA
    6bc5dca View commit details
    Browse the repository at this point in the history

  2. Merge pull request jonesor#3 from jonesor/master 

    re-sync master
    @levisc8
    levisc8 committed Feb 15, 2021
    Copy the full SHA
    c086ac5 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2021

  1. Merge pull request jonesor#4 from jonesor/master 

    sync branchs
    @levisc8
    levisc8 committed Feb 16, 2021
    Copy the full SHA
    9e187fd View commit details
    Browse the repository at this point in the history

  2. Merge pull request jonesor#5 from jonesor/devel 

    sync devel branches
    @levisc8
    levisc8 committed Feb 16, 2021
    Copy the full SHA
    08e877c View commit details
    Browse the repository at this point in the history

  3. vr_vec_fecundity -> vr_vec_reproduction

    @levisc8
    levisc8 committed Feb 16, 2021
    Copy the full SHA
    e05cfa2 View commit details
    Browse the repository at this point in the history

  4. Update standard_stages.R

    @PolCap
    PolCap committed Feb 16, 2021
    Copy the full SHA
    33ef52a View commit details
    Browse the repository at this point in the history

  5. bump tests to most recent version of testthat

    @levisc8
    levisc8 committed Feb 16, 2021
    Copy the full SHA
    a9ea667 View commit details
    Browse the repository at this point in the history

  6. clarify isErgodic source

    @levisc8
    levisc8 committed Feb 16, 2021
    Copy the full SHA
    7fde1ad View commit details
    Browse the repository at this point in the history

  7. newline EOF

    @levisc8
    levisc8 committed Feb 16, 2021
    Copy the full SHA
    d45cefb View commit details
    Browse the repository at this point in the history

  8. Update mpm_to_.R

    @PolCap
    PolCap committed Feb 16, 2021
    Copy the full SHA
    7261c99 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'devel' into PolFunctions

    @jonesor
    jonesor committed Feb 16, 2021
    Copy the full SHA
    e76c265 View commit details
    Browse the repository at this point in the history

  10. Merge pull request jonesor#88 from PolCap/PolFunctions 

    Pol functions
    @jonesor
    jonesor committed Feb 16, 2021
    Copy the full SHA
    4dd56fc View commit details
    Browse the repository at this point in the history

  11. Checked and corrected consistency of function documentation

    Owen Jones committed Feb 16, 2021
    Copy the full SHA
    18dc962 View commit details
    Browse the repository at this point in the history

  12. edits day 2 

    Merge branch 'scl_edit_d2'
    @levisc8
    levisc8 committed Feb 16, 2021
    Copy the full SHA
    9da7735 View commit details
    Browse the repository at this point in the history

  13. Update TernaryPlots.Rmd 

    Half way working through the narrative. I'm also going to have to update the fucntions, as these are no longer part of Rage
    @RobSalGo
    RobSalGo committed Feb 16, 2021
    Copy the full SHA
    cef2d41 View commit details
    Browse the repository at this point in the history

  14. Added package repository status badge 

    Added repo status badge from here:
https://www.repostatus.org.
Currently Work In Progress
    Owen Jones committed Feb 16, 2021
    Copy the full SHA
    8035e9e View commit details
    Browse the repository at this point in the history

  15. Added Orcids for authors

    Owen Jones committed Feb 16, 2021
    Copy the full SHA
    9fe7896 View commit details
    Browse the repository at this point in the history

  16. Update README.Rmd 

    Minor text edit
    Owen Jones committed Feb 16, 2021
    Copy the full SHA
    e9222e0 View commit details
    Browse the repository at this point in the history

  17. getting-started adding matrix component definitions

    @jjackson-eco
    jjackson-eco committed Feb 16, 2021
    Copy the full SHA
    57b3579 View commit details
    Browse the repository at this point in the history

  18. final document() run

    @levisc8
    levisc8 committed Feb 16, 2021
    Copy the full SHA
    32293f0 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'devel' into scl_edits_d2

    @levisc8
    levisc8 committed Feb 16, 2021
    Copy the full SHA
    69c040d View commit details
    Browse the repository at this point in the history

  20. AgeFromStage now builds correctly, and contains examples of mpm_to_lx… 

    … and mpm_to_mx
    @levisc8
    levisc8 committed Feb 16, 2021
    Copy the full SHA
    5ebbb00 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'scl_edits_d2' of https://github.com/levisc8/Rage into s… 

    …cl_edits_d2
    @levisc8
    levisc8 committed Feb 16, 2021
    Copy the full SHA
    4847880 View commit details
    Browse the repository at this point in the history

  22. Merge pull request jonesor#91 from levisc8/scl_edits_d2 

    Scl edits d2
    @jonesor
    jonesor committed Feb 16, 2021
    Copy the full SHA
    44ba570 View commit details
    Browse the repository at this point in the history

  23. Update TernaryPlots.Rmd 

    updated vital rate perturbations. We need to talk about matrix element perturbations Owen
    @RobSalGo
    RobSalGo committed Feb 16, 2021
    Copy the full SHA
    514a513 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'devel' of https://github.com/jonesor/Rage into devel

    @RobSalGo
    RobSalGo committed Feb 16, 2021
    Copy the full SHA
    c711a01 View commit details
    Browse the repository at this point in the history

  25. Merge pull request jonesor#7 from jonesor/devel 

    sync branches
    @levisc8
    levisc8 committed Feb 16, 2021
    Copy the full SHA
    1a8fc58 View commit details
    Browse the repository at this point in the history

  26. ignore test artefacts

    @levisc8
    levisc8 committed Feb 16, 2021
    Copy the full SHA
    48a8efd View commit details
    Browse the repository at this point in the history

  27. tweak life expect to be a bit less noisy

    @levisc8
    levisc8 committed Feb 16, 2021
    Copy the full SHA
    8047f16 View commit details
    Browse the repository at this point in the history

  28. check errors and notes

    @levisc8
    levisc8 committed Feb 16, 2021
    Copy the full SHA
    03ef905 View commit details
    Browse the repository at this point in the history

  29. fix 1 of the warnings from as.person in DESCRIPTION check

    @levisc8
    levisc8 committed Feb 16, 2021
    Copy the full SHA
    a5090ab View commit details
    Browse the repository at this point in the history

  30. Merge branch 'getting-started' of https://github.com/jjackson-eco/Rage … 

    …into jjackson-eco-getting-started

Adding the changes made by John.
    Owen Jones committed Feb 16, 2021
    Copy the full SHA
    3f993e2 View commit details
    Browse the repository at this point in the history

  31. Merge branch 'jjackson-eco-getting-started' into devel 

    Adding John's changes to devel.
    Owen Jones committed Feb 16, 2021
    Copy the full SHA
    7ec86ba View commit details
    Browse the repository at this point in the history

  32. Merge pull request jonesor#92 from levisc8/pass_check 

    Pass check
    @jonesor
    jonesor committed Feb 16, 2021
    Copy the full SHA
    b5907af View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2021

  1. Modify error messages in standard_stages 

    Modify error messages to make clearer and adjust spelling.
    @tdjames1
    tdjames1 committed Feb 17, 2021
    Copy the full SHA
    a5a1d46 View commit details
    Browse the repository at this point in the history