Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development v6 #3019

Merged
merged 842 commits into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
842 commits
Select commit Hold shift + click to select a range
371a1fd
Use new POST :batchDelete callbacks (#2893)
DL6ER Dec 15, 2023
391f85d
Bump github/codeql-action from 2 to 3
dependabot[bot] Dec 16, 2023
abe190a
Bump prettier from 3.1.0 to 3.1.1
dependabot[bot] Dec 16, 2023
ba0b052
Bump prettier from 3.1.0 to 3.1.1 (#2911)
yubiuser Dec 16, 2023
8495f2f
Bump github/codeql-action from 2 to 3 (#2909)
yubiuser Dec 16, 2023
8b3240e
Fix the red line used to identify recent entries on the log pages (#2…
rdwebdesign Dec 21, 2023
eb06301
Bump actions/setup-node from 4.0.0 to 4.0.1
dependabot[bot] Dec 23, 2023
c5c2c5b
Bump actions/setup-node from 4.0.0 to 4.0.1 (#2915)
yubiuser Dec 23, 2023
c5ab812
Query Log: Show link to groups/lists page if applicable
DL6ER Dec 25, 2023
0076e32
Ensure blocking mode timer is started even when set via a third-party…
DL6ER Dec 27, 2023
7e1f063
Bump moment from 2.29.4 to 2.30.1
dependabot[bot] Dec 30, 2023
adaf3c2
Update moment to 2.30.1
yubiuser Dec 30, 2023
9def641
Bump moment from 2.29.4 to 2.30.1 (#2918)
yubiuser Dec 30, 2023
1efbab3
Bump jquery from 3.7.0 to 3.7.1
dependabot[bot] Dec 9, 2023
296d8ac
Update jquery to 3.7.1
yubiuser Dec 9, 2023
96b3911
Update package-lock.json
yubiuser Dec 30, 2023
071beb8
Bump jquery from 3.7.0 to 3.7.1 (#2904)
yubiuser Dec 30, 2023
ab5b21a
Use fixed version in package.json
yubiuser Dec 30, 2023
edbcfd1
Add descriptions to DHCP metrics on the settings page
DL6ER Dec 30, 2023
c1b8dad
Use fixed version in package.json (#2920)
yubiuser Jan 1, 2024
f8f38f1
Update settings-system.lp
DL6ER Jan 1, 2024
66887d8
Add descriptions to DHCP metrics on the settings page (#2919)
DL6ER Jan 2, 2024
24ce60e
Move the title attribute of the DNS metrics to the table row
yubiuser Jan 5, 2024
209e49a
Move the title attribute of the DNS metrics to the table row (#2921)
yubiuser Jan 6, 2024
b48652a
Fix group editing
DL6ER Jan 6, 2024
11ba1b3
Bump bootstrap-select from 1.13.17 to 1.13.18
dependabot[bot] Jan 6, 2024
8c22d9a
Bump postcss from 8.4.32 to 8.4.33
dependabot[bot] Jan 6, 2024
b15f51e
Bump postcss from 8.4.32 to 8.4.33 (#2925)
yubiuser Jan 6, 2024
8a86af7
Add changed files to /vendor
yubiuser Jan 6, 2024
7052ff0
Bump bootstrap-select from 1.13.17 to 1.13.18 (#2924)
yubiuser Jan 6, 2024
52991f4
Merge branch 'development-v6' into tweak/settings_changed_only
DL6ER Jan 7, 2024
a53086e
Fix deletion of addresses with spaces in them by avoiding encoding to…
DL6ER Jan 8, 2024
211bd42
Explicitly set content encoding (#2927)
yubiuser Jan 8, 2024
fef1def
Ensure blocking mode timer is started even when set via a third-party…
DL6ER Jan 10, 2024
3b0359c
Add support for legacy Teleporter archives (#2858)
PromoFaux Jan 11, 2024
07aaa44
Apply red background color to special domains in query log
yubiuser Jan 11, 2024
7e21b3b
Add query log handling of SPECIAL_DOMAIN (#2895)
yubiuser Jan 11, 2024
63a4a67
Bump prettier from 3.1.1 to 3.2.1
dependabot[bot] Jan 13, 2024
0c26269
Bump prettier from 3.1.1 to 3.2.1 (#2930)
yubiuser Jan 13, 2024
bac88f1
Use replaceAll to ensure all newlines are converted to HTML line breaks
DL6ER Jan 14, 2024
9f04f7a
Use replaceAll to ensure all newlines are converted to HTML line brea…
DL6ER Jan 15, 2024
a35d4f0
[Typo] Fix typo in checkMessages warning
avano Jan 17, 2024
07b5f26
[Typo] Fix typo in checkMessages warning (#2932)
yubiuser Jan 17, 2024
0c1b44e
Fix group editing (#2922)
DL6ER Jan 17, 2024
dee7c2b
Add regex hint to domain/client exclusion box
yubiuser Jan 19, 2024
04ea62b
Bump prettier from 3.2.1 to 3.2.4
dependabot[bot] Jan 20, 2024
a5e10fb
Bump autoprefixer from 10.4.16 to 10.4.17
dependabot[bot] Jan 20, 2024
b14e54b
Bump prettier from 3.2.1 to 3.2.4 (#2935)
yubiuser Jan 20, 2024
de5a4b0
Bump autoprefixer from 10.4.16 to 10.4.17 (#2936)
yubiuser Jan 20, 2024
32a1954
Add regex hint to domain/client exclusion box (#2934)
DL6ER Jan 21, 2024
c480e03
Fix interpretation of lease expiration field in case it is 0. This do…
DL6ER Jan 26, 2024
1dcf90b
Fix edge-case interpretation of DHCP lease expiration field (#2941)
DL6ER Jan 26, 2024
64679c5
Clarify what an empty netmask field does (Settings -> DHCP page)
DL6ER Feb 4, 2024
4b83c7f
Clarify what an empty netmask field does (Settings -> DHCP page) (#2946)
DL6ER Feb 4, 2024
ab42f54
Show link to search page instead of to the list ID returned by the AP…
DL6ER Feb 6, 2024
5f79611
Fix search output unintentionally broken in 7d2e83cbc42f1e63d5c5b00eb…
DL6ER Feb 6, 2024
a0ddfe6
Format changes
DL6ER Feb 6, 2024
128ae80
Query Log: Show link to groups/lists page if applicable (#2916)
DL6ER Feb 9, 2024
ac2ceb6
Bump postcss from 8.4.33 to 8.4.35
dependabot[bot] Feb 10, 2024
de5ec8f
Bump actions/setup-node from 4.0.1 to 4.0.2
dependabot[bot] Feb 10, 2024
0bd0089
Bump actions/setup-node from 4.0.1 to 4.0.2 (#2955)
yubiuser Feb 10, 2024
82f642e
Bump postcss from 8.4.33 to 8.4.35 (#2953)
yubiuser Feb 10, 2024
285876c
Bump prettier from 3.2.4 to 3.2.5
dependabot[bot] Feb 10, 2024
c0a5cd7
Bump prettier from 3.2.4 to 3.2.5 (#2952)
yubiuser Feb 10, 2024
da7c0ef
Add support for multiple reverse server (#2885)
DL6ER Feb 11, 2024
2f44fc6
Merge branch 'development-v6' into tweak/settings_changed_only
DL6ER Feb 11, 2024
99c85fc
Remove advanced flag handling in config API parsing
DL6ER Feb 11, 2024
50f28e8
The permitted column in the main graph was actually the sum of forwar…
DL6ER Feb 11, 2024
938c6ef
Redesign search input field to solve #2701
DL6ER Feb 12, 2024
c64d84a
Ensure percentages are computed correctly
DL6ER Feb 12, 2024
7708887
Also show percentages in the client activity graph
DL6ER Feb 12, 2024
d7cf23b
Add support the same list being used once as allow- and once as block…
DL6ER Feb 13, 2024
2098a11
Handle allow- and blocklists separately from each other in Search
DL6ER Feb 13, 2024
4fba41b
Remove unused CSS rules
rdwebdesign Feb 13, 2024
0854c2a
Better text and controls layout
rdwebdesign Feb 13, 2024
d9cd239
Add support for the new sparse-data format returned by /history/clients
DL6ER Feb 16, 2024
7d97b44
Fix missing inclusion of the IP address sorting plugin on the Setting…
DL6ER Feb 28, 2024
5f8102f
Use MIME type instead of explicit filetype endings during the file se…
DL6ER Feb 28, 2024
c1f0262
Bump autoprefixer from 10.4.17 to 10.4.18
dependabot[bot] Mar 2, 2024
3abc55f
Bump chart.js from 4.4.1 to 4.4.2
dependabot[bot] Mar 2, 2024
034ca9e
Bump autoprefixer from 10.4.17 to 10.4.18 (#2968)
yubiuser Mar 2, 2024
64e865e
Allow adlist duplicates (#2958)
DL6ER Mar 2, 2024
7c447a8
Add chartjs files
yubiuser Mar 3, 2024
8f23b3a
Bump chart.js from 4.4.1 to 4.4.2 (#2969)
PromoFaux Mar 3, 2024
2a45388
Use automatic percent formatting
bitigchi Mar 2, 2024
f79a404
Use automatic percent formatting (#2972)
PromoFaux Mar 4, 2024
0030427
Fix Settings -> DHCP page sorting (#2974)
DL6ER Mar 6, 2024
fb30ea9
Redesign domain search input field (#2957)
DL6ER Mar 7, 2024
1b46894
Add progress reporting (#2829)
DL6ER Mar 9, 2024
8e24643
Fix Teleporter file selection on Mac OS (#2975)
DL6ER Mar 12, 2024
d82feab
Hide group headers on the all settings page after toggling to show on…
DL6ER Mar 12, 2024
9e8467c
If we left with an empty page (no visible boxes) after switching from…
DL6ER Mar 12, 2024
5cb2a89
Add searching for domains and clients in the Query Log. Wildcards (*)…
DL6ER Mar 14, 2024
bff2648
Hide the checkbox while the page loads
rdwebdesign Mar 15, 2024
240b3aa
Add searching for domains and clients in the Query Log (#2980)
DL6ER Mar 15, 2024
d880a38
Merge branch 'development-v6' into fix/overTimeGraphs
DL6ER Mar 16, 2024
ca92d2b
Bump actions/checkout from 4.1.1 to 4.1.2
dependabot[bot] Mar 16, 2024
71d396e
Tweak main activity graph (#2956)
DL6ER Mar 16, 2024
7d51f40
Tweak settings level and add changed-only toggle (#2882)
DL6ER Mar 17, 2024
c8704d7
Add missing priority `ERROR` to taillog `formatFTL()` function
rdwebdesign Mar 20, 2024
40c422e
Add missing priority `ERROR` to taillog `formatFTL()` function (#2984)
rdwebdesign Mar 24, 2024
1ccd27f
Do not redirect outside of settings pages on basic level and empty pages
DL6ER Mar 25, 2024
ab87e11
Fix incorrect redirection (#2993)
DL6ER Mar 26, 2024
46ffa35
Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0
dependabot[bot] Mar 30, 2024
a5fd8b6
Move local DNS records from expert to basic settings level
DL6ER Mar 30, 2024
d4e8626
Move local DNS records from expert to basic settings level (#2997)
DL6ER Mar 30, 2024
64ccce4
Add field-sizing-content class that makes input and textarea fields i…
DL6ER Apr 1, 2024
09e9ae5
Add some defensive CSS to protect the textarea auto-sizing from getti…
DL6ER Apr 1, 2024
b542a30
Update style/pi-hole.css
DL6ER Apr 2, 2024
92cf92b
Auto resize some textarea fields (#2998)
DL6ER Apr 2, 2024
88fb2fc
Add selective Teleporter options
DL6ER Apr 2, 2024
a8098e8
Fix buttons in high contrast themes
rdwebdesign Apr 2, 2024
6f65368
Settings Page - Apply small adjustments
rdwebdesign Apr 2, 2024
172e4ea
Use colors in Currently active sessions table
rdwebdesign Apr 2, 2024
f842c72
Settings Pages - small adjustments (#3000)
rdwebdesign Apr 3, 2024
5b1b541
Add selective Teleporter options (#2999)
DL6ER Apr 7, 2024
50064f5
Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0 (#2995)
PromoFaux Apr 9, 2024
9be4958
Bump actions/checkout from 4.1.1 to 4.1.2 (#2983)
PromoFaux Apr 18, 2024
7917a90
Bump actions/checkout from 4.1.2 to 4.1.3
dependabot[bot] Apr 20, 2024
5997b24
Bump autoprefixer from 10.4.18 to 10.4.19
dependabot[bot] Mar 23, 2024
9162f39
Bump postcss from 8.4.35 to 8.4.38
dependabot[bot] Apr 21, 2024
019710c
Bump actions/checkout from 4.1.3 to 4.1.4
dependabot[bot] Apr 27, 2024
78f59dd
Bump actions/checkout from 4.1.3 to 4.1.4 (#3014)
yubiuser Apr 27, 2024
c3336f7
Remove superfluous copy-paste remnants in API /clients call
DL6ER May 3, 2024
a2b2f60
Remove superfluous copy-paste remnants in API /clients call (#3016)
DL6ER May 8, 2024
7b7d543
Bump actions/checkout from 4.1.4 to 4.1.5
dependabot[bot] May 11, 2024
8e924c4
Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1
dependabot[bot] May 11, 2024
45faaa4
Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1 (#3025)
yubiuser May 11, 2024
2d45f6d
Bump actions/checkout from 4.1.4 to 4.1.5 (#3024)
yubiuser May 11, 2024
7f03a83
Bump chart.js from 4.4.2 to 4.4.3
dependabot[bot] May 18, 2024
b2c29f0
Bump actions/checkout from 4.1.5 to 4.1.6
dependabot[bot] May 18, 2024
a676026
Update chartjs files
yubiuser May 22, 2024
0b11a0d
Bump actions/checkout from 4.1.5 to 4.1.6 (#3030)
yubiuser May 22, 2024
a1df7bd
Remove the `small-box` glow effect on text updates
rdwebdesign May 23, 2024
59b1dcf
Remove the `small-box` glow effect on text updates to avoid visual is…
rdwebdesign May 23, 2024
24977e8
Bump chart.js from 4.4.2 to 4.4.3 (#3027)
PromoFaux May 28, 2024
f0fc7b0
DHCP Settings - add option to ignore unknown DHCP clients
rdwebdesign May 31, 2024
09d7aa5
Rewording and better format for the last sentence
rdwebdesign May 31, 2024
5757932
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2
dependabot[bot] Jun 1, 2024
c94e7e2
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2 (#3041)
yubiuser Jun 1, 2024
6fafc94
DHCP Settings - add option to ignore unknown DHCP clients (#3035)
rdwebdesign Jun 1, 2024
75f54ff
Fix/simplify mass deletion of tables, simplify deleting local DNS / C…
DL6ER May 30, 2024
2d12a28
Fix multi-deletion of DHCP leases
DL6ER Jun 3, 2024
420c5a8
Toasts need to be stored globally or the variables may overwrite each…
DL6ER Jun 3, 2024
edda66f
Apply the same fixes for the messages table
DL6ER Jun 3, 2024
44e1a9b
Move code used to format icons to a dedicated function
rdwebdesign Jan 17, 2024
e9df006
Move value details and layout to a dedicated function
rdwebdesign Jan 17, 2024
84bd977
Add a few CSS classes
rdwebdesign Jan 17, 2024
03c0d3e
Move `value.description` to box-body and the content to box-footer
rdwebdesign Jan 17, 2024
494c1cf
Replace non-breaking spaces with a margin
rdwebdesign Jan 17, 2024
d66c5ec
CSS adjustments
rdwebdesign Jan 18, 2024
3a5b791
Use full width for array values
rdwebdesign Jan 28, 2024
3e6d0e9
Use radio buttons for enum types
rdwebdesign Jan 30, 2024
f2f6cf4
More CSS adjustments
rdwebdesign Mar 20, 2024
f0664ae
Cleaner layout for "All Settings" page
rdwebdesign Jun 3, 2024
c202f55
Remove the word "settings" from each tabs button
rdwebdesign Jun 3, 2024
6e6c667
Show a message for empty tabs when selecting "Only Modified" settings
rdwebdesign Jun 3, 2024
5db10ae
Change the number of columns depending on the screen size
rdwebdesign Jun 4, 2024
1ba4e57
Simplify structure and reorder some boxes
rdwebdesign Jun 4, 2024
5ceb046
Move temperature options to the Theme box (they are not advanced opti…
rdwebdesign Jun 4, 2024
9585aed
Base expert icon on expert class no FTL advanced flag
yubiuser Jun 4, 2024
04363c0
Base expert icon on expert class not FTL advanced flag (#3043)
yubiuser Jun 5, 2024
d144960
Tweak "Web Interface - API" settings page (#3044)
PromoFaux Jun 5, 2024
ab16bb8
Do not use tabs when showing only Modified Settings
rdwebdesign Jun 5, 2024
8a88c8e
Add button classes to nav-pills elements
rdwebdesign Jun 5, 2024
8768f6a
Format the buttons
rdwebdesign Jun 5, 2024
20fc994
Adapt the style to LCARS theme
rdwebdesign Jun 5, 2024
61acb4a
Apply suggestions from code review
DL6ER Jun 6, 2024
4402d56
Fix multi-deletion of DHCP leases (#2792)
DL6ER Jun 6, 2024
5b6c8bb
New layout for "All Settings" page (#3042)
rdwebdesign Jun 6, 2024
d08aef4
Bump prettier from 3.2.5 to 3.3.1
dependabot[bot] Jun 8, 2024
4349f68
Bump prettier from 3.2.5 to 3.3.1 (#3045)
yubiuser Jun 8, 2024
3681d71
Show warning if user already set an application password
DL6ER Jun 15, 2024
a3129af
Bump prettier from 3.3.1 to 3.3.2
dependabot[bot] Jun 15, 2024
eb2d20d
Bump actions/checkout from 4.1.6 to 4.1.7
dependabot[bot] Jun 15, 2024
26f4945
Bump prettier from 3.3.1 to 3.3.2 (#3049)
yubiuser Jun 15, 2024
96cd1aa
Bump eslint-plugin-compat from 4.2.0 to 5.0.0
dependabot[bot] Jun 15, 2024
aa76ace
Bump actions/checkout from 4.1.6 to 4.1.7 (#3052)
yubiuser Jun 15, 2024
103bfed
Bump eslint-plugin-compat from 4.2.0 to 5.0.0 (#3050)
yubiuser Jun 15, 2024
aab58a7
Show "Replace" instead of "Enable" on the action button (also make it…
DL6ER Jun 16, 2024
513b700
Add explicit confirmation when trying to replace existing password
DL6ER Jun 16, 2024
d7ca2da
Update settings-api.lp
DL6ER Jun 16, 2024
4c23e5b
Fix callout header color
rdwebdesign Jun 17, 2024
94b49ce
Use only one button class per button to fix button text color
rdwebdesign Jun 17, 2024
76a7248
Show CLI sessions property
DL6ER Jun 20, 2024
e9aea93
Fix close button contrast in some dark themes
rdwebdesign Jun 25, 2024
22fe50f
Update the charts if the number of queries has increased significantly
DL6ER Jun 26, 2024
d3ac2fe
Remove "Remove currently set app password" button if none is actually…
DL6ER Jun 26, 2024
68f2512
Show warning if user already set an application password (#3048)
DL6ER Jun 27, 2024
2174eaa
Update summary data with new count
DL6ER Jun 29, 2024
78f2919
Update the charts if the number of queries has increased significantl…
DL6ER Jun 29, 2024
330845b
Show CLI sessions property (#3056)
DL6ER Jun 30, 2024
ee4562f
Always reload page after logout attempt
DL6ER Jul 1, 2024
bfa3906
Fix possible race condition on page load of the index page. This is a…
DL6ER Jul 1, 2024
0497792
Always reload page after logout attempt (#3062)
DL6ER Jul 1, 2024
fa837b5
Use AJAX.always() during logout
DL6ER Jul 1, 2024
69f769f
Use AJAX.always() during logout (#3063)
DL6ER Jul 1, 2024
9d39d6f
Fix possible race condition in Top Lists (#3061)
DL6ER Jul 2, 2024
b3f726e
Bump postcss from 8.4.38 to 8.4.39
dependabot[bot] Jul 6, 2024
e852fbb
Bump postcss from 8.4.38 to 8.4.39 (#3066)
yubiuser Jul 6, 2024
337d7e5
Don't try to fill client/domain tables if there is no data
yubiuser Jul 8, 2024
60ca1c7
Don't try to fill client/domain tables if there is no data (#3069)
yubiuser Jul 8, 2024
eebd1b7
Bump actions/setup-node from 4.0.2 to 4.0.3
dependabot[bot] Jul 13, 2024
9d8a3df
Bump actions/setup-node from 4.0.2 to 4.0.3 (#3074)
yubiuser Jul 13, 2024
8580517
Bump eslint-plugin-compat from 5.0.0 to 6.0.0
dependabot[bot] Jul 20, 2024
9309aa7
Bump eslint-plugin-compat from 5.0.0 to 6.0.0 (#3080)
yubiuser Jul 20, 2024
288d188
Bump prettier from 3.3.2 to 3.3.3
dependabot[bot] Jul 20, 2024
1853b3e
Bump prettier from 3.3.2 to 3.3.3 (#3081)
yubiuser Jul 20, 2024
bfe716d
pihole.rev_server has been removed
DL6ER Jul 23, 2024
4269ade
sessions[].x_forwarded_for has been added
DL6ER Jul 23, 2024
e2aeeb1
pihole.needLogin() does not need an argument
DL6ER Jul 27, 2024
eb8f820
Show X-Forwarded-For information also in the top menu
DL6ER Jul 27, 2024
e9c620c
Bump postcss from 8.4.39 to 8.4.40
dependabot[bot] Jul 27, 2024
a312176
Bump postcss from 8.4.39 to 8.4.40 (#3088)
yubiuser Jul 27, 2024
d137650
Do not use intermediate local variable
DL6ER Jul 29, 2024
e71e7f4
Improve reverse proxy handling (#3085)
DL6ER Jul 29, 2024
20bf70d
Bump autoprefixer from 10.4.19 to 10.4.20
dependabot[bot] Aug 3, 2024
7950f87
Bump autoprefixer from 10.4.19 to 10.4.20 (#3096)
yubiuser Aug 3, 2024
9f28388
Fix the "title" attribute to show all IPs/hostnames
rdwebdesign Aug 8, 2024
88bf5a6
Show tooltip only when the number of items is greater than MAXIPDISPLAY
rdwebdesign Aug 8, 2024
4aa049b
Loop over all IPs to populate tooltip even when MAXIPDISPLAY is reached
rdwebdesign Aug 8, 2024
b1fd8fd
Fix the "title" attribute to show all IPs/hostnames (#3098)
rdwebdesign Aug 9, 2024
f2db015
Bump postcss from 8.4.40 to 8.4.41
dependabot[bot] Aug 10, 2024
4df2d1d
Bump postcss from 8.4.40 to 8.4.41 (#3100)
yubiuser Aug 10, 2024
108c69c
Bump xo from 0.56.0 to 0.58.0
dependabot[bot] Jul 13, 2024
73b8897
Disable logical-assignment-operators and prefer-object-has-own rule
yubiuser Jul 17, 2024
6ff1af3
Update package-json.lock
yubiuser Jul 22, 2024
2302fda
Fix atob() deprecation error. See https://stackoverflow.com/a/70851350
yubiuser Aug 10, 2024
674f263
Bump xo from 0.56.0 to 0.58.0 (#3073)
yubiuser Aug 10, 2024
c18937c
Merge branch 'devel' into resolve_merge_conflicts
yubiuser Aug 11, 2024
d28571b
Replace inline onclick with addEventListener inside .js file to be co…
orazioedoardo Aug 11, 2024
bbd389f
FIx package-lock.json
yubiuser Aug 11, 2024
964fcbd
Have two spaces between indicator and text in Status panel
yubiuser Aug 11, 2024
96aa32b
Remove LCARS picard
yubiuser Aug 11, 2024
db918cd
Resolve merge conflicts development-v6 > devel (#3105)
PromoFaux Aug 12, 2024
ab5a0b4
Merge branch 'devel' into resolve_redux
yubiuser Aug 12, 2024
c272390
Have two spaces between indicator and text in Status panel (#3107)
yubiuser Aug 12, 2024
a6807d1
Resolve redux (#3108)
yubiuser Aug 12, 2024
8d1abf2
Bump xo from 0.58.0 to 0.59.3
dependabot[bot] Aug 17, 2024
046b562
Bump xo from 0.58.0 to 0.59.3 (#3111)
yubiuser Aug 17, 2024
ed4961f
Replace inline onclick with addEventListener inside .js file to be co…
DL6ER Aug 18, 2024
263e0c0
Bump chart.js from 4.4.3 to 4.4.4
dependabot[bot] Aug 22, 2024
9cd2970
Update files
yubiuser Aug 22, 2024
809a3ae
Bump chart.js from 4.4.3 to 4.4.4 (#3115)
yubiuser Aug 26, 2024
2db29ed
Unify system setting modal buttons
yubiuser Aug 26, 2024
c68e05c
Unify system setting modal buttons (#3118)
yubiuser Aug 26, 2024
a087cc3
Merge branch 'devel' into resolve_merge
yubiuser Sep 2, 2024
84f10b3
Resolve merge conflicts (#3123)
DL6ER Sep 2, 2024
7b8829b
Remove redirectin based on user-defined input
DL6ER Sep 2, 2024
085c288
Remove redirectin based on user-defined input (#3124)
DL6ER Sep 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM node:21-alpine3.18
RUN apk add --no-cache \
git \
nano\
openssh

USER node
23 changes: 23 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "Pi-hole web devcontainer",
"dockerFile": "Dockerfile",
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "npm install",
"customizations": {
// Configure properties specific to VS Code.
"vscode": {
"settings": {},
"extensions": [
"eamodio.gitlens",
"EditorConfig.EditorConfig",
"github.vscode-github-actions"
]
}
},
"containerEnv": {
"GIT_EDITOR": "nano"
},
"mounts": [
"type=bind,source=/home/${localEnv:USER}/.ssh,target=/home/node/.ssh,readonly"
]
}
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ indent_size = 2
[*.js]
indent_size = 2

[package.json]
[*.json]
indent_size = 2

[.yamllint.conf]
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
**In raising this issue, I confirm the following:** `{please fill the checkboxes, e.g: [X]}`

- [] I have read and understood the [contributors guide](https://github.com/pi-hole/AdminLTE/blob/master/CONTRIBUTING.md).
- [] I have read and understood the [contributors guide](https://github.com/pi-hole/web/blob/master/CONTRIBUTING.md).
- [] The issue I am reporting can be _replicated_.
- [] 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)).
- [] 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)).

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

Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ updates:
day: saturday
time: "10:00"
open-pull-requests-limit: 10
target-branch: devel
target-branch: development-v6
reviewers:
- "pi-hole/web-maintainers"

Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Codespell

on:
push:
branches:
- '**'
pull_request:
types: [opened, synchronize, reopened, ready_for_review]

Expand All @@ -17,4 +20,4 @@ jobs:
uses: codespell-project/actions-codespell@master
with:
ignore_words_file: .codespellignore
skip: ./scripts/vendor,./style/vendor,./package.json,./package-lock.json,./composer.json,./composer.lock
skip: ./scripts/vendor,./style/vendor,./package.json,./package-lock.json
13 changes: 0 additions & 13 deletions .github/workflows/php-cs-fixer.yml

This file was deleted.

21 changes: 0 additions & 21 deletions .github/workflows/phpstan.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Node.js
uses: actions/[email protected]
with:
node-version: "16.x"
node-version: "20.x"
cache: npm

- name: Install npm dependencies
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,3 @@ test.html

# vim
*.swp

# Composer
/vendor/
31 changes: 0 additions & 31 deletions .php-cs-fixer.dist.php

This file was deleted.

9 changes: 0 additions & 9 deletions .stickler.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .yamllint.conf

This file was deleted.

6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,6 @@ While we are primarily reachable on our <a href="https://discourse.pi-hole.net/"
<img src="https://pi-hole.github.io/graphics/Screenshots/query-log-sorted.png" alt="Query log">
</p>

## An audit log

<p align="center">
<img src="https://pi-hole.github.io/graphics/Screenshots/audit-log.png" alt="Pi-hole Web interface">
</p>

## Long-term statistics to view data over user defined time ranges

<p align="center">
Expand Down
Loading