Skip to content

Commit 1eaddca

Browse files
PromoFauxPromoFaux
authored
Pi-hole Web v6.1 (#3354)
2 parents 2544117 + 919b96e commit 1eaddca

120 files changed

Lines changed: 803 additions & 732 deletions

File tree

Some content is hidden

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

‎.gitattributes‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
* text=auto
1+
# Enforce Unix newlines
2+
* text=auto eol=lf

‎.github/codeql/codeql-config.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
name: "CodeQL config"
2+
paths-ignore:
3+
- "**/vendor/**"

‎.github/workflows/codeql.yml‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,40 @@ on:
77
- development
88
- "!dependabot/**"
99
pull_request:
10-
# The branches below must be a subset of the branches above
1110
branches:
1211
- master
1312
- development
13+
- "!dependabot/**"
1414
schedule:
1515
- cron: "0 0 * * 0"
16+
workflow_dispatch:
1617

1718
jobs:
1819
analyze:
1920
name: Analyze
2021
runs-on: ubuntu-latest
22+
permissions:
23+
actions: read
24+
contents: read
25+
security-events: write
2126

2227
steps:
23-
- name: Checkout repository
28+
- name: Clone repository
2429
uses: actions/[email protected]
25-
# Initializes the CodeQL tools for scanning.
30+
with:
31+
persist-credentials: false
32+
2633
- name: Initialize CodeQL
27-
uses: github/codeql-action/init@v3
34+
uses: github/codeql-action/init@v3.28.13
2835
with:
36+
config-file: ./.github/codeql/codeql-config.yml
2937
languages: "javascript"
38+
queries: +security-and-quality
3039

3140
- name: Autobuild
32-
uses: github/codeql-action/autobuild@v3
41+
uses: github/codeql-action/autobuild@v3.28.13
3342

3443
- name: Perform CodeQL Analysis
35-
uses: github/codeql-action/analyze@v3
44+
uses: github/codeql-action/[email protected]
45+
with:
46+
category: "/language:javascript"

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/[email protected]
2323

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

‎gravity.lp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ mg.include('scripts/lua/header_authenticated.lp','r')
2727
<button type="button" id="gravityBtn" class="btn btn-lg btn-primary btn-block">Update</button>
2828
<pre id="output" style="width: 100%; height: 100%;" hidden></pre>
2929

30-
<script src="<?=pihole.fileversion('scripts/js/gravity.js')?>"></script>
30+
<script defer src="<?=pihole.fileversion('scripts/js/gravity.js')?>"></script>
3131
<? mg.include('scripts/lua/footer.lp','r')?>

‎groups-clients.lp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ mg.include('scripts/lua/header_authenticated.lp','r')
9595
</div>
9696
</div>
9797

98-
<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
99-
<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
100-
<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
101-
<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
102-
<script src="<?=pihole.fileversion('scripts/js/groups-clients.js')?>"></script>
98+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
99+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
100+
<script defer src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
101+
<script defer src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
102+
<script defer src="<?=pihole.fileversion('scripts/js/groups-clients.js')?>"></script>
103103

104104
<? mg.include('scripts/lua/footer.lp','r')?>

‎groups-domains.lp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ mg.include('scripts/lua/header_authenticated.lp','r')
156156
</div>
157157
</div>
158158

159-
<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
160-
<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
161-
<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
162-
<script src="<?=pihole.fileversion('scripts/js/groups-domains.js')?>"></script>
159+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
160+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
161+
<script defer src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
162+
<script defer src="<?=pihole.fileversion('scripts/js/groups-domains.js')?>"></script>
163163

164164
<? mg.include('scripts/lua/footer.lp','r')?>

‎groups-lists.lp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ mg.include('scripts/lua/header_authenticated.lp','r')
4646
<strong>Hints:</strong>
4747
<ol>
4848
<li>Please run <code>pihole -g</code> or update your gravity list <a href="<?=webhome?>gravity">online</a> after modifying your lists.</li>
49-
<li>Multiple lists can be added by separating each <i>unique</i> URL with a space or comma</li>
49+
<li>Multiple lists can be added by separating each <em>unique</em> URL with a space or comma</li>
5050
<li>Click on the icon in the first column to get additional information about your lists. The icons correspond to the health of the list.</li>
5151
</ol>
5252
<div class="btn-toolbar pull-right" role="toolbar" aria-label="Toolbar with buttons">
@@ -94,9 +94,9 @@ mg.include('scripts/lua/header_authenticated.lp','r')
9494
</div>
9595
</div>
9696

97-
<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
98-
<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
99-
<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
100-
<script src="<?=pihole.fileversion('scripts/js/groups-lists.js')?>"></script>
97+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
98+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
99+
<script defer src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
100+
<script defer src="<?=pihole.fileversion('scripts/js/groups-lists.js')?>"></script>
101101

102102
<? mg.include('scripts/lua/footer.lp','r')?>

‎groups.lp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ mg.include('scripts/lua/header_authenticated.lp','r')
7979
</div>
8080
</div>
8181

82-
<script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
83-
<script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
84-
<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
85-
<script src="<?=pihole.fileversion('scripts/js/groups.js')?>"></script>
82+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
83+
<script defer src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
84+
<script defer src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
85+
<script defer src="<?=pihole.fileversion('scripts/js/groups.js')?>"></script>
8686

8787
<? mg.include('scripts/lua/footer.lp','r')?>

‎img/logo-bw.svg‎

Lines changed: 6 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)