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
106 workflow run results
106 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

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 #807: Commit 4156d96 pushed by rdwebdesign
October 7, 2023 17:55 11s fix/gravity_progress
fix/gravity_progress
October 7, 2023 17:55 11s
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
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
Improve settings level select location (#2720) Check for merge conflicts #796: Commit 0f6b917 pushed by PromoFaux
October 6, 2023 12:21 2m 14s development-v6
development-v6
October 6, 2023 12:21 2m 14s
Bump postcss from 8.4.30 to 8.4.31 (#2723) Check for merge conflicts #795: Commit f5590a0 pushed by yubiuser
September 30, 2023 11:25 2m 13s devel
devel
September 30, 2023 11:25 2m 13s
Bump postcss from 8.4.30 to 8.4.31 (#2722) Check for merge conflicts #794: Commit a867c7b pushed by yubiuser
September 30, 2023 11:24 2m 14s development-v6
development-v6
September 30, 2023 11:24 2m 14s
Bump phpstan/phpstan from 1.10.35 to 1.10.36 (#2721) Check for merge conflicts #793: Commit 9406ce7 pushed by yubiuser
September 30, 2023 11:22 2m 12s devel
devel
September 30, 2023 11:22 2m 12s
Bump postcss from 8.4.30 to 8.4.31 Check for merge conflicts #792: Commit 51fe637 pushed by dependabot bot
September 30, 2023 10:53 11s dependabot/npm_and_yarn/devel/postcss-8.4.31
dependabot/npm_and_yarn/devel/postcss-8.4.31
September 30, 2023 10:53 11s
Bump postcss from 8.4.30 to 8.4.31 Check for merge conflicts #791: Commit 11cc8da pushed by dependabot bot
September 30, 2023 10:26 11s dependabot/npm_and_yarn/development-v6/postcss-8.4.31
dependabot/npm_and_yarn/development-v6/postcss-8.4.31
September 30, 2023 10:26 11s
Bump phpstan/phpstan from 1.10.35 to 1.10.36 Check for merge conflicts #790: Commit 82c3a69 pushed by dependabot bot
September 30, 2023 10:17 12s dependabot/composer/devel/phpstan/phpstan-1.10.36
dependabot/composer/devel/phpstan/phpstan-1.10.36
September 30, 2023 10:17 12s
Simplify theme handling (#2718) Check for merge conflicts #789: Commit 6bf3d09 pushed by DL6ER
September 29, 2023 18:42 2m 14s development-v6
development-v6
September 29, 2023 18:42 2m 14s