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,534 workflow runs
1,534 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 begi… Check for merge conflicts #2329: Commit be86950 pushed by DL6ER
January 3, 2025 09:35 2m 10s development
development
January 3, 2025 09:35 2m 10s
Add possibility to assign groups to newly added entries from the beginning Check for merge conflicts #2328: Pull request #3187 synchronize by DL6ER
January 2, 2025 11:42 8s
January 2, 2025 11:42 8s
Tweak CSS used to format Group Assignment control (#3188) Check for merge conflicts #2327: Commit ad3a553 pushed by DL6ER
January 2, 2025 11:42 12s new/group_assign
new/group_assign
January 2, 2025 11:42 12s
Bump datatables.net-bs from 1.10.21 to 2.1.8 Check for merge conflicts #2326: Pull request #3156 synchronize by dependabot bot
December 30, 2024 13:13 10s
December 30, 2024 13:13 10s
Bump datatables.net-bs from 1.10.21 to 2.1.8 Check for merge conflicts #2325: Commit 46cdefb pushed by dependabot bot
December 30, 2024 13:13 13s dependabot/npm_and_yarn/development/datatables.net-bs-2.1.8
dependabot/npm_and_yarn/development/datatables.net-bs-2.1.8
December 30, 2024 13:13 13s
Bump datatables.net-bs from 1.10.21 to 2.1.8 Check for merge conflicts #2324: Commit 90b5bd5 pushed by yubiuser
December 30, 2024 13:12 12s dependabot/npm_and_yarn/development/datatables.net-bs-2.1.8
dependabot/npm_and_yarn/development/datatables.net-bs-2.1.8
December 30, 2024 13:12 12s
Fix "Query Log" button color (LCARS theme) Check for merge conflicts #2323: Commit 0e3c680 pushed by rdwebdesign
December 24, 2024 21:08 12s tweak/group_assign_CSS
tweak/group_assign_CSS
December 24, 2024 21:08 12s
Adjust style for the "group assignment" control Check for merge conflicts #2322: Commit 46092a4 pushed by rdwebdesign
December 24, 2024 20:49 10s tweak/group_assign_CSS
tweak/group_assign_CSS
December 24, 2024 20:49 10s
Add possibility to assign groups to newly added entries from the beginning Check for merge conflicts #2321: Pull request #3187 synchronize by rdwebdesign
December 23, 2024 18:38 9s
December 23, 2024 18:38 9s
Change columns width in medium size screens to avoid overflow Check for merge conflicts #2320: Commit 6ab55c4 pushed by rdwebdesign
December 23, 2024 18:38 10s new/group_assign
new/group_assign
December 23, 2024 18:38 10s
Add possibility to assign groups to newly added entries from the beginning Check for merge conflicts #2319: Pull request #3187 synchronize by rdwebdesign
December 23, 2024 18:33 11s
December 23, 2024 18:33 11s
Change columns width in medium size screens to avoid overflow Check for merge conflicts #2318: Commit 57306bc pushed by rdwebdesign
December 23, 2024 18:33 10s new/group_assign
new/group_assign
December 23, 2024 18:33 10s
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