Skip to content

Commit a66d859

Browse files
authored
Pi-hole web v6.0.0 (#3190)
2 parents 5c8945c + 5c6be28 commit a66d859

File tree

250 files changed

+16199
-26026
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

250 files changed

+16199
-26026
lines changed

.codespellignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
ede
22
EDE
3+
prefered

.devcontainer/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM node:21-alpine3.18
2+
RUN apk add --no-cache \
3+
git \
4+
nano\
5+
openssh
6+
7+
USER node

.devcontainer/devcontainer.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"name": "Pi-hole web devcontainer",
3+
"dockerFile": "Dockerfile",
4+
// Use 'postCreateCommand' to run commands after the container is created.
5+
"postCreateCommand": "npm install",
6+
"customizations": {
7+
// Configure properties specific to VS Code.
8+
"vscode": {
9+
"settings": {},
10+
"extensions": [
11+
"eamodio.gitlens",
12+
"EditorConfig.EditorConfig",
13+
"github.vscode-github-actions"
14+
]
15+
}
16+
},
17+
"containerEnv": {
18+
"GIT_EDITOR": "nano"
19+
},
20+
"mounts": [
21+
"type=bind,source=/home/${localEnv:USER}/.ssh,target=/home/node/.ssh,readonly"
22+
]
23+
}

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ indent_size = 2
1717
[*.js]
1818
indent_size = 2
1919

20-
[package.json]
20+
[*.json]
2121
indent_size = 2
2222

2323
[.yamllint.conf]

.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
**In raising this issue, I confirm the following:** `{please fill the checkboxes, e.g: [X]}`
22

3-
- [] I have read and understood the [contributors guide](https://github.com/pi-hole/AdminLTE/blob/master/CONTRIBUTING.md).
3+
- [] I have read and understood the [contributors guide](https://github.com/pi-hole/web/blob/master/CONTRIBUTING.md).
44
- [] The issue I am reporting can be _replicated_.
5-
- [] The issue I am reporting isn't a duplicate (see [FAQs](https://github.com/pi-hole/pi-hole/wiki/FAQs), [closed issues](https://github.com/pi-hole/AdminLTE/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), and [open issues](https://github.com/pi-hole/AdminLTE/issues)).
5+
- [] The issue I am reporting isn't a duplicate (see [FAQs](https://github.com/pi-hole/pi-hole/wiki/FAQs), [closed issues](https://github.com/pi-hole/web/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), and [open issues](https://github.com/pi-hole/web/issues)).
66

77
**How familiar are you with the the source code relevant to this issue?:**
88

.github/dependabot.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,3 @@ updates:
2121
target-branch: development
2222
reviewers:
2323
- "pi-hole/web-maintainers"
24-
- package-ecosystem: composer
25-
directory: "/"
26-
schedule:
27-
interval: weekly
28-
day: saturday
29-
time: "10:00"
30-
open-pull-requests-limit: 10
31-
target-branch: development
32-
reviewers:
33-
- "pi-hole/web-maintainers"

.github/workflows/codeql.yml

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

2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@v4.1.1
24+
uses: actions/checkout@v4.2.2
2525
# Initializes the CodeQL tools for scanning.
2626
- name: Initialize CodeQL
27-
uses: github/codeql-action/init@v2
27+
uses: github/codeql-action/init@v3
2828
with:
2929
languages: "javascript"
3030

3131
- name: Autobuild
32-
uses: github/codeql-action/autobuild@v2
32+
uses: github/codeql-action/autobuild@v3
3333

3434
- name: Perform CodeQL Analysis
35-
uses: github/codeql-action/analyze@v2
35+
uses: github/codeql-action/analyze@v3

.github/workflows/codespell.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: Codespell
22

33
on:
4+
push:
5+
branches:
6+
- '**'
47
pull_request:
58
types: [opened, synchronize, reopened, ready_for_review]
69

@@ -11,10 +14,10 @@ jobs:
1114
steps:
1215
-
1316
name: Checkout repository
14-
uses: actions/checkout@v4.1.1
17+
uses: actions/checkout@v4.2.2
1518
-
1619
name: Spell-Checking
1720
uses: codespell-project/actions-codespell@master
1821
with:
1922
ignore_words_file: .codespellignore
20-
skip: ./scripts/vendor,./style/vendor,./package.json,./package-lock.json,./composer.json,./composer.lock
23+
skip: ./vendor,./package.json,./package-lock.json

.github/workflows/editorconfig-checker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
name: editorconfig-checker
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4.1.1
12+
- uses: actions/checkout@v4.2.2
1313
- uses: editorconfig-checker/action-editorconfig-checker@main
1414
- 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@v2.1.0
16+
uses: eps1lon/actions-label-merge-conflict@v3.0.3
1717
with:
1818
dirtyLabel: "Merge Conflicts"
1919
repoToken: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/php-cs-fixer.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/workflows/phpstan.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.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@v8.0.0
20+
- uses: actions/stale@v9.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: Checkout
44-
uses: actions/checkout@v4.1.1
44+
uses: actions/checkout@v4.2.2
4545
- name: Remove 'stale' label
4646
run: gh issue edit ${{ github.event.issue.number }} --remove-label ${{ env.stale_label }}
4747
env:

.github/workflows/stale_pr.yml

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

1919
steps:
20-
- uses: actions/stale@v8.0.0
20+
- uses: actions/stale@v9.1.0
2121
with:
2222
repo-token: ${{ secrets.GITHUB_TOKEN }}
2323
# 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: Checkout
14-
uses: actions/checkout@v4.1.1
14+
uses: actions/checkout@v4.2.2
1515
- name: Opening pull request
1616
run: gh pr create -B development -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'internal'
1717
env:

.github/workflows/test.yml

Lines changed: 3 additions & 3 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.1.1
22+
uses: actions/checkout@v4.2.2
2323

2424
- name: Set up Node.js
25-
uses: actions/setup-node@v4.0.0
25+
uses: actions/setup-node@v4.2.0
2626
with:
27-
node-version: "16.x"
27+
node-version: "20.x"
2828
cache: npm
2929

3030
- name: Install npm dependencies

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ TODO
77
*.zip
88
test.html
99
*.log
10-
.php-cs-fixer.cache
10+
1111

1212
# Intellij IDEA Project Files
1313
*.iml
@@ -16,6 +16,3 @@ test.html
1616

1717
# vim
1818
*.swp
19-
20-
# Composer
21-
/vendor/

.php-cs-fixer.dist.php

Lines changed: 0 additions & 31 deletions
This file was deleted.

.stickler.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.yamllint.conf

Lines changed: 0 additions & 3 deletions
This file was deleted.

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Please see https://joinup.ec.europa.eu/community/eupl/og_page/eupl for official
77

88
This license applies to the whole project EXCEPT the files located under
99

10-
- styles/vendor, and
11-
- scripts/vendor
10+
- vendor/
11+
1212
whose licenses are located therein.
1313

1414
-------------------------------------------------------------

0 commit comments

Comments
 (0)