79 v113 to main #80
Merged
79 v113 to main #80
Conversation
This file contains hidden or 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
…g sizes, added exposision.
…aders within the vignette. Corrected typos.
Updated introduction, rearranged ordering of examples, updated headin…
…he file. Merge branch 'dev' into 42-rename-vignette-files-for-correct-cran-ordering # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
…t-cran-ordering 42 rename vignette files for correct cran ordering
…or specified DTXSID or Medium. Also added function for retrieving Medium categories.
…documentation Update chemical search resource documentation #52
…mical-details-resource-endpoints 46 add new projection values to chemical details resource endpoints
…ch and chemical_equal/chemical_contains_batch #56
…r-if-a-casrn-doesnt-return-any-results chemical_equal_batch() throws error if a CASRN doesn't return any results #53
…emical_containschemical_contains_batch-and-chemical_equalchemical_contains_batch Special character handling by chemical_contains/chemical_contains_batch and chemical_equal/chemical_contains_batch #56
Updated PR to merge main into dev
65 add citation for new ctxr paper
Merge branch 'dev' into 49-add-functions-for-new-exposure-endpoints # Conflicts: # inst/httptest/request.R # vignettes/2/0/ctx/chemical/detail/search/by-dtxsid-9e51f1-1f4023-POST.json # vignettes/2/0/ctx/chemical/detail/search/by-dtxsid-9e51f1-5aa7b6-POST.json # vignettes/2/0/ctx/chemical/detail/search/by-dtxsid-9e51f1-b88611-POST.json # vignettes/2/0/ctx/chemical/detail/search/by-dtxsid-9e51f1-e50b51-POST.json # vignettes/2/0/ctx/cls/by-name/CCL4.json # vignettes/2/0/ctx/cls/by-name/NATADB.json # vignettes/3/0/chemical/detail/search/by-dtxsid-9e51f1-975bfd-POST.json # vignettes/3/0/chemical/detail/search/by-dtxsid-9e51f1-efb7c3-POST.json # vignettes/3/0/chemical/list/search/by-name/CCL4-8b6df7.json # vignettes/3/0/chemical/list/search/by-name/NATADB-8b6df7.json # vignettes/3/0/ctx/hazard/genetox/details/search/by-dtxsid-9e90b5-POST.json # vignettes/3/0/hazard/genetox/details/search/by-dtxsid-355bc3-POST.json # vignettes/3/0/hazard/genetox/summary/search/by-dtxsid-355bc3-POST.json # vignettes/3/0/hazard/genetox/summary/search/by-dtxsid-9e90b5-POST.json
…ndpoints 49 add functions for new exposure endpoints
Merging then submitting v1.1.3 to CRAN!
…74-v113-release
74 v113 release
Fixed links that were broken and adjusted exposition accordingly.
Resolve CRAN issues then resubmit
Collaborator
Author
|
Just merging since squash and merge into main will actually create pseudo merge conflicts and versions are already tagged. When we have multiple commits on individual for PRs going into dev branch, we should consider the "Squash and merge" option. |
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.
Updating main branch to reflect CRAN release of v1.1.3. Will squash and merge with description of release: