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
1,566 workflow runs
1,566 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix the gravity output to use the ${OVER} sequence Check for merge conflicts #821: Pull request #2725 synchronize by rdwebdesign
October 8, 2023 20:59 14s
October 8, 2023 20:59 14s
Use a function to parse escape sequences in the text stream Check for merge conflicts #820: Commit 8ef2a64 pushed by rdwebdesign
October 8, 2023 20:59 9s fix/gravity_progress
fix/gravity_progress
October 8, 2023 20:59 9s
Fix the gravity output to use the ${OVER} sequence Check for merge conflicts #819: Pull request #2725 synchronize by rdwebdesign
October 8, 2023 20:55 30s
October 8, 2023 20:55 30s
Use a function to parse escape sequences in the text stream Check for merge conflicts #818: Commit 22792b8 pushed by rdwebdesign
October 8, 2023 20:55 10s fix/gravity_progress
fix/gravity_progress
October 8, 2023 20:55 10s
Show HTTPS hint on login page only when HTTPS is actually served. If … Check for merge conflicts #817: Commit eaf068c pushed by DL6ER
October 8, 2023 17:35 9s tweak/api_auth_https
tweak/api_auth_https
October 8, 2023 17:35 9s
Fix HTTPS link on login page (#2729) Check for merge conflicts #816: Commit 549031d pushed by DL6ER
October 8, 2023 16:13 2m 12s development-v6
development-v6
October 8, 2023 16:13 2m 12s
Build HTTPS URL using Javascript to ensure we use the exact same URL … Check for merge conflicts #815: Commit de15123 pushed by DL6ER
October 8, 2023 10:48 10s fix/https_link
fix/https_link
October 8, 2023 10:48 10s
Add ability to specify domains, lists, clients and group names as arrays Check for merge conflicts #814: Pull request #2707 synchronize by DL6ER
October 8, 2023 08:56 20s
October 8, 2023 08:56 20s
Give details about sucessfully added and failed items to domains, gro… Check for merge conflicts #813: Commit d516aec pushed by DL6ER
October 8, 2023 08:56 14s tweak/domain_array
tweak/domain_array
October 8, 2023 08:56 14s
New (additional) LCARS theme inspired by Picard TV show Check for merge conflicts #812: Pull request #2709 synchronize by MichalSvatos
October 7, 2023 23:27 15s
October 7, 2023 23:27 15s
Add ability to specify domains, lists, clients and group names as arrays Check for merge conflicts #811: Pull request #2707 synchronize by DL6ER
October 7, 2023 19:38 11s
October 7, 2023 19:38 11s
Implement support for adding multiple domains, clients, groups, and l… Check for merge conflicts #810: Commit a6ba2a8 pushed by DL6ER
October 7, 2023 19:38 13s tweak/domain_array
tweak/domain_array
October 7, 2023 19:38 13s
Bump postcss from 8.4.23 to 8.4.31 Check for merge conflicts #809: Commit c17f761 pushed by dependabot bot
October 7, 2023 19:29 10s dependabot/npm_and_yarn/postcss-8.4.31
dependabot/npm_and_yarn/postcss-8.4.31
October 7, 2023 19:29 10s
Fix the gravity output to use the ${OVER} sequence Check for merge conflicts #808: Pull request #2725 synchronize by rdwebdesign
October 7, 2023 17:55 17s
October 7, 2023 17:55 17s
Fix the gravity output to use the ${OVER} sequence Check for merge conflicts #807: Commit 4156d96 pushed by rdwebdesign
October 7, 2023 17:55 11s fix/gravity_progress
fix/gravity_progress
October 7, 2023 17:55 11s
Settings page - Fix spellcheck: accordignly => accordingly (#2727) Check for merge conflicts #806: Commit 79e66f1 pushed by rdwebdesign
October 7, 2023 17:50 2m 10s development-v6
development-v6
October 7, 2023 17:50 2m 10s
accordignly => accordingly Check for merge conflicts #805: Commit 555b2eb pushed by rdwebdesign
October 7, 2023 17:42 10s spellcheck/settings
spellcheck/settings
October 7, 2023 17:42 10s
Bump phpstan/phpstan from 1.10.36 to 1.10.38 (#2726) Check for merge conflicts #804: Commit 6521890 pushed by yubiuser
October 7, 2023 14:46 2m 14s devel
devel
October 7, 2023 14:46 2m 14s
Bump phpstan/phpstan from 1.10.36 to 1.10.38 Check for merge conflicts #803: Commit ac49a5e pushed by dependabot bot
October 7, 2023 10:20 14s dependabot/composer/devel/phpstan/phpstan-1.10.38
dependabot/composer/devel/phpstan/phpstan-1.10.38
October 7, 2023 10:20 14s
Fix the gravity output to use the ${OVER} sequence Check for merge conflicts #802: Pull request #2725 synchronize by rdwebdesign
October 7, 2023 06:33 11s
October 7, 2023 06:33 11s
Fix the gravity output to use the ${OVER} sequence Check for merge conflicts #801: Commit c52cb8c pushed by rdwebdesign
October 7, 2023 06:33 11s fix/gravity_progress
fix/gravity_progress
October 7, 2023 06:33 11s
Fix the gravity output to use the ${OVER} sequence Check for merge conflicts #800: Pull request #2725 synchronize by rdwebdesign
October 7, 2023 06:28 13s
October 7, 2023 06:28 13s
Fix the gravity output to use the ${OVER} sequence Check for merge conflicts #799: Commit 1926532 pushed by rdwebdesign
October 7, 2023 06:28 13s fix/gravity_progress
fix/gravity_progress
October 7, 2023 06:28 13s
Fix the gravity output to use the ${OVER} sequence Check for merge conflicts #798: Commit 12ddd2f pushed by rdwebdesign
October 7, 2023 06:07 14s fix/gravity_progress
fix/gravity_progress
October 7, 2023 06:07 14s
New (additional) LCARS theme inspired by Picard TV show Check for merge conflicts #797: Pull request #2709 synchronize by MichalSvatos
October 6, 2023 22:33 11s
October 6, 2023 22:33 11s
ProTip! You can narrow down the results and go further in time using created:<2023-10-06 or the other filters available.