Skip to content

Actions: pi-hole/FTL

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
1,401 workflow run results
1,401 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Hard-code two web threads for debugging aid Check for merge conflicts #3129: Commit c8fd11c pushed by DL6ER
December 29, 2024 20:58 10s tweak/two_webthreads
tweak/two_webthreads
December 29, 2024 20:58 10s
Merge pull request #2144 from catch-error/fix/leap-year-check Check for merge conflicts #3128: Commit 2fef926 pushed by DL6ER
December 29, 2024 17:25 2m 15s development
development
December 29, 2024 17:25 2m 15s
Extend d578da0665c496ca709c25ae8d6963d1bff141c4 to Linux-only code. Check for merge conflicts #3127: Commit 9a00632 pushed by DL6ER
December 24, 2024 13:12 14s update/dnsmasq
update/dnsmasq
December 24, 2024 13:12 14s
Merge pull request #2143 from pi-hole/fix/put_groups Check for merge conflicts #3126: Commit 1c1dff7 pushed by DL6ER
December 24, 2024 05:50 2m 10s development
development
December 24, 2024 05:50 2m 10s
Allow spaces also in PUT /api/groups Check for merge conflicts #3125: Commit c7358da pushed by DL6ER
December 24, 2024 01:46 10s fix/put_groups
fix/put_groups
December 24, 2024 01:46 10s
Allow spaces also in PUT /api/groups Check for merge conflicts #3124: Commit 4182d2d pushed by DL6ER
December 24, 2024 01:44 10s fix/put_groups
fix/put_groups
December 24, 2024 01:44 10s
Merge pull request #2142 from pi-hole/update/dnsmasq Check for merge conflicts #3123: Commit daa4fc1 pushed by DL6ER
December 24, 2024 01:23 2m 11s development
development
December 24, 2024 01:23 2m 11s
Get latest dnsmasq patches Check for merge conflicts #3122: Pull request #2142 synchronize by DL6ER
December 24, 2024 01:14 13s
December 24, 2024 01:14 13s
Update dnsmasq version string to latest tag Check for merge conflicts #3121: Commit 55f1f04 pushed by DL6ER
December 24, 2024 01:14 10s update/dnsmasq
update/dnsmasq
December 24, 2024 01:14 10s
Add newly assigned RRTYPE DSYNC Check for merge conflicts #3120: Commit 6fef2a3 pushed by DL6ER
December 23, 2024 19:08 12s update/dnsmasq
update/dnsmasq
December 23, 2024 19:08 12s
Add new explicit migration command Check for merge conflicts #3119: Pull request #2139 synchronize by DL6ER
December 23, 2024 07:50 11s
December 23, 2024 07:50 11s
Output progress to terminal Check for merge conflicts #3118: Commit 7606fac pushed by DL6ER
December 23, 2024 07:50 10s fix/migration
fix/migration
December 23, 2024 07:50 10s
Merge pull request #2141 from pi-hole/fix/dnsmasq_multi_replies Check for merge conflicts #3117: Commit 2237f97 pushed by DL6ER
December 22, 2024 20:27 2m 10s development
development
December 22, 2024 20:27 2m 10s
Move callback for multiple replies into the loop Check for merge conflicts #3116: Commit d8a1d82 pushed by DL6ER
December 22, 2024 17:13 12s fix/dnsmasq_multi_replies
fix/dnsmasq_multi_replies
December 22, 2024 17:13 12s
Update src/tools/dhcpv6-discover.c Check for merge conflicts #3114: Commit d7c9e52 pushed by DL6ER
December 22, 2024 08:31 11s new/dhcpv6
new/dhcpv6
December 22, 2024 08:31 11s
Add DHCPv6 probing to dhcp-discover tool Check for merge conflicts #3115: Pull request #2128 synchronize by DL6ER
December 22, 2024 08:31 11s
December 22, 2024 08:31 11s
Tweak NTP error reporting Check for merge conflicts #3113: Pull request #2125 synchronize by DL6ER
December 22, 2024 07:52 10s
December 22, 2024 07:52 10s
Update src/ntp/client.c Check for merge conflicts #3112: Commit a673d3f pushed by DL6ER
December 22, 2024 07:52 11s tweak/ntp_errors
tweak/ntp_errors
December 22, 2024 07:52 11s
Merge pull request #2135 from pi-hole/new/queries_ede Check for merge conflicts #3111: Commit c04fa58 pushed by DL6ER
December 22, 2024 07:39 2m 10s development
development
December 22, 2024 07:39 2m 10s
Merge pull request #2137 from pi-hole/update/civetweb Check for merge conflicts #3110: Commit 6fbea06 pushed by DL6ER
December 22, 2024 07:13 2m 9s development
development
December 22, 2024 07:13 2m 9s
Merge pull request #2136 from pi-hole/update/dnsmasq Check for merge conflicts #3109: Commit f7bcff3 pushed by DL6ER
December 22, 2024 06:49 2m 9s development
development
December 22, 2024 06:49 2m 9s
Update comment in src/tools/dhcpv6-discover.c Check for merge conflicts #3107: Commit f921ee4 pushed by DL6ER
December 21, 2024 17:33 10s new/dhcpv6
new/dhcpv6
December 21, 2024 17:33 10s
Add DHCPv6 probing to dhcp-discover tool Check for merge conflicts #3108: Pull request #2128 synchronize by DL6ER
December 21, 2024 17:33 11s
December 21, 2024 17:33 11s
Update dnsmasq tag Check for merge conflicts #3105: Commit 7bcc4df pushed by DL6ER
December 21, 2024 10:40 10s update/dnsmasq
update/dnsmasq
December 21, 2024 10:40 10s
Update embedded dnsmasq to latest tag v2.91test2 Check for merge conflicts #3106: Pull request #2136 synchronize by DL6ER
December 21, 2024 10:40 14s
December 21, 2024 10:40 14s