Skip to content

Commit 79c4c14

Browse files
committed
Merge development into new/simple-dhcp-static-leases and address review feedback
Resolve merge conflict in style/pi-hole.css (keep both StaticDHCPTable styles and DNSSEC query log styles). Address outstanding reviewer feedback: - Change save button icon from floppy-disk to checkmark to clarify it confirms the row edit, not a final save - Update hint text to mention "Save & Apply" is still needed - Add hostname validation on the hostname cell (rejects spaces, commas, and other characters invalid in DNS names) Signed-off-by: Dominik <dl6er@dl6er.de>
2 parents e160fa6 + 4159aaa commit 79c4c14

28 files changed

+336
-236
lines changed

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ jobs:
2626

2727
steps:
2828
- name: Clone repository
29-
uses: actions/checkout@v4.2.2
29+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
3030
with:
3131
persist-credentials: false
3232

3333
- name: Initialize CodeQL
34-
uses: github/codeql-action/init@v3.29.2
34+
uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 #v4.30.9
3535
with:
3636
config-file: ./.github/codeql/codeql-config.yml
3737
languages: "javascript"
3838
queries: +security-and-quality
3939

4040
- name: Autobuild
41-
uses: github/codeql-action/autobuild@v3.29.2
41+
uses: github/codeql-action/autobuild@16140ae1a102900babc80a33c44059580f687047 #v4.30.9
4242

4343
- name: Perform CodeQL Analysis
44-
uses: github/codeql-action/analyze@v3.29.2
44+
uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 #v4.30.9
4545
with:
4646
category: "/language:javascript"

.github/workflows/codespell.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Clone repository
16-
uses: actions/checkout@v4.2.2
16+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
1717
with:
1818
persist-credentials: false
1919

2020
- name: Spell-Checking
21-
uses: codespell-project/actions-codespell@master
21+
uses: codespell-project/actions-codespell@406322ec52dd7b488e48c1c4b82e2a8b3a1bf630 #v2.1
2222
with:
2323
ignore_words_file: .codespellignore
2424
skip: ./vendor,./package.json,./package-lock.json

.github/workflows/editorconfig-checker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Clone repository
13-
uses: actions/checkout@v4.2.2
13+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
1414
with:
1515
persist-credentials: false
16-
- uses: editorconfig-checker/action-editorconfig-checker@main
16+
- uses: editorconfig-checker/action-editorconfig-checker@5ecdd656fe347c26f76b1b435b90e1d74fb5e787 # tag v2. is really out of date
1717
- run: editorconfig-checker

.github/workflows/merge-conflict.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Check if PRs are have merge conflicts
16-
uses: eps1lon/actions-label-merge-conflict@v3.0.3
16+
uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 #v3.0.3
1717
with:
1818
dirtyLabel: "Merge Conflicts"
1919
repoToken: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/stale.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
issues: write
1818

1919
steps:
20-
- uses: actions/stale@v9.1.0
20+
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 #v10.1.0
2121
with:
2222
repo-token: ${{ secrets.GITHUB_TOKEN }}
2323
days-before-stale: 30
@@ -41,7 +41,7 @@ jobs:
4141
runs-on: ubuntu-latest
4242
steps:
4343
- name: Clone repository
44-
uses: actions/checkout@v4.2.2
44+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
4545
with:
4646
persist-credentials: false
4747
- name: Remove 'stale' label

.github/workflows/stale_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
pull-requests: write
1717

1818
steps:
19-
- uses: actions/stale@v9.1.0
19+
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 #v10.1.0
2020
with:
2121
repo-token: ${{ secrets.GITHUB_TOKEN }}
2222
# Do not automatically mark PR/issue as stale

.github/workflows/sync-back-to-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Syncing branches
1212
steps:
1313
- name: Clone repository
14-
uses: actions/checkout@v4.2.2
14+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
1515
with:
1616
persist-credentials: false
1717
- name: Opening pull request

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919

2020
steps:
2121
- name: Clone repository
22-
uses: actions/checkout@v4.2.2
22+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
2323
with:
2424
persist-credentials: false
2525

2626
- name: Set up Node.js
27-
uses: actions/setup-node@v4.4.0
27+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 #v6.0.0
2828
with:
2929
node-version: "22.x"
3030
cache: npm

error403.lp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99

1010
mg.include('scripts/lua/header.lp','r')
1111
?>
12-
<body class="hold-transition layout-boxed login-page page-<?=pihole.format_path(mg.request_info.request_uri)?>">
12+
</head>
13+
<body class="hold-transition layout-boxed login-page page-<?=pihole.format_path(scriptname)?>">
1314
<div class="box login-box">
1415
<section style="padding: 15px;">
1516
<h2 class="error-headline text-danger">403</h2>
1617
<div class="error-content">
1718
<h3><i class="fa fa-times-circle text-danger"></i> Oops! Access denied.</h3>
1819
<p>
19-
You don't have permission to access <code><?=mg.request_info.request_uri?></code> on this server.<br>
20+
You don't have permission to access this URL.<br>
2021
Did you mean to go to <a href="<?=pihole.webhome()?>">your Pi-hole's dashboard</a> instead?
2122
</p>
2223
</div>

error404.lp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99

1010
mg.include('scripts/lua/header.lp','r')
1111
?>
12-
<body class="hold-transition layout-boxed login-page page-<?=pihole.format_path(mg.request_info.request_uri)?>">
12+
</head>
13+
<body class="hold-transition layout-boxed login-page page-<?=pihole.format_path(scriptname)?>">
1314
<div class="box login-box">
1415
<section style="padding: 15px;">
1516
<h2 class="error-headline text-yellow">404</h2>

0 commit comments

Comments
 (0)