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
215 workflow runs
215 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Minor Readme tweaks Check for merge conflicts #531: Commit 9745bdb pushed by yubiuser
February 28, 2025 10:44 10s fix/readme
fix/readme
February 28, 2025 10:44 10s
vNext Check for merge conflicts #530: Pull request #438 synchronize by yubiuser
February 28, 2025 05:21 2m 12s
February 28, 2025 05:21 2m 12s
Fix typo: replace "remmote" with "remote" (#439) Check for merge conflicts #529: Commit 66993ab pushed by yubiuser
February 28, 2025 05:21 2m 14s development
development
February 28, 2025 05:21 2m 14s
Fix typo: replace "remmote" with "remote" Check for merge conflicts #528: Commit cde0ac7 pushed by rdwebdesign
February 28, 2025 01:34 10s fix_var_typo
fix_var_typo
February 28, 2025 01:34 10s
Tweak convertUptime() to not rely on external date Check for merge conflicts #527: Pull request #429 synchronize by yubiuser
February 27, 2025 21:14 9s
February 27, 2025 21:14 9s
Fix indention Check for merge conflicts #526: Commit 8233ca6 pushed by yubiuser
February 27, 2025 21:14 13s fix/uptime
fix/uptime
February 27, 2025 21:14 13s
Fix resize during startup (#437) Check for merge conflicts #525: Commit 2cb9bd3 pushed by yubiuser
February 27, 2025 18:11 2m 13s development
development
February 27, 2025 18:11 2m 13s
Fix resize during startup Check for merge conflicts #524: Commit 2f7ebaa pushed by yubiuser
February 27, 2025 16:59 11s fix/resize_startup
fix/resize_startup
February 27, 2025 16:59 11s
Prevent transient error messages where no temperature is provided Check for merge conflicts #523: Pull request #428 synchronize by rrobgill
February 26, 2025 19:04 18s
February 26, 2025 19:04 18s
Fix padd -u Check for merge conflicts #522: Commit f28b8e7 pushed by yubiuser
February 26, 2025 12:48 10s json
json
February 26, 2025 12:48 10s
Remove function to output some data as json - Pi-hole v6 has an API f… Check for merge conflicts #521: Commit cbf3b54 pushed by yubiuser
February 26, 2025 12:32 11s json
json
February 26, 2025 12:32 11s
Prevent transient error messages where no temperature is provided Check for merge conflicts #520: Pull request #428 synchronize by rrobgill
February 26, 2025 09:10 15s
February 26, 2025 09:10 15s
Tweak convertUptime() to not rely on external date Check for merge conflicts #519: Pull request #429 synchronize by yubiuser
February 25, 2025 11:28 13s
February 25, 2025 11:28 13s
Tweak convertUptime() to not rely on external date Check for merge conflicts #518: Commit 05eb5a9 pushed by yubiuser
February 25, 2025 11:28 11s fix/uptime
fix/uptime
February 25, 2025 11:28 11s
Sync master back into development (#433) Check for merge conflicts #517: Commit 6ea709a pushed by yubiuser
February 25, 2025 11:27 2m 14s development
development
February 25, 2025 11:27 2m 14s
Fix bump workflow by explicitly using if construct (#432) Check for merge conflicts #516: Commit 47bd6c6 pushed by yubiuser
February 25, 2025 11:26 11s master
master
February 25, 2025 11:26 11s
Set shell to bash in version_bump.yml Check for merge conflicts #515: Commit 2170d51 pushed by yubiuser
February 25, 2025 09:42 12s shell
shell
February 25, 2025 09:42 12s
Set shell to bash in version_bump.yml Check for merge conflicts #514: Commit 67d7d48 pushed by yubiuser
February 25, 2025 09:40 9s shell
shell
February 25, 2025 09:40 9s
Set shell to bash in version_bump.yml Check for merge conflicts #513: Commit 82e576f pushed by yubiuser
February 25, 2025 09:40 12s shell
shell
February 25, 2025 09:40 12s
Prevent transient error messages where no temperature is provided Check for merge conflicts #512: Pull request #428 synchronize by rrobgill
February 24, 2025 22:28 15s
February 24, 2025 22:28 15s
Set shell to bash in version_bump.yml Check for merge conflicts #511: Commit ecfbd75 pushed by yubiuser
February 24, 2025 21:38 11s shell
shell
February 24, 2025 21:38 11s
Set shell to bash in version_bump.yml Check for merge conflicts #510: Commit 39b2cdd pushed by yubiuser
February 24, 2025 21:36 13s shell
shell
February 24, 2025 21:36 13s
Set shell to bash in version_bump.yml Check for merge conflicts #509: Commit bec0b6d pushed by yubiuser
February 24, 2025 21:35 11s shell
shell
February 24, 2025 21:35 11s
Set shell to bash in version_bump.yml Check for merge conflicts #508: Commit 5a05172 pushed by yubiuser
February 24, 2025 21:34 9s shell
shell
February 24, 2025 21:34 9s
Set shell to bash in version_bump.yml Check for merge conflicts #507: Commit 041e07a pushed by yubiuser
February 24, 2025 21:32 10s shell
shell
February 24, 2025 21:32 10s