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 devel into main #319

Merged
merged 25 commits into from
Jul 11, 2024
Merged

Merge devel into main #319

merged 25 commits into from
Jul 11, 2024

Conversation

aabelean
Copy link
Contributor

@aabelean aabelean commented Jul 11, 2024 •
edited
Loading

  • Summary of changes (Bug fix, feature, docs update, ...)
    Added tutorial and modified some functions.

  • Please check if the PR fulfills these requirements

  • Tests added and passed
  • All code checks passing - styler run over code
  • Vignettes updated/added
  • Added an entry in the latest CHANGELOG.md file if fixing a bug or adding a new feature
  • Any new libraries added to DESCRIPTION

mnky9800n and others added 24 commits March 20, 2024 15:26
@mnky9800n
Update pkgdown.yaml
8363660 
maybe this is why its failing
@aabelean
Update plot_mapping.R
8a3c96c 
Fixed the issue of map not appearing and added options in line with those offered by `mapview`.
@aabelean
Update CHANGELOG.md
85808ba
@mnky9800n
xmatrix source build
71e497a
@mnky9800n
Merge pull request #310 from 4DModeller/306-hydro-tutorial-doesnt-plo…
6afa86c 
…t-shape-file-for-catchment

im merging this even though it fails to build because i am unable to recreate the failure anywhere except on github
@aabelean
Added a check if output only contains random fields
6f0076f
@aabelean
Finn added this to inlabru test workflow (inlabru-org/inlabru@462f2b1#…
378c8d5 
…diff-3522a8c5abb070598236011d60dce0eafc7f1d70261ae9a84917dafcf04d79c8).
@aabelean
Revert addition of package installation
4711201
@aabelean
Modify standard check
1280863
@aabelean
Updated CHANGELOG.md
09d0695
@aabelean
Update CHANGELOG.md
d1e00e6
@mnky9800n
Merge pull request #317 from 4DModeller/Iss315/fix_model_viewer
27322e0 
`model_viewer` random effect-only model support
@mnky9800n
Merge pull request #256 from icetianli/main
42539a3 
Add calving tutorial notebook from 4DModeller workshop
@aabelean
Update references.bib
d1b026f 
Added references for the OHC (Indian Ocean) tutorial
@aabelean
Adding the reference formatting file
87aa348
@aabelean
Add the OHC tutorial
f0fdf19
@aabelean
Update CHANGELOG.md
e5a7e70
@aabelean
Update _pkgdown.yml
3e19124
@aabelean
Update CHANGELOG.md
cec8c9f
@aabelean
Update references.bib
11e5d34
@aabelean
Disable map plots for ohc_tutorial.Rmd
df7e974
@aabelean
Include warnings in ohc_tutorial.Rmd
c6d8c0b
@aabelean
Update ohc_tutorial.Rmd
b7db45f
@mnky9800n
Merge pull request #318 from 4DModeller/tutorialOHC
398852b 
OHC tutorial
@aabelean aabelean marked this pull request as ready for review July 11, 2024 10:30
@aabelean aabelean requested a review from mnky9800n July 11, 2024 11:01
@aabelean aabelean closed this Jul 11, 2024
@aabelean aabelean reopened this Jul 11, 2024
mnky9800n
mnky9800n approved these changes Jul 11, 2024
View reviewed changes
Copy link
Contributor

@mnky9800n mnky9800n left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i approve

@mnky9800n mnky9800n merged commit bd1ab72 into main Jul 11, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mnky9800n mnky9800n mnky9800n approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aabelean @mnky9800n