Develop #260
Closed
Develop #260
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[skip ci]
* spelling fixes and removing special Mac install instructions * adding mac back into CI
* Added example for default_version, updated LICENSE year, added R CMD CHECK results * Comment about Tidy and Mac and HTML validation * Updated CITATION file * Updated version numbers
* Added example for default_version, updated LICENSE year, added R CMD CHECK results * Comment about Tidy and Mac and HTML validation * Updated CITATION file * Updated version numbers * Removed auto package version in citation * Updated CRAN comments * Fixed typo in CITATION * Resubmitted --------- Co-authored-by: Fonti Kar <f.kar@unsw.edu.au>
merging master back into develop to correct mistake
* dealing with cran and CI issues (#236) * Bump version number (1.0.0.9000) [skip ci] * spelling fixes and removing special Mac install instructions (#229) * spelling fixes and removing special Mac install instructions * adding mac back into CI * Cran preparations (#230) * Added example for default_version, updated LICENSE year, added R CMD CHECK results * Comment about Tidy and Mac and HTML validation * Updated CITATION file * Updated version numbers * cleaning up (#231) * Added example for default_version, updated LICENSE year, added R CMD CHECK results * Comment about Tidy and Mac and HTML validation * Updated CITATION file * Updated version numbers * Removed auto package version in citation * Updated CRAN comments * Fixed typo in CITATION * Resubmitted --------- Co-authored-by: Fonti Kar <f.kar@unsw.edu.au> * fixing badges * Tweaks (#234) * fix example * fix vignette paths * testing for issue #235 * still working on #235 * one more try to find the edge case * another edge case? * reformat code in release file * another edge case * reverting previous commit to documentation * adding check on resources to all functions that need resources * bumping version number and updating readme * missed two checking spots --------- Co-authored-by: Daniel Falster <daniel.falster@unsw.edu.au> Co-authored-by: Fonti Kar <f.kar@unsw.edu.au> Co-authored-by: Dave Slager <slager@users.noreply.github.com> * Update new * fixing bug in hidden function and re-naming a bit * adding new genus in family function * testing? * namespaces * testing testing * forgot how namespaces work * so many details *sigh* --------- Co-authored-by: Daniel Falster <daniel.falster@unsw.edu.au> Co-authored-by: Fonti Kar <f.kar@unsw.edu.au> Co-authored-by: Dave Slager <slager@users.noreply.github.com>
Merge branch 'master' into develop # Conflicts: # NEWS.md
Merge branch 'master' into develop
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
merging to main