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,762 workflow runs
1,762 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add regex filtering support for domains on the Query Log Check for merge conflicts #1785: Pull request #1611 synchronize by DL6ER
January 10, 2024 20:50 9s
January 10, 2024 20:50 9s
Further simplify skipping logic Check for merge conflicts #1784: Commit cff605b pushed by DL6ER
January 10, 2024 20:50 10s new/queryLogRegex
new/queryLogRegex
January 10, 2024 20:50 10s
Add regex filtering support for domains on the Query Log Check for merge conflicts #1783: Pull request #1611 synchronize by DL6ER
January 10, 2024 20:46 11s
January 10, 2024 20:46 11s
Regex filtering is filtering: We need to do full counting to get the … Check for merge conflicts #1782: Commit 23d116c pushed by DL6ER
January 10, 2024 20:45 11s new/queryLogRegex
new/queryLogRegex
January 10, 2024 20:45 11s
Merge branch 'development-v6' into fix/delete_dhcp_lease Check for merge conflicts #1781: Commit e24c363 pushed by DL6ER
January 10, 2024 19:02 10s fix/delete_dhcp_lease
fix/delete_dhcp_lease
January 10, 2024 19:02 10s
Managing DHCP leases is only possible when the DHCP server is enabled Check for merge conflicts #1780: Pull request #1703 synchronize by DL6ER
January 10, 2024 19:02 11s
January 10, 2024 19:02 11s
Merge pull request #1839 from pi-hole/new/who_murders_me Check for merge conflicts #1779: Commit 02962d9 pushed by DL6ER
January 10, 2024 18:43 2m 12s development-v6
development-v6
January 10, 2024 18:43 2m 12s
Merge pull request #1836 from pi-hole/fix/delete_codes Check for merge conflicts #1778: Commit 4372797 pushed by DL6ER
January 8, 2024 18:38 2m 18s development-v6
development-v6
January 8, 2024 18:38 2m 18s
Merge pull request #1854 from pi-hole/no_double Check for merge conflicts #1777: Commit 7497937 pushed by DL6ER
January 8, 2024 17:52 2m 14s development-v6
development-v6
January 8, 2024 17:52 2m 14s
Don't print double newlines after invalid domains Check for merge conflicts #1776: Commit 4174fe3 pushed by yubiuser
January 7, 2024 21:25 13s no_double
no_double
January 7, 2024 21:25 13s
Fix DELETE API endpoints return codes Check for merge conflicts #1775: Pull request #1836 synchronize by DL6ER
January 7, 2024 20:16 12s
January 7, 2024 20:16 12s
Do not rely on the old behavior of empty password is always correct w… Check for merge conflicts #1774: Commit 14af354 pushed by DL6ER
January 7, 2024 20:16 13s fix/delete_codes
fix/delete_codes
January 7, 2024 20:16 13s
Fix DELETE API endpoints return codes Check for merge conflicts #1773: Pull request #1836 synchronize by DL6ER
January 7, 2024 14:27 11s
January 7, 2024 14:27 11s
Do not accept password login when the system is configured to not req… Check for merge conflicts #1772: Commit 35e1acb pushed by DL6ER
January 7, 2024 14:27 11s fix/delete_codes
fix/delete_codes
January 7, 2024 14:27 11s
Merge branch 'development-v6' into new/queryLogRegex Check for merge conflicts #1771: Commit ee367a6 pushed by DL6ER
January 7, 2024 08:59 13s new/queryLogRegex
new/queryLogRegex
January 7, 2024 08:59 13s
Add regex filtering support for domains on the Query Log Check for merge conflicts #1770: Pull request #1611 synchronize by DL6ER
January 7, 2024 08:59 10s
January 7, 2024 08:59 10s
Limit number of clients returned by /api/history/clients Check for merge conflicts #1769: Pull request #1832 synchronize by DL6ER
January 7, 2024 08:55 12s
January 7, 2024 08:55 12s
Merge branch 'development-v6' into tweak/limit_history_clients Check for merge conflicts #1768: Commit 901d838 pushed by DL6ER
January 7, 2024 08:55 14s tweak/limit_history_clients
tweak/limit_history_clients
January 7, 2024 08:55 14s
Fix DELETE API endpoints return codes Check for merge conflicts #1767: Pull request #1836 synchronize by DL6ER
January 7, 2024 08:51 13s
January 7, 2024 08:51 13s
Extend 204/404 logic to /dhcp/leases/{ip} Check for merge conflicts #1766: Commit 1d83e39 pushed by DL6ER
January 7, 2024 08:51 10s fix/delete_codes
fix/delete_codes
January 7, 2024 08:51 10s
Fix DELETE API endpoints return codes Check for merge conflicts #1765: Pull request #1836 synchronize by DL6ER
January 7, 2024 08:50 13s
January 7, 2024 08:50 13s
Extend 240/404 logic to /dhcp/leases/{ip} Check for merge conflicts #1764: Commit 22ca770 pushed by DL6ER
January 7, 2024 08:50 11s fix/delete_codes
fix/delete_codes
January 7, 2024 08:50 11s
Merge pull request #1728 from pi-hole/tweak/query_auth Check for merge conflicts #1763: Commit 933e6f6 pushed by DL6ER
January 7, 2024 06:51 2m 35s development-v6
development-v6
January 7, 2024 06:51 2m 35s
Merge pull request #1851 from pi-hole/new/location Check for merge conflicts #1762: Commit 3446492 pushed by DL6ER
January 7, 2024 06:50 2m 13s development-v6
development-v6
January 7, 2024 06:50 2m 13s
Merge pull request #1813 from pi-hole/fix/too_many_top_domains Check for merge conflicts #1761: Commit 9b9e7b7 pushed by DL6ER
January 7, 2024 06:50 2m 12s development-v6
development-v6
January 7, 2024 06:50 2m 12s
ProTip! You can narrow down the results and go further in time using created:<2024-01-07 or the other filters available.