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

GitFlow: Merge Develop into main for release #255

Merged
merged 12 commits into from
Aug 17, 2023
Merged

GitFlow: Merge Develop into main for release #255

merged 12 commits into from
Aug 17, 2023

Commits on Aug 2, 2023

  1. Update zenodo.json

    @mathomp4
    mathomp4 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    93098c7 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Merge pull request #252 from GEOS-ESM/update-zenodo 

    Update zenodo.json
    @mathomp4
    mathomp4 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    fca2016 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. Add --hashes reading HEAD to get the current hash

    @FlorianDeconinck
    FlorianDeconinck committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    03cf8fb View commit details
    Browse the repository at this point in the history

  2. Add change in changelog

    @FlorianDeconinck
    FlorianDeconinck committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    3ad8e1f View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. Merge branch 'develop' into feature/hashes_on_status

    @FlorianDeconinck
    FlorianDeconinck committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    517dddd View commit details
    Browse the repository at this point in the history

  2. Adding author to zenodo

    @FlorianDeconinck
    FlorianDeconinck committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    40574dc View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'fdeconinck/feature/hashes_on_status' in… 

    …to feature/hashes_on_status
    @FlorianDeconinck
    FlorianDeconinck committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    5dfdc47 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #253 from FlorianDeconinck/feature/hashes_on_status 

    Add `--hashes` reading HEAD to get the current hash
    @mathomp4
    mathomp4 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    99a8c2d View commit details
    Browse the repository at this point in the history

  5. Update changelog for 1.50 release

    @mathomp4
    mathomp4 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    19a24ba View commit details
    Browse the repository at this point in the history

  6. Have to update the unit test for status

    @mathomp4
    mathomp4 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    88a70c4 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #254 from GEOS-ESM/feature/mathomp4/update-for-150… 

    …-release

Update changelog for 1.50 release
    @mathomp4
    mathomp4 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    504b4b8 View commit details
    Browse the repository at this point in the history

  8. Up timeout for actions

    @mathomp4
    mathomp4 committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    22f4514 View commit details
    Browse the repository at this point in the history