Skip to content

Actions: joomla/joomla-cms

Actions

Detect merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[5.4] Fix passkey silent MFA enforcement Detect merge conflicts #290: Pull request #47380 synchronize by richard67
10s
10s
[5.4] Fix passkey silent MFA enforcement Detect merge conflicts #289: Pull request #47380 synchronize by eshantharjun9-hub
8s
8s
[5.4] Fix passkey silent MFA enforcement Detect merge conflicts #288: Pull request #47380 synchronize by eshantharjun9-hub
10s
10s
[5.4][AI] Prevent custom fields from overwriting core properties in JSON API responses Detect merge conflicts #287: Pull request #47317 synchronize by Harsh63870
9s
9s
[5.4][AI] Prevent custom fields from overwriting core properties in JSON API responses Detect merge conflicts #286: Pull request #47317 synchronize by Harsh63870
10s
10s
[6.1] Rename and improve update SQL scripts for the 6.1.0 what's new … Detect merge conflicts #285: Commit e823146 pushed by tecpromotion
4m 10s 6.1-dev
6.1-dev
4m 10s
[5.4] Use "DRONE_BRANCH" instead of "MINORVERSION" variable for night… Detect merge conflicts #284: Commit 7b40e81 pushed by richard67
2m 11s 5.4-dev
5.4-dev
2m 11s
[5.4] Use "DRONE_BRANCH" instead of "MINORVERSION" variable for nightly build commands Detect merge conflicts #283: Pull request #47390 synchronize by richard67
9s
9s
Try to fix nightly build Detect merge conflicts #282: Commit 0630041 pushed by HLeithner
2m 8s 5.4-dev
5.4-dev
2m 8s
[5.4] Hide Versions button when com_contenthistory is disabled Detect merge conflicts #281: Pull request #47388 synchronize by adarshdubey03
10s
10s
[5.4] Fix null value for date in publish_up Detect merge conflicts #280: Pull request #47213 synchronize by chmst
10s
10s
Fix accessibility issue with Back-to-Top link Detect merge conflicts #279: Pull request #47307 synchronize by ankushx01-dev
12s
12s
[6.1] Fix workflow graph strings and assets (#47248) Detect merge conflicts #278: Commit 4853992 pushed by tecpromotion
4m 12s 6.1-dev
6.1-dev
4m 12s
[6.1] Fix workflow graph strings and assets Detect merge conflicts #277: Pull request #47248 synchronize by tecpromotion
11s
11s
[5.4] Prevent recursions in loadposition/loadmodule plugin Detect merge conflicts #276: Pull request #47208 synchronize by richard67
11s
11s
[6.1] Default new user's assigned group to active group filter Detect merge conflicts #275: Pull request #47366 synchronize by richard67
8s
8s
[7.0] A11y drag and drop Detect merge conflicts #274: Pull request #47328 synchronize by dgrammatiko
10s
10s
[5.4] Fix passkey silent MFA enforcement Detect merge conflicts #273: Pull request #47380 synchronize by eshantharjun9-hub
11s
11s
[5.4] fix missing joomla version in nightly notification (#47274) Detect merge conflicts #272: Commit 9ad34f2 pushed by richard67
2m 10s 5.4-dev
5.4-dev
2m 10s
[5.4] fix missing joomla version in nightly notification Detect merge conflicts #271: Pull request #47274 synchronize by richard67
9s
9s
[6.1] What's new tour for Joomla 6.1 (#47229) Detect merge conflicts #270: Commit 70adb42 pushed by tecpromotion
4m 12s 6.1-dev
6.1-dev
4m 12s
[6.1] What's new tour for Joomla 6.1 Detect merge conflicts #269: Pull request #47229 synchronize by tecpromotion
10s
10s
[5.4] Translation Update (#47320) Detect merge conflicts #268: Commit cfe8cf8 pushed by muhme
2m 12s 5.4-dev
5.4-dev
2m 12s
[5.4] Translation Update Detect merge conflicts #267: Pull request #47320 synchronize by muhme
10s
10s
[5.4] fix missing joomla version in nightly notification Detect merge conflicts #266: Pull request #47274 synchronize by HLeithner
10s
10s