Skip to content

Actions: pi-hole/PADD

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
177 workflow runs
177 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Redefine jq's paths() as its built-in function skips all pais with va… Check for merge conflicts #406: Commit 1310ea8 pushed by DL6ER
August 7, 2024 20:26 12s new/api_padd
new/api_padd
August 7, 2024 20:26 12s
Redefine jq's paths() as its built-in function skips all pais with va… Check for merge conflicts #405: Commit cbdccfd pushed by DL6ER
August 7, 2024 18:59 13s new/api_padd
new/api_padd
August 7, 2024 18:59 13s
Use jq only once for parsing the entire payload after querying the API Check for merge conflicts #404: Commit 113ef44 pushed by DL6ER
August 7, 2024 18:27 11s new/api_padd
new/api_padd
August 7, 2024 18:27 11s
Use jq only once for parsing the entire payload after querying the API Check for merge conflicts #403: Commit 825cad1 pushed by DL6ER
August 7, 2024 18:25 15s new/api_padd
new/api_padd
August 7, 2024 18:25 15s
Use new FTL api/padd endpoint for querying the data Check for merge conflicts #402: Commit 5559796 pushed by DL6ER
August 5, 2024 17:05 13s new/api_padd
new/api_padd
August 5, 2024 17:05 13s
Suppress curl and floating number conversion Check for merge conflicts #401: Pull request #397 synchronize by yubiuser
August 5, 2024 11:46 10s
August 5, 2024 11:46 10s
Mitigate jq error when FTL is down when getting gateway interface inf… Check for merge conflicts #400: Commit 9649c6f pushed by yubiuser
August 5, 2024 11:46 16s silence/curl
silence/curl
August 5, 2024 11:46 16s
Suppress curl and floating number conversion Check for merge conflicts #399: Pull request #397 synchronize by yubiuser
August 5, 2024 11:25 15s
August 5, 2024 11:25 15s
Mitigate jq error when FTL is down when getting gateway interface inf… Check for merge conflicts #398: Commit 39f402c pushed by yubiuser
August 5, 2024 11:25 14s silence/curl
silence/curl
August 5, 2024 11:25 14s
Suppress curl and floating number conversion Check for merge conflicts #397: Pull request #397 synchronize by yubiuser
July 27, 2024 17:01 14s
July 27, 2024 17:01 14s
Guard floating number conversion Check for merge conflicts #396: Commit aac2860 pushed by yubiuser
July 27, 2024 17:01 10s silence/curl
silence/curl
July 27, 2024 17:01 10s
Suppress curl and floating number conversion Check for merge conflicts #395: Pull request #397 synchronize by yubiuser
July 24, 2024 11:37 11s
July 24, 2024 11:37 11s
Fix indention Check for merge conflicts #394: Commit 2d461e7 pushed by yubiuser
July 24, 2024 11:37 12s silence/curl
silence/curl
July 24, 2024 11:37 12s
Make PADD compatible with FTLv6 Check for merge conflicts #393: Pull request #247 synchronize by DL6ER
July 23, 2024 16:05 2m 11s
July 23, 2024 16:05 2m 11s
Modify PADD to comply with the changes in FTL on the same branch (#395) Check for merge conflicts #392: Commit b719987 pushed by DL6ER
July 23, 2024 16:05 2m 14s PADD_FTLv6
PADD_FTLv6
July 23, 2024 16:05 2m 14s
Make PADD compatible with FTLv6 Check for merge conflicts #391: Pull request #247 synchronize by yubiuser
July 23, 2024 05:51 2m 14s
July 23, 2024 05:51 2m 14s
Check for curl and jq dependencies (#398) Check for merge conflicts #390: Commit 5d9090c pushed by yubiuser
July 23, 2024 05:51 2m 15s PADD_FTLv6
PADD_FTLv6
July 23, 2024 05:51 2m 15s
Modify PADD to comply with the changes in FTL on the same branch Check for merge conflicts #389: Pull request #395 synchronize by DL6ER
July 22, 2024 12:16 11s
July 22, 2024 12:16 11s
Fallback: If there is no default IPv6 gateway, use the default IPv4 g… Check for merge conflicts #388: Commit ef97d5b pushed by DL6ER
July 22, 2024 12:16 11s tweak/api_network_info
tweak/api_network_info
July 22, 2024 12:16 11s
Check for curl and jq dependencies Check for merge conflicts #387: Pull request #398 synchronize by yubiuser
July 18, 2024 08:05 14s
July 18, 2024 08:05 14s
No need to check for wget in update routine as we check for curl duri… Check for merge conflicts #386: Commit f918bff pushed by yubiuser
July 18, 2024 08:05 16s check/jq
check/jq
July 18, 2024 08:05 16s
No need to check for wget in update routine as we check for curl duri… Check for merge conflicts #385: Commit 31eca8f pushed by yubiuser
July 18, 2024 07:54 15s check/jq
check/jq
July 18, 2024 07:54 15s
Suppress curl and floating number conversion Check for merge conflicts #384: Pull request #397 synchronize by yubiuser
July 17, 2024 20:41 17s
July 17, 2024 20:41 17s
Merge branch 'PADD_FTLv6' into silence/curl Check for merge conflicts #383: Commit 5746ce9 pushed by yubiuser
July 17, 2024 20:41 13s silence/curl
silence/curl
July 17, 2024 20:41 13s
Suppress curl and floating number conversion Check for merge conflicts #382: Pull request #397 synchronize by yubiuser
July 17, 2024 20:38 14s
July 17, 2024 20:38 14s