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
3,780 Commits 16 Branches 105 Tags
773fed0f214616bbc55ee2b3dd70797bccbb9bbc
Commit Graph

3780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias rank 773fed0f21 Incorporate upstream changes 
Signed-off-by: Matthias Rank <development@m-rank.de>
 2020-06-21 13:55:50 +02:00
marank b597a0fcbb Merge branch 'devel' into devel 2020-06-21 12:20:33 +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
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
DL6ER c6abbac3e1 Unlike the standard PHP engine, others might actually be case-sensitive. (#1428) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-04 15:13:15 +03:00
DL6ER 62ac7e58a3 Merge pull request #1425 from pi-hole/fix/group-page-single-group 
Fix regression introduced in group entry changes
 2020-06-04 13:58:27 +02:00
XhmikosR f5d1077bcc queryads.js: fix off by one in the viewport check. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-04 14:49:17 +03:00
XhmikosR 87e49b2e07 Fix .context usage in our code 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-04 14:49:17 +03:00
XhmikosR 92e2288f0a Update jQuery to v3.5.1. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-04 14:49:17 +03:00
XhmikosR b3e3a3ce4e Merge pull request #1424 from pi-hole/update-chartjs 
Update chartjs to v2.9.3
 2020-06-04 14:49:05 +03:00
DL6ER 80873e83e8 Modify how we add data to the stacked bar charts on the dashboard. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-04 13:24:34 +02:00
Adam Warner 075c474fbc Use new Array().join() for space generation. 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-03 20:32:55 +01:00
DL6ER 1df85ff7a9 Simplify code for space generation and use HTML entities. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-03 18:05:30 +01:00
DL6ER c45bcd9d8e Add support for HOSTNAME diagnostics message 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-06-03 18:05:30 +01:00
Adam Warner 981cba14f2 Use PHP builtin to split the input by space. Automatically takes into account " chars 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-06-03 16:50:33 +01:00
XhmikosR a70eb512c0 Remove unneeded chart.update() calls. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-03 17:38:38 +03:00
XhmikosR 3b22d681ff Specify animation: false for the bar graphs 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-03 17:38:35 +03:00
XhmikosR 38dc8a5f13 Update Chart.js to v2.9.3. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-06-03 17:38:28 +03:00
Adam Warner 8dd141918d Merge pull request #1419 from pi-hole/fix/long-term-blocking-modes 
Fix long-term blocking calculations
 2020-06-03 08:40:22 +01:00