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

📊 conflict: ucdp update #3201

Merged
merged 32 commits into from
Aug 29, 2024
Merged

📊 conflict: ucdp update #3201

merged 32 commits into from
Aug 29, 2024

Commits on Aug 26, 2024

  1. 📊 conflict: ucdp update

    @lucasrodes
    lucasrodes committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    750c611 View commit details
    Browse the repository at this point in the history

  2. Copy steps

    @lucasrodes
    lucasrodes committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    6ede28a View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Merge branch 'master' into update-ucdp-2

    @lucasrodes
    lucasrodes committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    c9bce32 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into update-ucdp-2

    @lucasrodes
    lucasrodes committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    0f3d7a9 View commit details
    Browse the repository at this point in the history

  3. revert

    @lucasrodes
    lucasrodes committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    302ac1a View commit details
    Browse the repository at this point in the history

  4. snapshot

    @lucasrodes
    lucasrodes committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    b9d55ec View commit details
    Browse the repository at this point in the history

  5. fix short_name snapshot

    @lucasrodes
    lucasrodes committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    2ffd14a View commit details
    Browse the repository at this point in the history

  6. meadow

    @lucasrodes
    lucasrodes committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    0e82882 View commit details
    Browse the repository at this point in the history

  7. wip

    @lucasrodes
    lucasrodes committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    e4e2cba View commit details
    Browse the repository at this point in the history

  8. wip

    @lucasrodes
    lucasrodes committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    4c78f6f View commit details
    Browse the repository at this point in the history

  9. wip

    @lucasrodes
    lucasrodes committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    3723b1f View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. wip

    @lucasrodes
    lucasrodes committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    25c61a9 View commit details
    Browse the repository at this point in the history

  2. wip

    @lucasrodes
    lucasrodes committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    278be55 View commit details
    Browse the repository at this point in the history

  3. test

    @lucasrodes
    lucasrodes committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    3a3396b View commit details
    Browse the repository at this point in the history

  4. fix typing

    @lucasrodes
    lucasrodes committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    9c5587b View commit details
    Browse the repository at this point in the history

  5. fix test

    @lucasrodes
    lucasrodes committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    475b8e2 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Merge branch 'master' into update-ucdp-2

    @lucasrodes
    lucasrodes committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    df51d49 View commit details
    Browse the repository at this point in the history

  2. comment for now

    @lucasrodes
    lucasrodes committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    c50ed01 View commit details
    Browse the repository at this point in the history

  3. add 'none' option, add docs

    @lucasrodes
    lucasrodes committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    32cd571 View commit details
    Browse the repository at this point in the history

  4. garden

    @lucasrodes
    lucasrodes committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    8f714cc View commit details
    Browse the repository at this point in the history

  5. grapher

    @lucasrodes
    lucasrodes committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    e65e472 View commit details
    Browse the repository at this point in the history

  6. only set dtypes if no interpolation is used

    @lucasrodes
    lucasrodes committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    69367c9 View commit details
    Browse the repository at this point in the history

  7. fix dag

    @lucasrodes
    lucasrodes committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    344a94d View commit details
    Browse the repository at this point in the history

  8. fix dtype if

    @lucasrodes
    lucasrodes committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    2d350d4 View commit details
    Browse the repository at this point in the history

  9. bugfix: use int for range

    @lucasrodes
    lucasrodes committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    8e1afa5 View commit details
    Browse the repository at this point in the history

  10. update gleditsch dependency

    @lucasrodes
    lucasrodes committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    185adb6 View commit details
    Browse the repository at this point in the history

  11. clean code

    @lucasrodes
    lucasrodes committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    1230135 View commit details
    Browse the repository at this point in the history

  12. remove import

    @lucasrodes
    lucasrodes committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    b04f857 View commit details
    Browse the repository at this point in the history

  13. change dataset name

    @lucasrodes
    lucasrodes committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    e5bb116 View commit details
    Browse the repository at this point in the history

  14. change attribution year in metadata

    @lucasrodes
    lucasrodes committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    75b7f9b View commit details
    Browse the repository at this point in the history

  15. update ucdp_prio

    @lucasrodes
    lucasrodes committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    d7c77ff View commit details
    Browse the repository at this point in the history

  16. archive

    @lucasrodes
    lucasrodes committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    159f4a7 View commit details
    Browse the repository at this point in the history