Skip to content

Actions: toastisme/dials

Actions

identify merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge remote-tracking branch 'origin/main' into spot_finding_f_strings identify merge conflicts #323: Commit a73c7c3 pushed by ndevenish
September 6, 2024 13:42 15s spot_finding_f_strings
spot_finding_f_strings
September 6, 2024 13:42 15s
Rename newsfragments/XXX.bugfix to newsfragments/2729.bugfix identify merge conflicts #322: Commit d2b6696 pushed by DiamondLightSource-build-server
August 27, 2024 12:58 11s radial_profile_tof_fix
radial_profile_tof_fix
August 27, 2024 12:58 11s
Enable radial_profile spot finding algorithm for polychromatic data b… identify merge conflicts #321: Commit 0ff1506 pushed by toastisme
August 27, 2024 12:52 13s radial_profile_tof_fix
radial_profile_tof_fix
August 27, 2024 12:52 13s
Change test_tof_extract_shoeboxes to import the image data directly. identify merge conflicts #320: Commit 7bb6423 pushed by toastisme
August 27, 2024 07:13 12s tof_scaling
tof_scaling
August 27, 2024 07:13 12s
Merge remote-tracking branch 'upstream/main' into tof_scaling identify merge conflicts #319: Commit 159f56d pushed by toastisme
August 19, 2024 08:29 14s tof_scaling
tof_scaling
August 19, 2024 08:29 14s
Rename newsfragments/XXX.bugfix to newsfragments/2715.bugfix identify merge conflicts #318: Commit e01f383 pushed by DiamondLightSource-build-server
August 1, 2024 15:27 12s laue_fix
laue_fix
August 1, 2024 15:27 12s
Modified branching to Laue refinement methods to depend on Experiment… identify merge conflicts #317: Commit 7e2dc39 pushed by toastisme
August 1, 2024 15:24 10s laue_fix
laue_fix
August 1, 2024 15:24 10s
Fixed tof integrate error when using multiple orientations. identify merge conflicts #316: Commit f3f7176 pushed by toastisme
August 1, 2024 13:26 15s tof_integration
tof_integration
August 1, 2024 13:26 15s
Fixed integration profiler errors. identify merge conflicts #315: Commit 44a4b0f pushed by toastisme
August 1, 2024 10:54 15s tof_integration
tof_integration
August 1, 2024 10:54 15s
added tof integration methods. identify merge conflicts #314: Commit 45b8138 pushed by toastisme
July 31, 2024 21:55 11s tof_integration
tof_integration
July 31, 2024 21:55 11s
Added tof integration methods. identify merge conflicts #313: Commit 7226341 pushed by toastisme
July 31, 2024 21:32 13s tof_integration
tof_integration
July 31, 2024 21:32 13s
typo identify merge conflicts #312: Commit 91e9b7f pushed by toastisme
July 23, 2024 20:22 12s tof_scaling
tof_scaling
July 23, 2024 20:22 12s
Remember CMake is not the only build. identify merge conflicts #311: Commit 2305d63 pushed by toastisme
July 23, 2024 13:37 12s tof_scaling
tof_scaling
July 23, 2024 13:37 12s
Rename newsfragments/XXX.feature to newsfragments/2704.feature identify merge conflicts #310: Commit 3be1946 pushed by DiamondLightSource-build-server
July 23, 2024 11:14 16s tof_scaling
tof_scaling
July 23, 2024 11:14 16s
comment typos identify merge conflicts #309: Commit 14ce053 pushed by toastisme
July 23, 2024 11:01 9s tof_scaling
tof_scaling
July 23, 2024 11:01 9s
Changed spherical absorption correction radii to mm. identify merge conflicts #308: Commit c757d89 pushed by toastisme
July 23, 2024 10:57 11s tof_scaling
tof_scaling
July 23, 2024 10:57 11s
comment typos identify merge conflicts #307: Commit 347149d pushed by toastisme
July 23, 2024 10:29 11s tof_scaling
tof_scaling
July 23, 2024 10:29 11s
newsfragment identify merge conflicts #306: Commit dce53be pushed by toastisme
July 23, 2024 09:53 13s tof_scaling
tof_scaling
July 23, 2024 09:53 13s
Refactored scaling corrections. identify merge conflicts #305: Commit 9a1de20 pushed by toastisme
July 23, 2024 09:36 11s tof_scaling_integration
tof_scaling_integration
July 23, 2024 09:36 11s
Add python wrapper for all_reflections_for_asu identify merge conflicts #304: Commit 827ea15 pushed by toastisme
July 18, 2024 10:58 13s tof_scaling_integration
tof_scaling_integration
July 18, 2024 10:58 13s
Rename newsfragments/XXX.misc to newsfragments/2702.misc identify merge conflicts #303: Commit 09fd407 pushed by DiamondLightSource-build-server
July 18, 2024 10:43 12s indexing_saving_more_properties
indexing_saving_more_properties
July 18, 2024 10:43 12s
Add additional reflection properties to save after indexing. identify merge conflicts #302: Commit a880cda pushed by toastisme
July 18, 2024 10:40 12s indexing_saving_more_properties
indexing_saving_more_properties
July 18, 2024 10:40 12s
Added basic tof_integrate.py script. Added scaling methods. identify merge conflicts #301: Commit 485c695 pushed by toastisme
July 18, 2024 10:29 12s tof_scaling_integration
tof_scaling_integration
July 18, 2024 10:29 12s
Draft of mask calculator. identify merge conflicts #300: Commit dc17386 pushed by toastisme
July 15, 2024 15:29 15s tof_scaling_integration
tof_scaling_integration
July 15, 2024 15:29 15s
Working draft of scaling corrections. identify merge conflicts #299: Commit 9d0cca8 pushed by toastisme
July 15, 2024 14:47 15s tof_scaling_integration
tof_scaling_integration
July 15, 2024 14:47 15s