Skip to content

Actions: pi-hole/PADD

Actions

Check for merge conflicts

Actions

Loading...

Show workflow options

Create status badge

merge-conflict.yml
146 workflow runs
146 workflow runs
Event

Filter by event
Status

Filter by status
Branch
Actor

Filter by actor
Deleting a session successfully returns 204 Check for merge conflicts #326: Pull request #379 synchronize by yubiuser
January 7, 2024 20:05 14s
January 7, 2024 20:05 14s
Status 200 is gone Check for merge conflicts #325: Commit 79ca42e pushed by yubiuser
January 7, 2024 20:05 9s delete_session
delete_session
January 7, 2024 20:05 9s
[WIP] Make PADD compatible with FTLv6 Check for merge conflicts #324: Pull request #247 synchronize by yubiuser
January 7, 2024 14:45 12s
January 7, 2024 14:45 12s
Use CHAOS TXT record to construct FTL's API URL (#376) Check for merge conflicts #323: Commit b625aca pushed by yubiuser
January 7, 2024 14:45 2m 11s PADD_FTLv6
PADD_FTLv6
January 7, 2024 14:45 2m 11s
Deleting a session successfully returns 204 Check for merge conflicts #322: Commit ec5a26a pushed by yubiuser
January 7, 2024 12:32 10s delete_session
delete_session
January 7, 2024 12:32 10s
Use CHAOS TXT record to construct FTL's API URL Check for merge conflicts #321: Pull request #376 synchronize by yubiuser
January 7, 2024 11:56 11s
January 7, 2024 11:56 11s
Return N/A in case FTL can't figure out the device model Check for merge conflicts #320: Commit ec305e6 pushed by yubiuser
January 7, 2024 11:56 11s chaos
chaos
January 7, 2024 11:56 11s
[WIP] Make PADD compatible with FTLv6 Check for merge conflicts #319: Pull request #247 synchronize by yubiuser
January 7, 2024 11:45 13s
January 7, 2024 11:45 13s
The correct key is config.dns.revServer.active (#378) Check for merge conflicts #318: Commit c835824 pushed by yubiuser
January 7, 2024 11:45 2m 13s PADD_FTLv6
PADD_FTLv6
January 7, 2024 11:45 2m 13s
The correct key is config.dns.revServer.active Check for merge conflicts #317: Commit 353c003 pushed by DL6ER
January 7, 2024 09:07 12s fix/revServer
fix/revServer
January 7, 2024 09:07 12s
vNext Check for merge conflicts #316: Pull request #373 synchronize by yubiuser
December 9, 2023 11:48 2m 10s
December 9, 2023 11:48 2m 10s
Bump actions/stale from 8.0.0 to 9.0.0 (#377) Check for merge conflicts #315: Commit 2e4c461 pushed by yubiuser
December 9, 2023 11:48 19s development
development
December 9, 2023 11:48 19s
Bump actions/stale from 8.0.0 to 9.0.0 Check for merge conflicts #314: Commit 552ece2 pushed by dependabot bot
December 9, 2023 10:35 12s dependabot/github_actions/development/actions/stale-9.0.0
dependabot/github_actions/development/actions/stale-9.0.0
December 9, 2023 10:35 12s
Use CHAOS TXT record to construct FTL's API URL Check for merge conflicts #313: Pull request #376 synchronize by yubiuser
December 5, 2023 22:21 14s
December 5, 2023 22:21 14s
Improve error handling Check for merge conflicts #312: Commit 266a711 pushed by yubiuser
December 5, 2023 22:21 13s chaos
chaos
December 5, 2023 22:21 13s
[WIP] Make PADD compatible with FTLv6 Check for merge conflicts #311: Pull request #247 synchronize by yubiuser
December 2, 2023 21:15 14s
December 2, 2023 21:15 14s
Merge branch 'development' into PADD_FTLv6 Check for merge conflicts #310: Commit b1dc435 pushed by yubiuser
December 2, 2023 21:15 2m 14s PADD_FTLv6
PADD_FTLv6
December 2, 2023 21:15 2m 14s
Adjust endpoints Check for merge conflicts #309: Commit 1b243f4 pushed by yubiuser
December 2, 2023 21:09 18s chaos
chaos
December 2, 2023 21:09 18s
Add HTTPS support to PADD Check for merge conflicts #308: Commit b5c2524 pushed by DL6ER
October 29, 2023 10:47 12s new/https
new/https
October 29, 2023 10:47 12s
Add HTTPS support to PADD Check for merge conflicts #307: Commit 76651ef pushed by DL6ER
October 29, 2023 10:42 13s new/https
new/https
October 29, 2023 10:42 13s
vNext Check for merge conflicts #306: Pull request #373 synchronize by yubiuser
October 21, 2023 11:25 14s
October 21, 2023 11:25 14s
Bump actions/checkout from 4.1.0 to 4.1.1 (#374) Check for merge conflicts #305: Commit 31dd636 pushed by yubiuser
October 21, 2023 11:25 2m 13s development
development
October 21, 2023 11:25 2m 13s
Bump actions/checkout from 4.1.0 to 4.1.1 Check for merge conflicts #304: Commit 13dbce3 pushed by dependabot bot
October 21, 2023 10:42 17s dependabot/github_actions/development/actions/checkout-4.1.1
dependabot/github_actions/development/actions/checkout-4.1.1
October 21, 2023 10:42 17s
Sync master back into development (#372) Check for merge conflicts #303: Commit 59ccde4 pushed by yubiuser
September 25, 2023 04:31 2m 12s development
development
September 25, 2023 04:31 2m 12s
PADD v3.11.1 (#355) Check for merge conflicts #302: Commit fb92108 pushed by yubiuser
September 25, 2023 04:30 18s v3.11.1
v3.11.1
September 25, 2023 04:30 18s