Skip to content

Actions: DSpace/dspace-angular

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
89 workflow run results
89 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

fix(pt-BR.json5): fix and update the language file Check for merge conflicts #1698: Pull request #2590 synchronize by marcoaureliocardoso
October 29, 2023 10:18 19s
October 29, 2023 10:18 19s
Merge pull request #2589 from DSpace/backport-2580-to-dspace-7_x Check for merge conflicts #1697: Commit 701c6e3 pushed by tdonohue
October 27, 2023 18:51 23s dspace-7_x
dspace-7_x
October 27, 2023 18:51 23s
Merge pull request #2580 from uniba-ub/issue2450-cssrules-exception Check for merge conflicts #1696: Commit e1e2941 pushed by tdonohue
October 27, 2023 15:27 24s main
main
October 27, 2023 15:27 24s
Merge pull request #2585 from tdonohue/port_2442_to_7x Check for merge conflicts #1695: Commit 6a182c3 pushed by tdonohue
October 26, 2023 21:56 20s dspace-7_x
dspace-7_x
October 26, 2023 21:56 20s
New themed components & minor CSS fixes (#2442) Check for merge conflicts #1694: Commit ab17164 pushed by tdonohue
October 26, 2023 21:04 24s main
main
October 26, 2023 21:04 24s
Merge pull request #2584 from DSpace/backport-2441-to-dspace-7_x Check for merge conflicts #1693: Commit 3e9f3ab pushed by tdonohue
October 26, 2023 20:02 21s dspace-7_x
dspace-7_x
October 26, 2023 20:02 21s
Merge pull request #2441 from alexandrevryghem/header-and-navbar-css-… Check for merge conflicts #1692: Commit be59255 pushed by tdonohue
October 26, 2023 19:02 23s main
main
October 26, 2023 19:02 23s
New themed components & minor CSS fixes Check for merge conflicts #1691: Pull request #2442 synchronize by alexandrevryghem
October 26, 2023 18:26 12m 3s
October 26, 2023 18:26 12m 3s
Merge pull request #2583 from DSpace/backport-2506-to-dspace-7_x Check for merge conflicts #1690: Commit b9f60fa pushed by tdonohue
October 26, 2023 18:25 40s dspace-7_x
dspace-7_x
October 26, 2023 18:25 40s
Merge pull request #2551 from alexandrevryghem/split-eperson-administ… Check for merge conflicts #1689: Commit 1d7147e pushed by tdonohue
October 26, 2023 18:23 28s main
main
October 26, 2023 18:23 28s
Merge pull request #2391 from alexandrevryghem/split-eperson-administ… Check for merge conflicts #1688: Commit 97b22c6 pushed by tdonohue
October 26, 2023 18:23 23s dspace-7_x
dspace-7_x
October 26, 2023 18:23 23s
Created abstract component loader class Check for merge conflicts #1687: Pull request #2339 synchronize by alexandrevryghem
October 26, 2023 18:07 17s
October 26, 2023 18:07 17s
Merge pull request #2582 from DSpace/backport-2464-to-main Check for merge conflicts #1686: Commit 8206e62 pushed by tdonohue
October 26, 2023 17:05 24s main
main
October 26, 2023 17:05 24s
Merge pull request #2506 from saschaszott/saschaszott-patch-3 Check for merge conflicts #1685: Commit 0170949 pushed by tdonohue
October 26, 2023 16:56 19s main
main
October 26, 2023 16:56 19s
Merge pull request #2581 from DSpace/backport-2542-to-dspace-7_x Check for merge conflicts #1684: Commit f8671e7 pushed by tdonohue
October 26, 2023 16:24 1m 24s dspace-7_x
dspace-7_x
October 26, 2023 16:24 1m 24s
Merge pull request #2464 from alexandrevryghem/i18n-cache-busting_con… Check for merge conflicts #1683: Commit 673f817 pushed by tdonohue
October 26, 2023 16:22 21s dspace-7_x
dspace-7_x
October 26, 2023 16:22 21s
Merge pull request #2542 from 4Science/DURACOM-190 Check for merge conflicts #1682: Commit 6828fa3 pushed by tdonohue
October 26, 2023 15:35 23s main
main
October 26, 2023 15:35 23s
Merge pull request #2458 from atmire/backport-2423-to-dspace-7_x Check for merge conflicts #1681: Commit 3b6dd66 pushed by tdonohue
October 25, 2023 21:38 7m 32s dspace-7_x
dspace-7_x
October 25, 2023 21:38 7m 32s
Merge pull request #2423 from atmire/fix-inherit-policies-at-item-move Check for merge conflicts #1680: Commit 81e3b36 pushed by tdonohue
October 25, 2023 21:31 26s main
main
October 25, 2023 21:31 26s
Merge pull request #2576 from tdonohue/port_2362_to_7x Check for merge conflicts #1679: Commit d6951dc pushed by tdonohue
October 25, 2023 21:06 22s dspace-7_x
dspace-7_x
October 25, 2023 21:06 22s
Merge pull request #2575 from tdonohue/port_2530_to_7x Check for merge conflicts #1678: Commit 1d2cdf7 pushed by tdonohue
October 25, 2023 20:18 21s dspace-7_x
dspace-7_x
October 25, 2023 20:18 21s
Merge pull request #2362 from Leano1998/making_user-menu-component_th… Check for merge conflicts #1677: Commit 3058a4b pushed by tdonohue
October 25, 2023 20:10 22s main
main
October 25, 2023 20:10 22s
Merge pull request #2530 from alexandrevryghem/fix-display-order-auth… Check for merge conflicts #1676: Commit daef3f5 pushed by tdonohue
October 25, 2023 19:24 25s main
main
October 25, 2023 19:24 25s
Support type-bind of elements based on repeatable list type-bound element (CHECKBOX_GROUP) Check for merge conflicts #1675: Pull request #2574 synchronize by mahnkong
October 25, 2023 14:35 17s
October 25, 2023 14:35 17s
Merge pull request #2571 from DSpace/backport-2553-to-dspace-7_x Check for merge conflicts #1674: Commit 73f21f2 pushed by alanorth
October 24, 2023 19:47 19s dspace-7_x
dspace-7_x
October 24, 2023 19:47 19s