Skip to content

Actions: pi-hole/web

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
1,562 workflow runs
1,562 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add possibility to assign groups to newly added entries from the beginning Check for merge conflicts #2317: Pull request #3187 synchronize by DL6ER
December 23, 2024 17:06 13s
December 23, 2024 17:06 13s
Fix ability to add groups with spaces in them if thy are enclosed in … Check for merge conflicts #2316: Commit f91e8a0 pushed by DL6ER
December 23, 2024 17:06 10s new/group_assign
new/group_assign
December 23, 2024 17:06 10s
Add possibility to assign groups to newly added entries from the beginning Check for merge conflicts #2315: Pull request #3187 synchronize by DL6ER
December 23, 2024 16:47 10s
December 23, 2024 16:47 10s
Fix ability to add groups with spaces in them if thy are enclosed in … Check for merge conflicts #2314: Commit cfa26d5 pushed by DL6ER
December 23, 2024 16:47 10s new/group_assign
new/group_assign
December 23, 2024 16:47 10s
Add possibility to assign groups to newly added entries from the begi… Check for merge conflicts #2313: Commit fcbc8a7 pushed by DL6ER
December 23, 2024 11:37 10s new/group_assign
new/group_assign
December 23, 2024 11:37 10s
Show extended DNS error (if applicable) (#3184) Check for merge conflicts #2312: Commit 943a2e5 pushed by DL6ER
December 22, 2024 07:39 2m 14s development
development
December 22, 2024 07:39 2m 14s
Show DNSSEC status icon (if applicable) Check for merge conflicts #2311: Pull request #3185 synchronize by rdwebdesign
December 21, 2024 22:32 10s
December 21, 2024 22:32 10s
Apply review suggestion Check for merge conflicts #2310: Commit 607ef8a pushed by rdwebdesign
December 21, 2024 22:32 9s new/dnssec_icon
new/dnssec_icon
December 21, 2024 22:32 9s
Show DNSSEC status icon (if applicable) Check for merge conflicts #2309: Pull request #3185 synchronize by rdwebdesign
December 21, 2024 21:40 9s
December 21, 2024 21:40 9s
Actually move the icon to the left Check for merge conflicts #2308: Commit fa36f64 pushed by rdwebdesign
December 21, 2024 21:40 12s new/dnssec_icon
new/dnssec_icon
December 21, 2024 21:40 12s
Bump @fortawesome/fontawesome-free from 6.7.1 to 6.7.2 (#3186) Check for merge conflicts #2307: Commit 327171d pushed by yubiuser
December 21, 2024 12:06 2m 10s development
development
December 21, 2024 12:06 2m 10s
Bump @fortawesome/fontawesome-free from 6.7.1 to 6.7.2 Check for merge conflicts #2306: Pull request #3186 synchronize by yubiuser
December 21, 2024 12:02 9s
December 21, 2024 12:02 9s
Update js file Check for merge conflicts #2305: Commit f69a309 pushed by yubiuser
December 21, 2024 12:02 10s dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.7.2
dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.7.2
December 21, 2024 12:02 10s
Bump @fortawesome/fontawesome-free from 6.7.1 to 6.7.2 Check for merge conflicts #2304: Commit 218ea86 pushed by dependabot bot
December 21, 2024 10:46 12s dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.7.2
dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.7.2
December 21, 2024 10:46 12s
Show DNSSEC status icon (if applicable) Check for merge conflicts #2303: Pull request #3185 synchronize by rdwebdesign
December 19, 2024 17:57 8s
December 19, 2024 17:57 8s
Left align DNSSEC icons Check for merge conflicts #2302: Commit 8f57898 pushed by rdwebdesign
December 19, 2024 17:57 10s new/dnssec_icon
new/dnssec_icon
December 19, 2024 17:57 10s
Use better icon Check for merge conflicts #2301: Commit 43efed6 pushed by DL6ER
December 18, 2024 20:39 13s new/dnssec_icon
new/dnssec_icon
December 18, 2024 20:39 13s
Show DNSSEC status icon (if applicable) Check for merge conflicts #2300: Pull request #3185 synchronize by DL6ER
December 18, 2024 20:39 11s
December 18, 2024 20:39 11s
Show DNSSEC status icon (if applicable) Check for merge conflicts #2299: Commit 1bf622f pushed by DL6ER
December 18, 2024 10:37 12s new/dnssec_icon
new/dnssec_icon
December 18, 2024 10:37 12s
consistent naming for forum (#3183) Check for merge conflicts #2298: Commit 51545cc pushed by DL6ER
December 18, 2024 10:36 10s new/dnssec_icon
new/dnssec_icon
December 18, 2024 10:36 10s
Show extended DNS error (if applicable) Check for merge conflicts #2297: Commit e7a97d3 pushed by DL6ER
December 18, 2024 09:56 13s new/queries_ede
new/queries_ede
December 18, 2024 09:56 13s
consistent naming for forum (#3183) Check for merge conflicts #2296: Commit 51545cc pushed by yubiuser
December 16, 2024 19:46 2m 11s development
development
December 16, 2024 19:46 2m 11s
consistent naming for forum Check for merge conflicts #2295: Pull request #3183 synchronize by stonerl
December 16, 2024 19:39 10s
December 16, 2024 19:39 10s
Bump eslint-plugin-compat from 6.0.1 to 6.0.2 (#3182) Check for merge conflicts #2294: Commit 87b1977 pushed by yubiuser
December 14, 2024 10:56 2m 11s development
development
December 14, 2024 10:56 2m 11s
Bump eslint-plugin-compat from 6.0.1 to 6.0.2 Check for merge conflicts #2293: Commit 3eeacb1 pushed by dependabot bot
December 14, 2024 10:44 9s dependabot/npm_and_yarn/development/eslint-plugin-compat-6.0.2
dependabot/npm_and_yarn/development/eslint-plugin-compat-6.0.2
December 14, 2024 10:44 9s