Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-22 11:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,823 Commits 19 Branches 112 Tags
c42c06be2dea820da599e1598b51a6aa6c39aafc
Commit Graph

3823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Warner
c42c06be2d Merge pull request #1208 from pi-hole/new/rev-server 
Improve conditional forwarding settings
 2020-07-02 10:51:41 +01:00
Adam Warner
40a3974faa Merge pull request #1467 from pi-hole/pkg 
Update devDependencies and regenerate package-lock.json
 2020-07-02 10:47:10 +01:00
Adam Warner
15b59954ca Merge pull request #1460 from pi-hole/groups-tootlip 
Remove HTML from titles when not needed.
 2020-07-02 10:44:29 +01:00
XhmikosR
37fd2d22f1 Update devDependencies and regenerate package-lock.json 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-07-02 12:06:10 +03:00
XhmikosR
3fd0f2deaa Add CodeQL Action (#1476) 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-07-02 12:04:43 +03:00
Adam Warner
f31048c228 Merge pull request #1472 from pi-hole/tweak/custom_DNS 
Tweak/custom dns
 2020-07-01 09:13:28 +01:00
DL6ER
1482b9055d Update scripts/pi-hole/php/savesettings.php 
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-30 22:55:06 +02:00
DL6ER
a816a4fe34 Merge pull request #1475 from pi-hole/new/more_query_types 
Only show query types for which the count is larger than zero
 2020-06-28 23:04:34 +02:00
DL6ER
aeba7c958d Only show query types for which the count is larger than zero. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-28 21:41:39 +02:00
Adam Warner
f51705b675 Don't add #53 to any passed IP value by default, only add custom port if it is specified by the user 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-25 17:54:23 +01:00
Adam Warner
297c1b019f response is expected to be empty here, as far as I can tell. Reverting this logic change prevents a misleading message being displayed to the user 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-25 17:46:22 +01:00
DL6ER
156b7b4efa Update settings.php 
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-23 21:26:43 +02:00
DL6ER
59bd4de97e Merge pull request #1222 from pi-hole/tweak/exact_searching 
Improve filtering on table pages
 2020-06-23 21:26:30 +02:00
XhmikosR
ea1fd6c323 Remove HTML from titles when not needed. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-22 08:53:48 +03:00
DL6ER
78e1f3c09f Review comments on code style 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-21 21:50:55 +02:00
DL6ER
f06a2b6ed1 CSS: Use rgba() instead of hex-color. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-21 21:45:22 +02:00
dependabot-preview[bot]
536ecd69c3 Bump autoprefixer from 9.8.0 to 9.8.1 
Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.8.0 to 9.8.1.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.8.0...9.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-06-20 15:30:46 +00:00
Adam Warner
05582b9722 Merge pull request #1251 from willemstuursma/fix-warning-for-unlink 
Fixes #1227 Fix possible warning when unlinking files
 2020-06-17 07:09:53 +01:00
Adam Warner
d187219f5a Merge pull request #1443 from pi-hole/sanitise-group-input 
Prevent possible XSS attack vector in the input fields of the group section
 2020-06-14 23:25:12 +01:00
DL6ER
852d5ce4de Merge pull request #1453 from pi-hole/rm-footer-dead-code 
footer.js: remove dead code.
 2020-06-14 21:06:21 +02:00
DL6ER
1819abee76 Merge branch 'devel' into tweak/exact_searching 2020-06-14 20:48:08 +02:00
Adam Warner
c949516ee1 make use of utils.escapeHtml on the JS side of things, and html_entity_decode/htmlentities in PHP 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-13 18:50:36 +01:00
Willem Stuursma-Ruwen
95379bbe7c #1227 Test if file exists instead of silencing errors 2020-06-10 21:29:45 +02:00
Adam Warner
557bd85814 change button type on dhcp static lease removal back to submit (#1456) 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-09 09:28:45 +03:00
XhmikosR
0303fb6f5f footer.js: remove dead code. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-08 07:50:08 +03:00
DL6ER
d5de84090e Merge pull request #1452 from pi-hole/XhmikosR-patch-1 
network.js: use `utils.datetime()`
 2020-06-07 17:11:48 +02:00
XhmikosR
7bfc7cbcd5 network.js: use utils.datetime() 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-07 17:03:23 +03:00
XhmikosR
1bef0bb17b Tweak CSP (#1445) 
Switch to `default-src` `'none'` and specify the directives we were missing that were being inherited.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-07 14:20:45 +03:00
Adam Warner
7b555dcf55 Merge pull request #1451 from pi-hole/rm-iCheck 
Remove the unused iCheck.min.js
 2020-06-07 10:49:43 +01:00
Adam Warner
228ea0a9ba Merge pull request #1449 from pi-hole/dont-fallover-on-duplicates 
Dont hard fail when adding duplicate adlists
 2020-06-07 10:25:21 +01:00
XhmikosR
a041cdcbd3 Remove the unused iCheck.min.js 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-07 10:41:36 +03:00
Adam Warner
5b71dab0c7 Change INSERT statement to INSERT OR IGNORE on adlist management as a workaround for now 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-06 18:27:22 +01:00
Adam Warner
efd9281fa4 Merge pull request #1442 from pi-hole/fix/null_comments_in_groups 
Store NULL for empty descriptions and comments in the groups database tables
 2020-06-05 19:17:57 +01:00
Adam Warner
7aa79a7a77 Merge pull request #1420 from pi-hole/tweak/improve_warnings 
Improve messages on the domain management pages
 2020-06-05 19:17:17 +01:00
Adam Warner
f494938b56 Merge pull request #1436 from pi-hole/long-term 
Fix typo "Long term" -> "Long-term"
 2020-06-05 19:15:31 +01:00
DL6ER
a7bc6e8999 Store NULL for emtpty descriptions and comments in the groups database tables. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-05 11:53:10 +02:00
XhmikosR
68297b14b6 Merge pull request #1374 from pi-hole/radix 
Enable radix ESLint rule
 2020-06-05 10:28:03 +03:00
Adam Warner
0d19cbea72 Merge pull request #1430 from pi-hole/update-xo 
Update xo to v0.32.0 and regenerate package-lock.json
 2020-06-04 18:17:45 +01:00
Adam Warner
ca0800b351 Merge pull request #1431 from pi-hole/fix/memory_warning 
Extend warning shown on server-side data processing errors
 2020-06-04 18:17:23 +01:00
Adam Warner
c04dd08cd2 Merge pull request #1356 from pi-hole/tweak/hostname_error_message 
Add support for HOSTNAME diagnostics message
 2020-06-04 18:16:29 +01:00
XhmikosR
9aa11ec6aa Fix typo "Long term" -> "Long-term" 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-04 19:01:10 +03:00
DL6ER
4bf018b52c Add missing radix information in parseInt(). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-04 16:57:55 +02:00
XhmikosR
e20c465b33 Enable radix ESLint rule 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-04 17:43:26 +03:00
XhmikosR
a9cee0039a Improve CSP config (#1377) 
* Remove `'unsafe-eval'`; this was needed in the past for Chart.js.
* Remove `https://api.github.com` since we don't make any requests to this domain client-side
* Specify more directives which are not inherited by `default-src`

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-04 17:40:39 +03:00
XhmikosR
cd99d3385a Merge pull request #1362 from pi-hole/jquery-3 
Update jQuery to v3.5.1.
 2020-06-04 17:38:38 +03:00
XhmikosR
e8b0e258e7 Tailog pages: make checkboxes use the same markup as everywhere else. (#1432) 
This is still not proper, but at least it's consistent.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-04 16:13:46 +03:00
DL6ER
e5b45cb2a2 Merge pull request #1429 from pi-hole/fix-tailog-ids 
Fix tailog pages IDs
 2020-06-04 15:04:43 +02:00
DL6ER
ffbeba4ad5 Extend warning shown on server-side data processing errors. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-04 14:55:55 +02:00
XhmikosR
010eef752c Update xo to v0.32.0 and regenerate package-lock.json 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-04 15:29:50 +03:00
XhmikosR
13286237ad Fix tailog pages IDs 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-04 15:21:37 +03:00