Skip to content

Actions: TexasDigitalLibrary/dspace-angular

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
51 workflow runs
51 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge tag 'dspace-7.6.6' into dspace-8_x Check for merge conflicts #105: Commit 618ad0a pushed by nwoodward
1s dspace-8_x
dspace-8_x
1s
Merge pull request #4576 from 4Science/task/main/DURACOM-317 Check for merge conflicts #104: Commit c2258bf pushed by nwoodward
2s main
main
2s
add tamil(ta.json5) translation file (#4426) Check for merge conflicts #103: Commit eb23b7c pushed by nwoodward
2s main
main
2s
Merge pull request #4737 from atmire/w2p-134319_escape-html-tags_cont… Check for merge conflicts #102: Commit d39bfaf pushed by nwoodward
1s main
main
1s
Merge pull request #4785 from alanorth/no-follow-facets Check for merge conflicts #101: Commit bf110c7 pushed by nwoodward
Skipped main
main
Skipped
Fix #4241 language selection (#4805) Check for merge conflicts #100: Commit bf04527 pushed by nwoodward
2s main
main
2s
Merge pull request #4817 from alanorth/nodemon-readme Check for merge conflicts #99: Commit db0913f pushed by nwoodward
2s main
main
2s
Merge pull request #4810 from 4Science/task/main/DURACOM-417 Check for merge conflicts #98: Commit e308867 pushed by nwoodward
1s main
main
1s
Merge pull request #4629 from 4Science/task/main/DURACOM-327 Check for merge conflicts #97: Commit bf72132 pushed by nwoodward
1s main
main
1s
Merge pull request #4790 from DSpace/dependabot/npm_and_yarn/commande… Check for merge conflicts #96: Commit de3cebc pushed by nwoodward
1s main
main
1s
Merge pull request #4724 from im-shubham-vish/fix-9814-backport-8x Check for merge conflicts #95: Commit 01cc3ab pushed by nwoodward
2s dspace-8_x
dspace-8_x
2s
Merge pull request #4738 from alanorth/unused-dependencies Check for merge conflicts #94: Commit 27a1bfc pushed by nwoodward
Skipped main
main
Skipped
Merge pull request #4731 from alanorth/collection-mapper-trash-icon-8x Check for merge conflicts #93: Commit a9093aa pushed by nwoodward
2s dspace-8_x
dspace-8_x
2s
Merge pull request #4728 from alanorth/collection-mapper-trash-icon Check for merge conflicts #92: Commit dba2d7a pushed by nwoodward
1s main
main
1s
Update dependabot.yml. Remove security related settings as those auto… Check for merge conflicts #91: Commit 9eadcea pushed by nwoodward
2s main
main
2s
Merge pull request #4633 from alanorth/dspace.org-http-links Check for merge conflicts #90: Commit 20cef9c pushed by nwoodward
Skipped main
main
Skipped
Merge pull request #4465 from DSpace/dependabot/npm_and_yarn/sass-63d… Check for merge conflicts #89: Commit 417f835 pushed by nwoodward
1s main
main
1s
Merge pull request #4445 from DSpace/dependabot/npm_and_yarn/babel/ru… Check for merge conflicts #88: Commit 37bd0fd pushed by nwoodward
1s main
main
1s
Merge pull request #4433 from DSpace/dependabot/npm_and_yarn/sass-d83… Check for merge conflicts #87: Commit 00fc2a2 pushed by nwoodward
1s main
main
1s
lint fixes Check for merge conflicts #86: Commit c2c23df pushed by nwoodward
1s dspace-8_x-port-config-default-comcol-tab
dspace-8_x-port-config-default-comcol-tab
1s
make the default tab for browsing communities and collections configu… Check for merge conflicts #85: Commit 8a3a202 pushed by nwoodward
1s dspace-8_x-port-config-default-comcol-tab
dspace-8_x-port-config-default-comcol-tab
1s
Merge pull request #4423 from alanorth/zone.js-dep Check for merge conflicts #84: Commit fde7e46 pushed by nwoodward
1s dspace-8_x
dspace-8_x
1s
Merge pull request #4424 from alanorth/dependabot-zone.js Check for merge conflicts #83: Commit 469c715 pushed by nwoodward
1s main
main
1s
Merge pull request #4377 from DSpace/dependabot/npm_and_yarn/testing-… Check for merge conflicts #82: Commit ce2b52b pushed by nwoodward
1s main
main
1s
Merge pull request #4388 from atmire/backport-4060-submission-form-ge… Check for merge conflicts #81: Commit 83d5400 pushed by nwoodward
1s dspace-8_x
dspace-8_x
1s