Skip to content

Actions: 4Science/dspace-angular

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
491 workflow runs
491 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #3995 from DSpace/backport-3673-to-main Check for merge conflicts #1312: Commit 81ec674 pushed by 4science-it
February 14, 2025 20:54 4s main
main
February 14, 2025 20:54 4s
Merged in task/dspace-cris-2023_02_x/DSC-2149 (pull request #2732) Check for merge conflicts #1311: Commit 322077e pushed by 4science-it
February 14, 2025 17:51 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
February 14, 2025 17:51 3s
Merged in task/dspace-cris-2023_02_x/DSC-2176 (pull request #2801) Check for merge conflicts #1310: Commit 4c99d15 pushed by 4science-it
February 14, 2025 15:31 6s dspace-cris-2023_02_x
dspace-cris-2023_02_x
February 14, 2025 15:31 6s
Merge pull request #3960 from pilasou/pilasou-translations-fr Check for merge conflicts #1309: Commit 3437ee8 pushed by 4science-it
February 14, 2025 14:54 3s main
main
February 14, 2025 14:54 3s
Merge pull request #3976 from jeffmorin/main Check for merge conflicts #1308: Commit a01966a pushed by 4science-it
February 11, 2025 20:24 3s main
main
February 11, 2025 20:24 3s
Merged in task/dspace-cris-2023_02_x/DSC-2165 (pull request #2774) Check for merge conflicts #1307: Commit fbd8606 pushed by 4science-it
February 11, 2025 18:40 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
February 11, 2025 18:40 2s
Merge pull request #3970 from DSpace/dependabot/npm_and_yarn/sass-fd5… Check for merge conflicts #1306: Commit 446f681 pushed by 4science-it
February 10, 2025 21:44 2s main
main
February 10, 2025 21:44 2s
Merge pull request #3906 from DSpace/dependabot/npm_and_yarn/babel/ru… Check for merge conflicts #1305: Commit d5ea6f5 pushed by 4science-it
February 10, 2025 21:34 3s main
main
February 10, 2025 21:34 3s
Merge pull request #3905 from DSpace/dependabot/npm_and_yarn/eslint-8… Check for merge conflicts #1304: Commit bf20787 pushed by 4science-it
February 10, 2025 18:14 2s main
main
February 10, 2025 18:14 2s
Merge pull request #3938 from DSpace/dependabot/npm_and_yarn/types/lo… Check for merge conflicts #1303: Commit da05c05 pushed by 4science-it
February 10, 2025 15:44 3s main
main
February 10, 2025 15:44 3s
Merge tag 'dspace-8.1' Check for merge conflicts #1302: Commit fc5a384 pushed by 4science-it
February 7, 2025 20:14 2s main
main
February 7, 2025 20:14 2s
Merge pull request #3966 from tdonohue/fixup_example Check for merge conflicts #1301: Commit f088233 pushed by 4science-it
February 7, 2025 15:44 2s main
main
February 7, 2025 15:44 2s
use translation service to determine placeholder values of date picke… Check for merge conflicts #1300: Commit be6de64 pushed by 4science-it
February 6, 2025 21:14 2s main
main
February 6, 2025 21:14 2s
Merge pull request #3797 from toniprieto/translate-ca-9x Check for merge conflicts #1299: Commit 8184acc pushed by 4science-it
February 6, 2025 16:54 2s main
main
February 6, 2025 16:54 2s
Merge pull request #3358 from 4Science/task/main/DURACOM-288 Check for merge conflicts #1298: Commit 3d6af1f pushed by 4science-it
February 6, 2025 16:14 2s main
main
February 6, 2025 16:14 2s
Merge pull request #3955 from alexandrevryghem/w2p-126015_synchronize… Check for merge conflicts #1297: Commit 542e2db pushed by 4science-it
February 5, 2025 21:04 3s main
main
February 5, 2025 21:04 3s
Merged in task/dspace-cris-2023_02_x/DSC-2142 (pull request #2699) Check for merge conflicts #1296: Commit 8f97a2f pushed by 4science-it
February 4, 2025 21:56 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
February 4, 2025 21:56 2s
Merge pull request #3948 from toniprieto/avoid-retrieve-suggestions-i… Check for merge conflicts #1295: Commit 0649342 pushed by 4science-it
February 4, 2025 20:14 1s main
main
February 4, 2025 20:14 1s
Merged in task/dspace-cris-2023_02_x/DSC-1957_fix-font (pull request … Check for merge conflicts #1294: Commit 0d74d4b pushed by 4science-it
February 3, 2025 14:31 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
February 3, 2025 14:31 2s
Merge pull request #3935 from tdonohue/add_reload_to_ssr_paths Check for merge conflicts #1293: Commit 073cd07 pushed by 4science-it
February 3, 2025 11:14 2s main
main
February 3, 2025 11:14 2s
Merged in task/dspace-cris-2023_02_x/DSC-2166 (pull request #2770) Check for merge conflicts #1292: Commit d94b5c1 pushed by 4science-it
January 31, 2025 08:31 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
January 31, 2025 08:31 3s
Merge pull request #3912 from minurmin/authPasswordDialog Check for merge conflicts #1291: Commit 7e69b44 pushed by 4science-it
January 30, 2025 22:14 2s main
main
January 30, 2025 22:14 2s
Make reorder buttons keyboard accessible (#3372) Check for merge conflicts #1290: Commit bdac58d pushed by 4science-it
January 30, 2025 17:14 2s main
main
January 30, 2025 17:14 2s
Merge pull request #3920 from tdonohue/config_syntax Check for merge conflicts #1289: Commit e867993 pushed by 4science-it
January 29, 2025 22:44 2s main
main
January 29, 2025 22:44 2s
Merge pull request #3581 from alexandrevryghem/made-expandable-navbar… Check for merge conflicts #1288: Commit 98832f2 pushed by 4science-it
January 29, 2025 20:04 2s main
main
January 29, 2025 20:04 2s