Skip to content

Actions: dials/dxtbx

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Rename newsfragments/xxx.bugfix to newsfragments/736.bugfix identify merge conflicts #1533: Commit 12524e6 pushed by DiamondLightSource-build-server
May 10, 2024 10:17 13s FormatMRC-Y-flip
FormatMRC-Y-flip
May 10, 2024 10:17 13s
news identify merge conflicts #1532: Commit 5cb438d pushed by dagewa
May 10, 2024 10:04 11s FormatMRC-Y-flip
FormatMRC-Y-flip
May 10, 2024 10:04 11s
Fix Scan.get_property key type. (#734) identify merge conflicts #1531: Commit 3e875f0 pushed by DiamondLightSource-build-server
May 7, 2024 11:01 2m 12s main
main
May 7, 2024 11:01 2m 12s
Tweak gain for ELDICO ED-1 (#732) identify merge conflicts #1530: Commit 2732092 pushed by DiamondLightSource-build-server
April 30, 2024 13:59 2m 15s main
main
April 30, 2024 13:59 2m 15s
Update goniometer for FormatISISSXD (#731) identify merge conflicts #1529: Commit 4b64399 pushed by DiamondLightSource-build-server
April 30, 2024 10:06 2m 16s main
main
April 30, 2024 10:06 2m 16s
Rename newsfragments/xxx.misc to newsfragments/732.misc identify merge conflicts #1528: Commit 49e9cd1 pushed by DiamondLightSource-build-server
April 30, 2024 09:29 10s tweak-gain-for-ED-1
tweak-gain-for-ED-1
April 30, 2024 09:29 10s
News identify merge conflicts #1527: Commit 3cd750b pushed by dagewa
April 30, 2024 09:21 11s tweak-gain-for-ED-1
tweak-gain-for-ED-1
April 30, 2024 09:21 11s
Multi-axis goniometer needs axes= not axis= (#730) identify merge conflicts #1526: Commit 5289332 pushed by DiamondLightSource-build-server
April 30, 2024 08:27 2m 13s main
main
April 30, 2024 08:27 2m 13s
Rename newsfragments/xxx.bugfix to newsfragments/730.bugfix identify merge conflicts #1525: Commit 055ad95 pushed by DiamondLightSource-build-server
April 29, 2024 08:45 14s multi-axis-goniometer-needs-axes-not-axis
multi-axis-goniometer-needs-axes-not-axis
April 29, 2024 08:45 14s
News identify merge conflicts #1524: Commit 67d9c9d pushed by dagewa
April 29, 2024 08:43 14s multi-axis-goniometer-needs-axes-not-axis
multi-axis-goniometer-needs-axes-not-axis
April 29, 2024 08:43 14s
FormatROD set beam probe to electron for ED (#728) identify merge conflicts #1523: Commit 8f409a9 pushed by DiamondLightSource-build-server
April 26, 2024 15:20 2m 12s main
main
April 26, 2024 15:20 2m 12s
Allow ToF experiments to share models. (#721) identify merge conflicts #1522: Commit 60782d7 pushed by DiamondLightSource-build-server
April 26, 2024 14:11 2m 15s main
main
April 26, 2024 14:11 2m 15s
Add experiment type (#702) identify merge conflicts #1521: Commit 6fcf993 pushed by DiamondLightSource-build-server
April 24, 2024 14:06 2m 14s main
main
April 24, 2024 14:06 2m 14s
Clean Clutter identify merge conflicts #1520: Commit ee74a3d pushed by DiamondLightSource-build-server
April 24, 2024 07:48 2m 13s main
main
April 24, 2024 07:48 2m 13s
Rename newsfragments/xxx.bugfix to newsfragments/728.bugfix identify merge conflicts #1519: Commit f20fb95 pushed by DiamondLightSource-build-server
April 23, 2024 12:30 11s FormatROD-ED-beam
FormatROD-ED-beam
April 23, 2024 12:30 11s
news identify merge conflicts #1518: Commit 11188dc pushed by dagewa
April 23, 2024 12:28 18s FormatROD-ED-beam
FormatROD-ED-beam
April 23, 2024 12:28 18s
Fix profile, scaling models in Python 3.12 (#727) identify merge conflicts #1517: Commit e357acc pushed by DiamondLightSource-build-server
April 23, 2024 09:28 2m 12s main
main
April 23, 2024 09:28 2m 12s
Remove XPASS on "Imageset slicing consistency" test (#726) identify merge conflicts #1516: Commit ece63b8 pushed by DiamondLightSource-build-server
April 23, 2024 08:33 2m 13s main
main
April 23, 2024 08:33 2m 13s
Python 3.12 Compatibility (#725) identify merge conflicts #1515: Commit e0c47b6 pushed by DiamondLightSource-build-server
April 23, 2024 08:17 2m 14s main
main
April 23, 2024 08:17 2m 14s
Remove dials dependency from FormatSMVTimePix (#724) identify merge conflicts #1514: Commit 884de37 pushed by DiamondLightSource-build-server
April 19, 2024 17:07 2m 15s main
main
April 19, 2024 17:07 2m 15s
XTC Streams: Allow stepping through by index (#709) identify merge conflicts #1513: Commit 61b5a40 pushed by DiamondLightSource-build-server
April 18, 2024 14:58 2m 13s main
main
April 18, 2024 14:58 2m 13s
Handle image templates that don't use zero padding (#705) identify merge conflicts #1512: Commit 24a50c7 pushed by DiamondLightSource-build-server
April 18, 2024 08:37 2m 15s main
main
April 18, 2024 08:37 2m 15s
Bump version: 3.18.dev → 3.19.dev identify merge conflicts #1511: Commit dd77a69 pushed by DiamondLightSource-build-server
April 18, 2024 08:08 2m 11s main
main
April 18, 2024 08:08 2m 11s
Bump version: 3.18.dev → 3.18.0 identify merge conflicts #1510: Commit 2ce1b95 pushed by DiamondLightSource-build-server
April 18, 2024 08:06 14s v3.19.0
v3.19.0
April 18, 2024 08:06 14s
DIALS 3.17.1 identify merge conflicts #1509: Pull request #193 synchronize by DiamondLightSource-build-server
April 18, 2024 08:05 14s
April 18, 2024 08:05 14s