Skip to content

Commit 465bb1c

Browse files
authored
Development v6 (#3019)
2 parents 953a592 + 085c288 commit 465bb1c

File tree

158 files changed

+13667
-24111
lines changed

Some content is hidden

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

158 files changed

+13667
-24111
lines changed

.devcontainer/Dockerfile

+7
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

+23
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

+1-1
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

+2-2
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ updates:
2828
day: saturday
2929
time: "10:00"
3030
open-pull-requests-limit: 10
31-
target-branch: devel
31+
target-branch: development-v6
3232
reviewers:
3333
- "pi-hole/web-maintainers"
3434

.github/workflows/codespell.yml

+4-1
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

@@ -17,4 +20,4 @@ jobs:
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: ./scripts/vendor,./style/vendor,./package.json,./package-lock.json

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

-13
This file was deleted.

.github/workflows/phpstan.yml

-21
This file was deleted.

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Set up Node.js
2525
uses: actions/[email protected]
2626
with:
27-
node-version: "16.x"
27+
node-version: "20.x"
2828
cache: npm
2929

3030
- name: Install npm dependencies

.gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,3 @@ test.html
1616

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

.php-cs-fixer.dist.php

-31
This file was deleted.

.stickler.yml

-9
This file was deleted.

.yamllint.conf

-3
This file was deleted.

README.md

-6
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,6 @@ While we are primarily reachable on our <a href="https://discourse.pi-hole.net/"
133133
<img src="https://pi-hole.github.io/graphics/Screenshots/query-log-sorted.png" alt="Query log">
134134
</p>
135135

136-
## An audit log
137-
138-
<p align="center">
139-
<img src="https://pi-hole.github.io/graphics/Screenshots/audit-log.png" alt="Pi-hole Web interface">
140-
</p>
141-
142136
## Long-term statistics to view data over user defined time ranges
143137

144138
<p align="center">

0 commit comments

Comments
 (0)