Skip to content

Actions: cctbx/dxtbx

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflicts.yml
551 workflow runs
551 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add overloads for panel resolution methods to use beam objects identify merge conflicts #3692: Pull request #767 synchronize by DiamondLightSource-build-server
October 23, 2024 11:11 9s
October 23, 2024 11:11 9s
Migrate dxtbx build backend to hatchling identify merge conflicts #3691: Pull request #766 synchronize by DiamondLightSource-build-server
October 23, 2024 09:54 13s
October 23, 2024 09:54 13s
Bump version: 3.22.dev → 3.22.0 identify merge conflicts #3690: Commit f297104 pushed by ndevenish
October 17, 2024 18:39 11s v3.22.1
v3.22.1
October 17, 2024 18:39 11s
Bump version: 3.22.dev → 3.23.dev identify merge conflicts #3689: Commit 76a0a5b pushed by ndevenish
October 15, 2024 14:03 2m 11s main
main
October 15, 2024 14:03 2m 11s
Bump version: 3.22.dev → 3.22.0 identify merge conflicts #3688: Commit f297104 pushed by DiamondLightSource-build-server
October 15, 2024 13:53 17s v3.22.0
v3.22.0
October 15, 2024 13:53 17s
Bump version: 3.22.dev → 3.22.0 identify merge conflicts #3687: Commit f297104 pushed by DiamondLightSource-build-server
October 15, 2024 13:53 14s dials-3.22
dials-3.22
October 15, 2024 13:53 14s
Switch dxtbx to Github Actions (#765) identify merge conflicts #3686: Commit bd65698 pushed by ndevenish
October 15, 2024 08:55 2m 10s main
main
October 15, 2024 08:55 2m 10s
NXmx: read data_scale_factor identify merge conflicts #3685: Pull request #756 synchronize by ndevenish
October 15, 2024 08:44 10s
October 15, 2024 08:44 10s
Update test_mpccd_nexus.py identify merge conflicts #3684: Commit 228e200 pushed by ndevenish
October 15, 2024 08:44 17s nxmx_gain
nxmx_gain
October 15, 2024 08:44 17s
Github Actions for dxtbx identify merge conflicts #3683: Pull request #765 synchronize by ndevenish
October 15, 2024 08:44 10s
October 15, 2024 08:44 10s
Github Actions for dxtbx identify merge conflicts #3682: Pull request #765 synchronize by ndevenish
October 15, 2024 08:43 11s
October 15, 2024 08:43 11s
Github Actions for dxtbx identify merge conflicts #3681: Pull request #765 synchronize by ndevenish
October 15, 2024 08:41 10s
October 15, 2024 08:41 10s
Support 32 bit in nxs2cbf conversion (#759) identify merge conflicts #3680: Commit 3f0cbf7 pushed by ndevenish
October 15, 2024 08:34 2m 14s main
main
October 15, 2024 08:34 2m 14s
i23 for run 4, 2024: row 21 of the modules has failed (#754) identify merge conflicts #3679: Commit 87993c9 pushed by ndevenish
October 15, 2024 08:31 2m 12s main
main
October 15, 2024 08:31 2m 12s
Github Actions for dxtbx identify merge conflicts #3678: Pull request #765 synchronize by ndevenish
October 15, 2024 08:26 10s
October 15, 2024 08:26 10s
Github Actions for dxtbx identify merge conflicts #3677: Pull request #765 synchronize by ndevenish
October 15, 2024 08:20 9s
October 15, 2024 08:20 9s
Github Actions for dxtbx identify merge conflicts #3676: Pull request #765 synchronize by ndevenish
October 15, 2024 08:17 9s
October 15, 2024 08:17 9s
Github Actions for dxtbx identify merge conflicts #3675: Pull request #765 synchronize by ndevenish
October 15, 2024 08:16 9s
October 15, 2024 08:16 9s
Github Actions for dxtbx identify merge conflicts #3674: Pull request #765 synchronize by ndevenish
October 15, 2024 08:13 13s
October 15, 2024 08:13 13s
Github Actions for dxtbx identify merge conflicts #3673: Pull request #765 synchronize by ndevenish
October 15, 2024 08:10 14s
October 15, 2024 08:10 14s
Github Actions for dxtbx identify merge conflicts #3672: Pull request #765 synchronize by ndevenish
October 15, 2024 08:08 11s
October 15, 2024 08:08 11s
Github Actions for dxtbx identify merge conflicts #3671: Pull request #765 synchronize by ndevenish
October 15, 2024 08:04 9s
October 15, 2024 08:04 9s
Github Actions for dxtbx identify merge conflicts #3670: Pull request #765 synchronize by ndevenish
October 15, 2024 08:03 12s
October 15, 2024 08:03 12s
Allow triangles in polygon masking (fixes #757) (#761) identify merge conflicts #3669: Commit 20e2a6e pushed by ndevenish
October 15, 2024 07:45 2m 15s main
main
October 15, 2024 07:45 2m 15s
Load lookups when not checking format (#760) identify merge conflicts #3668: Commit 4aadf21 pushed by dagewa
October 11, 2024 07:01 2m 12s main
main
October 11, 2024 07:01 2m 12s