Skip to content

Actions: pi-hole/web

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
62 workflow run results
62 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix and tweak footer Check for merge conflicts #868: Commit 761a659 pushed by yubiuser
October 14, 2023 13:13 12s tweak/update_footer
tweak/update_footer
October 14, 2023 13:13 12s
Add ability to specify domains, lists, clients and group names as arrays Check for merge conflicts #867: Pull request #2707 synchronize by DL6ER
October 13, 2023 19:18 17s
October 13, 2023 19:18 17s
Merge branch 'development-v6' into tweak/domain_array Check for merge conflicts #866: Commit ca29eef pushed by DL6ER
October 13, 2023 19:18 11s tweak/domain_array
tweak/domain_array
October 13, 2023 19:18 11s
Fix AJAX JSON data (#2744) Check for merge conflicts #865: Commit 6c3d45c pushed by yubiuser
October 13, 2023 09:02 2m 14s development-v6
development-v6
October 13, 2023 09:02 2m 14s
Add "processData: false" to all JSON data we send Check for merge conflicts #864: Commit 43c8ede pushed by DL6ER
October 13, 2023 07:47 13s fix/json_data
fix/json_data
October 13, 2023 07:47 13s
New (additional) LCARS theme inspired by Picard TV show Check for merge conflicts #863: Pull request #2709 synchronize by MichalSvatos
October 12, 2023 23:45 15s
October 12, 2023 23:45 15s
Active Sessions are an expert's thing Check for merge conflicts #862: Commit 9565082 pushed by yubiuser
October 12, 2023 21:17 15s tweak/settings
tweak/settings
October 12, 2023 21:17 15s
Fix update logic for custom branches by comparing hashes (#2737) Check for merge conflicts #861: Commit 2fbef7f pushed by yubiuser
October 12, 2023 18:22 2m 11s development-v6
development-v6
October 12, 2023 18:22 2m 11s
Fix AJAX JSON data (#2742) Check for merge conflicts #860: Commit 340d373 pushed by DL6ER
October 12, 2023 18:17 2m 12s development-v6
development-v6
October 12, 2023 18:17 2m 12s
Tweak/settings (#2740) Check for merge conflicts #859: Commit 1ed1efd pushed by rdwebdesign
October 12, 2023 18:16 2m 13s development-v6
development-v6
October 12, 2023 18:16 2m 13s
Restore Teleporter functionality Check for merge conflicts #858: Pull request #2738 synchronize by DL6ER
October 12, 2023 16:40 11s
October 12, 2023 16:40 11s
Use filename as generated by FTL by analyzing the Content-Disposition… Check for merge conflicts #857: Commit 2563213 pushed by DL6ER
October 12, 2023 16:40 14s fix/teleporter_csrf
fix/teleporter_csrf
October 12, 2023 16:40 14s
We should not use JSON.stringify() but leave escaping to AJAX itself Check for merge conflicts #856: Commit d2701f7 pushed by DL6ER
October 12, 2023 16:05 21s fix/json_ajax
fix/json_ajax
October 12, 2023 16:05 21s
Active Sessions are an expert's thing Check for merge conflicts #855: Commit 9565082 pushed by yubiuser
October 12, 2023 10:08 11s tweak/settings
tweak/settings
October 12, 2023 10:08 11s
Show Theme Selector at basic level Check for merge conflicts #854: Commit 1376f0a pushed by yubiuser
October 12, 2023 08:24 16s tweak/settings
tweak/settings
October 12, 2023 08:24 16s
Fix update logic for custom branches by comparing hashes Check for merge conflicts #853: Pull request #2737 synchronize by yubiuser
October 11, 2023 21:08 14s
October 11, 2023 21:08 14s
Add check for Docker tag Check for merge conflicts #852: Commit 45b1c66 pushed by yubiuser
October 11, 2023 21:08 12s update/update_message
update/update_message
October 11, 2023 21:08 12s
Fix update logic for custom branches by comparing hashes Check for merge conflicts #851: Pull request #2737 synchronize by yubiuser
October 11, 2023 21:06 14s
October 11, 2023 21:06 14s
Add check for Docker tag Check for merge conflicts #850: Commit 1b43914 pushed by yubiuser
October 11, 2023 21:06 17s update/update_message
update/update_message
October 11, 2023 21:06 17s
Fix update logic for custom branches by comparing hashes Check for merge conflicts #849: Pull request #2737 synchronize by yubiuser
October 11, 2023 20:53 14s
October 11, 2023 20:53 14s
Fix tests Check for merge conflicts #848: Commit bde1396 pushed by yubiuser
October 11, 2023 20:53 14s update/update_message
update/update_message
October 11, 2023 20:53 14s
Fix update logic for custom branches by comparing hashes Check for merge conflicts #847: Pull request #2737 synchronize by yubiuser
October 11, 2023 20:49 12s
October 11, 2023 20:49 12s
Close at the right place Check for merge conflicts #846: Commit fc542f5 pushed by yubiuser
October 11, 2023 20:49 12s update/update_message
update/update_message
October 11, 2023 20:49 12s
Fix update logic for custom branches by comparing hashes Check for merge conflicts #845: Pull request #2737 synchronize by yubiuser
October 11, 2023 20:38 11s
October 11, 2023 20:38 11s
Remove duplication Check for merge conflicts #844: Commit 5cd83cf pushed by yubiuser
October 11, 2023 20:38 13s update/update_message
update/update_message
October 11, 2023 20:38 13s