Skip to content

Actions: TexasDigitalLibrary/DSpace

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
43 workflow runs
43 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix syntax error in #10040. Env variables cannot have dashes or periods Check for merge conflicts #88: Commit fc544a8 pushed by nwoodward
November 22, 2024 20:05 3s main
main
November 22, 2024 20:05 3s
Merge pull request #10034 from tdonohue/port_10032_to_7x Check for merge conflicts #87: Commit bbf9ccf pushed by nwoodward
November 21, 2024 20:33 2s dspace-7_x
dspace-7_x
November 21, 2024 20:33 2s
Merge pull request #10035 from dheles/8_x-dc-fix Check for merge conflicts #86: Commit e01837f pushed by nwoodward
November 21, 2024 20:32 3s dspace-8_x
dspace-8_x
November 21, 2024 20:32 3s
Merge pull request #10033 from DSpace/backport-10032-to-dspace-8_x Check for merge conflicts #85: Commit 93cbada pushed by nwoodward
November 21, 2024 20:31 2s dspace-8_x
dspace-8_x
November 21, 2024 20:31 2s
Merge pull request #10032 from tdonohue/minor_dep_cleanup Check for merge conflicts #84: Commit 40fbd80 pushed by nwoodward
November 21, 2024 20:25 3s main
main
November 21, 2024 20:25 3s
Merge pull request #9862 from DSpace/backport-9859-to-dspace-7_x Check for merge conflicts #83: Commit 5ad4adb pushed by nwoodward
October 8, 2024 14:25 2s dspace-7_x
dspace-7_x
October 8, 2024 14:25 2s
Merge pull request #9859 from saschaszott/patch-50 Check for merge conflicts #82: Commit e8a2e73 pushed by nwoodward
October 8, 2024 14:24 3s main
main
October 8, 2024 14:24 3s
Merge pull request #9719 from DSpace/backport-9717-to-dspace-7_x Check for merge conflicts #81: Commit f6208bc pushed by nwoodward
July 24, 2024 15:21 2s dspace-7_x
dspace-7_x
July 24, 2024 15:21 2s
Merge pull request #9717 from kshepherd/spiderlist_url_update Check for merge conflicts #80: Commit 45248a8 pushed by nwoodward
July 24, 2024 15:21 2s main
main
July 24, 2024 15:21 2s
Merge pull request #9704 from saschaszott/patch-41 Check for merge conflicts #79: Commit a52508d pushed by nwoodward
July 18, 2024 17:44 2s main
main
July 18, 2024 17:44 2s
Merge pull request #9691 from tdonohue/fix_signposting_test Check for merge conflicts #78: Commit c897b1f pushed by nwoodward
July 11, 2024 16:13 3s main
main
July 11, 2024 16:13 3s
Merge pull request #9682 from TexasDigitalLibrary/DS-9323-fix-cc-lice… Check for merge conflicts #77: Commit 83857ae pushed by nwoodward
July 10, 2024 15:56 4s main
main
July 10, 2024 15:56 4s
Update redeployment of demo.dspace.org to use dspace-8_x branch. Check for merge conflicts #76: Commit fb4093c pushed by nwoodward
July 5, 2024 15:35 3s main
main
July 5, 2024 15:35 3s
Merge pull request #9599 from tdonohue/port_new_csrf_endpoint_to_7x Check for merge conflicts #75: Commit d47c00a pushed by nwoodward
July 1, 2024 21:51 2s dspace-7_x
dspace-7_x
July 1, 2024 21:51 2s
Merge pull request #9672 from tdonohue/update_contributing Check for merge conflicts #74: Commit de25105 pushed by nwoodward
July 1, 2024 21:50 2s main
main
July 1, 2024 21:50 2s
Merge pull request #9638 from tdonohue/avoid_inline_js Check for merge conflicts #73: Commit f1059b4 pushed by nwoodward
June 17, 2024 22:02 2s main
main
June 17, 2024 22:02 2s
Merge pull request #9576 from tdonohue/remove_old_ui_refs Check for merge conflicts #72: Commit 1e639a1 pushed by nwoodward
June 3, 2024 14:17 3s main
main
June 3, 2024 14:17 3s
Merge pull request #9344 from misilot/shibd-exec Check for merge conflicts #71: Commit 76d5378 pushed by nwoodward
April 11, 2024 15:09 2s main
main
April 11, 2024 15:09 2s
Merge pull request #9269 from atmire/w2p-90830-104654_issue-8125_pr-8… Check for merge conflicts #70: Commit 68bb3c5 pushed by nwoodward
April 10, 2024 18:45 6m 19s dspace-7_x
dspace-7_x
April 10, 2024 18:45 6m 19s
Merge pull request #9449 from 4Science/coar-notify-7-refactor-url Check for merge conflicts #68: Commit 815f2c1 pushed by nwoodward
April 10, 2024 18:37 12m 51s main
main
April 10, 2024 18:37 12m 51s
Merge pull request #9451 from tdonohue/fix_csrf_issues Check for merge conflicts #67: Commit 07e0b02 pushed by nwoodward
April 5, 2024 19:16 3s main
main
April 5, 2024 19:16 3s
Merge pull request #9448 from DSpace/backport-9271-to-dspace-7_x Check for merge conflicts #66: Commit a6dd759 pushed by nwoodward
April 5, 2024 16:24 3s dspace-7_x
dspace-7_x
April 5, 2024 16:24 3s
Merge pull request #9356 from DSpace/backport-9339-to-dspace-7_x Check for merge conflicts #65: Commit 99aec7f pushed by nwoodward
February 26, 2024 16:22 2s dspace-7_x
dspace-7_x
February 26, 2024 16:22 2s
Merge pull request #9241 from alexandrevryghem/w2p-108915_fix-link-re… Check for merge conflicts #64: Commit 42e3699 pushed by nwoodward
February 26, 2024 16:21 3s main
main
February 26, 2024 16:21 3s
Merge pull request #9297 from DSpace/backport-9293-to-dspace-7_x Check for merge conflicts #63: Commit f467425 pushed by nwoodward
January 31, 2024 19:42 2s dspace-7_x
dspace-7_x
January 31, 2024 19:42 2s