Skip to content

Actions: dials/dxtbx

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bug fix identify merge conflicts #1657: Commit 5d87fd3 pushed by dagewa
December 11, 2024 12:09 15s 771-pass-through-resolve_path-when-not-accessible
771-pass-through-resolve_path-when-not-accessible
December 11, 2024 12:09 15s
Another attempt identify merge conflicts #1656: Commit 88e578f pushed by dagewa
December 11, 2024 11:17 11s 771-pass-through-resolve_path-when-not-accessible
771-pass-through-resolve_path-when-not-accessible
December 11, 2024 11:17 11s
Revert "Pass through resolve_path when the path is not accessible (… identify merge conflicts #1655: Commit 97bc789 pushed by DiamondLightSource-build-server
December 10, 2024 16:39 2m 10s main
main
December 10, 2024 16:39 2m 10s
Pass through resolve_path when the path is not accessible (#772) identify merge conflicts #1654: Commit d7be9b2 pushed by DiamondLightSource-build-server
December 10, 2024 15:08 2m 15s main
main
December 10, 2024 15:08 2m 15s
Merge branch 'main' into 771-pass-through-resolve_path-when-not-acces… identify merge conflicts #1653: Commit c129212 pushed by dagewa
December 2, 2024 09:44 11s 771-pass-through-resolve_path-when-not-accessible
771-pass-through-resolve_path-when-not-accessible
December 2, 2024 09:44 11s
TQDM -> stdout (#775) identify merge conflicts #1652: Commit edb60e4 pushed by DiamondLightSource-build-server
November 26, 2024 08:31 2m 21s main
main
November 26, 2024 08:31 2m 21s
Hide tqdm if DIALS_NOBANNER (#774) identify merge conflicts #1651: Commit c46a758 pushed by DiamondLightSource-build-server
November 25, 2024 17:05 8m 3s main
main
November 25, 2024 17:05 8m 3s
Bugfix: stdout output for tqdm (#773) identify merge conflicts #1650: Commit 8d36ec9 pushed by DiamondLightSource-build-server
November 25, 2024 16:17 2m 11s main
main
November 25, 2024 16:17 2m 11s
Add tqdm progress bar to dials.import (#768) identify merge conflicts #1649: Commit 56b467b pushed by DiamondLightSource-build-server
November 25, 2024 10:32 2m 12s main
main
November 25, 2024 10:32 2m 12s
Given that we're already monkeypatching here, use this to also identify merge conflicts #1648: Commit 533e5c4 pushed by dagewa
November 22, 2024 16:30 14s 771-pass-through-resolve_path-when-not-accessible
771-pass-through-resolve_path-when-not-accessible
November 22, 2024 16:30 14s
Rename newsfragments/xxx.bugfix to newsfragments/772.bugfix identify merge conflicts #1647: Commit 68938bf pushed by DiamondLightSource-build-server
November 22, 2024 15:59 1m 5s 771-pass-through-resolve_path-when-not-accessible
771-pass-through-resolve_path-when-not-accessible
November 22, 2024 15:59 1m 5s
News identify merge conflicts #1646: Commit 626bbb3 pushed by dagewa
November 22, 2024 15:57 1m 1s 771-pass-through-resolve_path-when-not-accessible
771-pass-through-resolve_path-when-not-accessible
November 22, 2024 15:57 1m 1s
FormatSMVADSCCetaD (#770) identify merge conflicts #1645: Commit ea6fd5f pushed by DiamondLightSource-build-server
November 12, 2024 11:31 2m 16s main
main
November 12, 2024 11:31 2m 16s
Rename newsfragments/xxx.feature to newsfragments/770.feature identify merge conflicts #1644: Commit d1af518 pushed by DiamondLightSource-build-server
November 7, 2024 12:05 16m 56s FormatSMVCetaD
FormatSMVCetaD
November 7, 2024 12:05 16m 56s
News identify merge conflicts #1643: Commit 30c5f1a pushed by dagewa
November 7, 2024 11:59 10m 55s FormatSMVCetaD
FormatSMVCetaD
November 7, 2024 11:59 10m 55s
NXmx: read data_scale_factor (#756) identify merge conflicts #1642: Commit 834cb48 pushed by DiamondLightSource-build-server
October 30, 2024 23:44 2m 12s main
main
October 30, 2024 23:44 2m 12s
Revert "Migrate dxtbx build backend to hatchling (#766)" identify merge conflicts #1641: Commit f30e353 pushed by DiamondLightSource-build-server
October 29, 2024 15:28 2m 12s main
main
October 29, 2024 15:28 2m 12s
MNT: Add hatchling explicitly to dependencies identify merge conflicts #1640: Commit cb8d706 pushed by DiamondLightSource-build-server
October 29, 2024 12:06 2m 15s main
main
October 29, 2024 12:06 2m 15s
Migrate dxtbx build backend to hatchling (#766) identify merge conflicts #1639: Commit 2727313 pushed by DiamondLightSource-build-server
October 29, 2024 11:53 2m 14s main
main
October 29, 2024 11:53 2m 14s
Bump version: 3.23.dev → 3.24.dev identify merge conflicts #1638: Commit fc96413 pushed by DiamondLightSource-build-server
October 28, 2024 09:02 36s dials-3.23rc-main
dials-3.23rc-main
October 28, 2024 09:02 36s
Bump version: 3.23.dev → 3.23.0 identify merge conflicts #1637: Commit 0e8d410 pushed by DiamondLightSource-build-server
October 28, 2024 09:02 15s dials-3.23rc
dials-3.23rc
October 28, 2024 09:02 15s
Add overloads for panel resolution methods to use beam objects (#767) identify merge conflicts #1636: Commit 76f9507 pushed by DiamondLightSource-build-server
October 25, 2024 08:28 2m 15s main
main
October 25, 2024 08:28 2m 15s
Bump version: 3.22.dev → 3.22.0 identify merge conflicts #1635: Commit f297104 pushed by ndevenish
October 17, 2024 18:39 17s v3.22.1
v3.22.1
October 17, 2024 18:39 17s
Bump version: 3.22.dev → 3.23.dev identify merge conflicts #1634: Commit 76a0a5b pushed by DiamondLightSource-build-server
October 15, 2024 14:03 2m 12s main
main
October 15, 2024 14:03 2m 12s
Bump version: 3.22.dev → 3.22.0 identify merge conflicts #1633: Commit f297104 pushed by DiamondLightSource-build-server
October 15, 2024 13:53 29s v3.22.0
v3.22.0
October 15, 2024 13:53 29s