pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,181 Commits 16 Branches 105 Tags
196e226e2cf2c7ea0fd2e8b2c678da3587e4bf1f
Commit Graph
4181 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabian Preuß 196e226e2c Add padding between if statements 
Signed-off-by: Fabian Preuß <preuss_fabian@gmx.de>
 2021-08-10 21:21:12 +02:00
Fabian Preuß 48ee7abbe8 Stop timer when user reenabled blocking early 
Signed-off-by: Fabian Preuß <preuss_fabian@gmx.de>
 2021-08-10 21:02:05 +02:00
Adam Warner a7ec9510b5 re-implement fix introduced in 1664090a01 
Release v5.5.1 (based on `master`) has fixed this in `savesettings.php`, but the functionality has since been moved to `func.php` in `devel`, and so the fix needs applying here, too.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-04 20:44:20 +01:00
Adam Warner 647eba40d3 Merge branch 'release/v5.6' into devel 2021-08-04 20:32:59 +01:00
Adam Warner dacdb3d72c Merge pull request #1857 from pi-hole/master 
Sync Master -> Dev
 2021-08-04 20:21:44 +01:00
Adam Warner fb9bd561fd Merge pull request #1856 from pi-hole/release/v5.5.1 
Release/v5.5.1
v5.5.1 		2021-08-04 18:22:40 +01:00
Adam Warner 7aa8057df7 Merge pull request from GHSA-5cm9-6p3m-v259 
Fix (Authenticated) Remote Code Execution Possible in Web Interface 5.5
 2021-08-04 18:13:35 +01:00
Adam Warner 43c4b4f075 Merge pull request from GHSA-g3w6-q4fg-p8x8 
Prevent XSS on groups/domain page
 2021-08-04 18:13:05 +01:00
Adam Warner 8066069a1f Prevent arbritary js code from beign returned from the database 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-08-04 17:29:57 +01:00
DL6ER 3140bb5fce Merge pull request #1855 from yubiuser/fix_func.php 
Fix incorrect require() in func.php
 2021-08-01 20:51:12 +02:00
yubiuser e9ab7cfa08 Fix require func.php 
Signed-off-by: yubiuser <ckoenig@posteo.de>
 2021-08-01 19:36:07 +02:00
DL6ER 16f6a4997b Merge pull request #1852 from pi-hole/tweak/domain_validation 
Fix domain validation method
 2021-07-30 07:45:24 +02:00
DL6ER 559150bb1f Fix inverse logic when adding domains on the group management pages. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-25 19:03:34 +02:00
DL6ER 03920e3595 Move validation functions into func.php and use the same validation in all cases. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-25 16:59:16 +02:00
DL6ER 690feb8b26 Fix code syntax error 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-25 16:54:24 +02:00
DL6ER 6a315fc972 Re-add incorrectly removed variables. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-24 15:05:27 +02:00
DL6ER 4e1f7c23a1 Merge branch 'devel' into update/dnsmasq-v2.86 2021-07-04 12:58:23 +02:00
Adam Warner 68034029b7 Merge pull request #1822 from adyanth/devel 
Adding CORS support via environment variable
 2021-07-04 11:49:01 +01:00
DL6ER f5b59d141b Hide blackbutton for internally generated DNSSEC queries (they cannot be blocked) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-04 11:37:10 +02:00
DL6ER 0e25554cab Merge pull request #1844 from pi-hole/tweak/chartjs294 
Update Charts.js from 2.9.3 to 2.9.4
 2021-07-04 10:17:26 +02:00
Adam Warner f229e4fcc9 Merge pull request #1832 from kthchew/safari-15 
Improve `theme-color` and `background-color` for different themes
 2021-07-04 01:51:32 +01:00
Adam Warner 5438430d6e Update to latest (and last) 2.x.x version of Chart.js to fix some bugs found in 2.9.3 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-07-03 22:24:34 +01:00
Adam Warner b615ef014e Merge pull request #1824 from pi-hole/dependabot/npm_and_yarn/normalize-url-4.5.1 
Bump normalize-url from 4.5.0 to 4.5.1
 2021-07-03 21:54:41 +01:00
Adam Warner 8fc18ca4ac Merge pull request #1823 from pi-hole/dependabot/npm_and_yarn/trim-newlines-3.0.1 
Bump trim-newlines from 3.0.0 to 3.0.1
 2021-07-03 21:54:31 +01:00
Adam Warner 9a552df73e Merge pull request #1815 from pi-hole/dependabot/npm_and_yarn/browserslist-4.16.6 
Bump browserslist from 4.16.1 to 4.16.6
 2021-07-03 21:50:48 +01:00
Adam Warner 7de4b6a6d5 Merge pull request #1710 from heis2201/patch-2 
Improve wording: Percentage blocked domains
 2021-07-03 21:24:24 +01:00
DL6ER 762aba21ec Add note when a BOGUS result was sent down from upstream (we cannot say why it failed in this case) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-07-03 09:37:25 +02:00
DL6ER a120e72524 Add EDE if available 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-06-28 20:35:51 +02:00
DL6ER 122146fcc6 Update styling of scripts/pi-hole/js/settings.js 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-06-26 15:28:11 +00:00
dependabot-preview[bot] 1612082e50 Bump prettier from 2.2.1 to 2.3.1 
Bumps [prettier](https://github.com/prettier/prettier) from 2.2.1 to 2.3.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.2.1...2.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-06-26 15:28:11 +00:00
DL6ER cf917a6391 Remove obsolete setupVars.conf stuff from the settings page 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-06-26 11:01:26 +02:00
DL6ER df9bf15e75 Query Log: Show if a query was already answered or was only sent to an upstream (and we're still awaiting the reply) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-06-26 11:00:49 +02:00
Adam Warner 1664090a01 Escape . in regex for validDomainWildcard to ensure malicious commands cannot be passed to the function 
bonus, removed some trailing whitespace on line 30

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2021-06-23 17:34:43 +01:00
DL6ER 2c9765260e Merge pull request #1837 from pi-hole/update/dnsmasq-v2.86 
Add reply type DNSSEC
 2021-06-23 11:58:13 +02:00
DL6ER fb2b87e833 Add new DNSSEC reply type 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-06-23 11:43:14 +02:00
DL6ER ca030bc0c9 Merge pull request #1838 from pi-hole/tweak/trailing-commas-js 
Prettier improvements for easier reviews
 2021-06-23 11:41:56 +02:00
DL6ER 0d0a8dba67 Change prettier option trailingComma from "none" to the new default "es5" (see https://prettier.io/docs/en/options.html#trailing-commas) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2021-06-23 11:26:43 +02:00
DL6ER a2c64d6d19 Merge pull request #1836 from AlexLamond/auto-darkmode 
Added the option for an automatic dark mode based on the device status
 2021-06-22 16:15:51 +02:00
Alex Lamond 7aace0920b Updated theme naming 
Signed-off-by: Alex Lamond <9060360+AlexLamond@users.noreply.github.com>
 2021-06-22 12:52:24 +02:00
Alex LandDL6ER 57a5518c23 Update scripts/pi-hole/php/theme.php 
Corrected naming conventions for files and theme name

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
Signed-off-by: Alex Lamond <9060360+AlexLamond@users.noreply.github.com>
 2021-06-22 12:52:24 +02:00
AlexLamond 5538af20b8 Added the option for an automatic dark mode based on the device status 
Signed-off-by: = <9060360+AlexLamond@users.noreply.github.com>
Signed-off-by: Alex Lamond <9060360+AlexLamond@users.noreply.github.com>
 2021-06-22 12:52:24 +02:00
Kenneth Chew 2f3f4e6056 Adapt theme-color and background-color for different themes 
Signed-off-by: Kenneth Chew <kenneth.c0@protonmail.com>
 2021-06-19 01:02:53 -04:00
Adyanth H 5331620b71 Change tabs to spaces 
Signed-off-by: Adyanth H <33192449+adyanth@users.noreply.github.com>
 2021-06-16 10:42:13 +05:30
dependabot[bot] 9e0ef641d4 Bump normalize-url from 4.5.0 to 4.5.1 
Bumps [normalize-url](https://github.com/sindresorhus/normalize-url) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/sindresorhus/normalize-url/releases)
- [Commits](https://github.com/sindresorhus/normalize-url/commits)

---
updated-dependencies:
- dependency-name: normalize-url
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-11 08:45:26 +00:00
dependabot[bot] 63488d385f Bump trim-newlines from 3.0.0 to 3.0.1 
Bumps [trim-newlines](https://github.com/sindresorhus/trim-newlines) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/sindresorhus/trim-newlines/releases)
- [Commits](https://github.com/sindresorhus/trim-newlines/commits)

---
updated-dependencies:
- dependency-name: trim-newlines
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-09 21:10:26 +00:00
Adyanth H 23364cfc55 Adding CORS support via environment variable 
Signed-off-by: Adyanth H <33192449+adyanth@users.noreply.github.com>
 2021-06-07 16:19:04 +05:30
dependabot[bot] 2c076b7b4e Bump browserslist from 4.16.1 to 4.16.6 
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.16.1 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.16.1...4.16.6)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-26 15:47:13 +00:00
dependabot-preview[bot] 731bb98820 Bump postcss from 8.2.14 to 8.2.15 
Bumps [postcss](https://github.com/postcss/postcss) from 8.2.14 to 8.2.15.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/8.2.14...8.2.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2021-05-19 20:14:46 +00:00
Adam Warner 96b36ce323 Merge pull request #1792 from pi-hole/dependabot/add-v2-config-file 
Upgrade to GitHub-native Dependabot
 2021-05-19 21:10:07 +01:00
Adam Warner 1488af490b Merge pull request #1809 from pi-hole/master 
resync Dev with Master
 2021-05-19 21:06:14 +01:00