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

Limit number of clients returned by /api/history/clients Check for merge conflicts #1812: Pull request #1832 synchronize by DL6ER
January 16, 2024 20:52 9s
January 16, 2024 20:52 9s
Change order of objects in documentation (small nit pick) Check for merge conflicts #1811: Commit 3c58e30 pushed by DL6ER
January 16, 2024 20:52 11s tweak/limit_history_clients
tweak/limit_history_clients
January 16, 2024 20:52 11s
Merge pull request #1859 from pi-hole/fix/remote_version Check for merge conflicts #1810: Commit ff452fc pushed by DL6ER
January 15, 2024 21:09 2m 12s development-v6
development-v6
January 15, 2024 21:09 2m 12s
Merge pull request #1858 from pi-hole/update/sqlite_3.45.0 Check for merge conflicts #1809: Commit 9fc4a50 pushed by DL6ER
January 15, 2024 20:03 2m 10s development-v6
development-v6
January 15, 2024 20:03 2m 10s
Return null as version in /api/info/version if not available Check for merge conflicts #1808: Commit 12e7f44 pushed by DL6ER
January 15, 2024 19:59 11s fix/remote_version
fix/remote_version
January 15, 2024 19:59 11s
Update embedded SQLite 3 to 3.45.0 Check for merge conflicts #1807: Commit 1bf26f0 pushed by DL6ER
January 15, 2024 19:09 16s update/sqlite_3.45.0
update/sqlite_3.45.0
January 15, 2024 19:09 16s
Merge branch 'development-v6' into update/dnsmasq Check for merge conflicts #1806: Commit edc4da9 pushed by DL6ER
January 14, 2024 16:33 11s update/dnsmasq
update/dnsmasq
January 14, 2024 16:33 11s
Merge pull request #1856 from pi-hole/dependabot-github_actions-devel… Check for merge conflicts #1805: Commit 806d608 pushed by yubiuser
January 13, 2024 19:44 2m 11s development-v6
development-v6
January 13, 2024 19:44 2m 11s
Bump the github_action-dependencies group with 3 updates Check for merge conflicts #1804: Commit fc06beb pushed by dependabot bot
January 13, 2024 10:51 13s dependabot-github_actions-development-github_action-dependencies-2a84e71f78
dependabot-github_actions-development-github_action-dependencies-2a84e71f78
January 13, 2024 10:51 13s
Bump the github_action-dependencies group with 2 updates Check for merge conflicts #1803: Commit 82f7986 pushed by dependabot bot
January 13, 2024 10:24 13s dependabot-github_actions-development-v6-github_action-dependencies-515e419fdb
dependabot-github_actions-development-v6-github_action-dependencies-515e419fdb
January 13, 2024 10:24 13s
Limit number of clients returned by /api/history/clients Check for merge conflicts #1802: Pull request #1832 synchronize by DL6ER
January 13, 2024 09:50 21s
January 13, 2024 09:50 21s
Add new config option to API Check for merge conflicts #1801: Commit 4e5521f pushed by DL6ER
January 13, 2024 09:50 12s tweak/limit_history_clients
tweak/limit_history_clients
January 13, 2024 09:50 12s
Check all env vars and suggest alternatives for misspelled keys Check for merge conflicts #1800: Pull request #1719 synchronize by DL6ER
January 13, 2024 09:47 12s
January 13, 2024 09:47 12s
Merge branch 'development-v6' into tweak/env_vars_list Check for merge conflicts #1799: Commit b05fe82 pushed by DL6ER
January 13, 2024 09:47 11s tweak/env_vars_list
tweak/env_vars_list
January 13, 2024 09:47 11s
Merge pull request #1752 from pi-hole/remove/local.list Check for merge conflicts #1798: Commit 8332913 pushed by DL6ER
January 13, 2024 09:45 2m 10s development-v6
development-v6
January 13, 2024 09:45 2m 10s
Merge pull request #1831 from pi-hole/update/ftl-build Check for merge conflicts #1797: Commit dfde994 pushed by DL6ER
January 13, 2024 09:39 2m 10s development-v6
development-v6
January 13, 2024 09:39 2m 10s
Add regex filtering support for domains on the Query Log Check for merge conflicts #1794: Pull request #1611 synchronize by DL6ER
January 13, 2024 09:23 10s
January 13, 2024 09:23 10s
Adjust webserver.api.exclude{Clients,Domains} description Check for merge conflicts #1793: Commit 55339f0 pushed by DL6ER
January 13, 2024 09:23 13s new/queryLogRegex
new/queryLogRegex
January 13, 2024 09:23 13s
Add regex filtering support for domains on the Query Log Check for merge conflicts #1792: Pull request #1611 synchronize by DL6ER
January 13, 2024 07:26 9s
January 13, 2024 07:26 9s
Add Pi-hole v5 -> v6 regex migration for webserver.api.exclude{Domain… Check for merge conflicts #1791: Commit b7f49e9 pushed by DL6ER
January 13, 2024 07:26 15s new/queryLogRegex
new/queryLogRegex
January 13, 2024 07:26 15s
Add regex filtering support for domains on the Query Log Check for merge conflicts #1790: Pull request #1611 synchronize by DL6ER
January 13, 2024 07:21 13s
January 13, 2024 07:21 13s
Remove webserver.api.excludeRegex and instead allow regex to be used … Check for merge conflicts #1789: Commit e9e4309 pushed by DL6ER
January 13, 2024 07:21 10s new/queryLogRegex
new/queryLogRegex
January 13, 2024 07:21 10s
Merge pull request #1703 from pi-hole/fix/delete_dhcp_lease Check for merge conflicts #1788: Commit b0c2ab9 pushed by DL6ER
January 11, 2024 20:58 2m 13s development-v6
development-v6
January 11, 2024 20:58 2m 13s
Add regex filtering support for domains on the Query Log Check for merge conflicts #1787: Pull request #1611 synchronize by DL6ER
January 11, 2024 16:50 15s
January 11, 2024 16:50 15s
Only compare against valid filter strings Check for merge conflicts #1786: Commit 4024af9 pushed by DL6ER
January 11, 2024 16:50 17s new/queryLogRegex
new/queryLogRegex
January 11, 2024 16:50 17s
ProTip! You can narrow down the results and go further in time using created:<2024-01-11 or the other filters available.