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,006 Commits 16 Branches 105 Tags
b7d3ddd2b085fbeef0d98391e596edb29625ca7e
Commit Graph

3006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Warner b7d3ddd2b0 Merge branch 'devel' into release/v4.3.2 2019-09-22 00:58:42 +01:00
Adam Warner 76d2488e9e Merge pull request #1005 from pi-hole/fix/settings-xss 
Fix some XSS issues in settings.php
 2019-09-19 22:32:44 +01:00
Mcat12 d23df61a49 Fix some XSS issues in settings.php 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-09-18 17:16:39 -04:00
DL6ER 752cd38698 Merge pull request #1004 from pi-hole/fix/teleporter_adlist_export 
Fix Teleporter adlist export issue (development only bug)
 2019-09-18 14:51:10 +02:00
DL6ER f3d8f0dfb5 Teleporter expects adlist.json during import, however, the file is called adlists.json during export. Fix this by using singular during export. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-18 00:36:03 +02:00
Mark Drobnak bfe7b76f34 Merge pull request #974 from pi-hole/fix/admin-email-validation 
Prevent command injection via admin email
 2019-09-12 21:11:19 -04:00
DL6ER c399043db4 Use correct IDs for spinners in index.js 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:11:18 -04:00
DL6ER cc1658c01d Remove dead code 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:11:18 -04:00
DL6ER e567983bb3 Change key: TEMPERATURELIMIT -> TEMPERATURE_LIMIT 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:11:17 -04:00
DL6ER b66302bb9f Add TEMPERATURELIMIT setting in setupVars.conf for setting the level beyond which we show the temperature icon in red on the dashboard. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:11:14 -04:00
denny0754 01a29f6555 Fixed Issue#983 2019-09-12 21:11:13 -04:00
TheME 704f983243 remove unneeded class 'far' 
Signed-off-by: Th3M3 <the_me@hotmail.de>
 2019-09-12 21:11:13 -04:00
TheME e816c28fd0 fix broken Icons 
Signed-off-by: Th3M3 <the_me@hotmail.de>
 2019-09-12 21:11:12 -04:00
Mcat12 580f1eb06d Add missing break 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-09-12 21:11:11 -04:00
Mcat12 fafd5b419b Prevent static DHCP leases from having duplicate hostnames 
Fixes #979

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-09-12 21:11:10 -04:00
Daniel f6aeac5a1c Improve audit logic to batch requests. 
Signed-off-by: Daniel <daniel@developerdan.com>
 2019-09-12 21:11:10 -04:00
Mcat12 964c54360b Don't show the "Click to ..." tooltip when filtering is disabled 
Fixes #971

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-09-12 21:05:57 -04:00
DL6ER 48f7de4cf0 Reposition parseDBData() to simplify diff output 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:56 -04:00
DL6ER 1fa2e07642 Simplify getGraphData and round and to match the requested . 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:56 -04:00
DL6ER 429aa066e7 Fix (almost) endless loop when there are no (or no blocked) queries in the selected interval. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:55 -04:00
DL6ER f1193a43df Always show the full requested range. Fill data with zero at the end when the daterange is extending into the future. Similarly, fill data wil zero at the beginning if the requested range extends into a region without recorded queries. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:54 -04:00
DL6ER d2ff1f9093 Clarify that the router does not always have to be the DHCP server. Fixes #893 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:53 -04:00
DL6ER a8b4cb74d8 Check data before converting. This allows us to detect if there is no data for the graph so we can hide it. Fixes #932 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:53 -04:00
Donny Kurnia bb162f6fcd update font-awesome class for clock icon in Fontawesome 5 
Signed-off-by: Donny Kurnia <donnykurnia@gmail.com>
 2019-09-12 21:05:52 -04:00
Mcat12 896be197d0 Fix audit log button being too wide 
All of the divs surrounding the button tag were unnecessary.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-09-12 21:05:51 -04:00
DL6ER c7aa2556a1 Add source URL to the JS file 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:50 -04:00
DL6ER 83013993cd Also show "N/A" if the name column is NULL 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:50 -04:00
DL6ER a027715247 Move ip-address-sorting into its own file 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:49 -04:00
DL6ER f830bfbc7b Add IP address sorting for the network table, based on https://datatables.net/plug-ins/sorting/ip-address 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:48 -04:00
DL6ER c8086b4239 Check fields against null before trying to obtain their lengths. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:47 -04:00
Mcat12 3b24170eda Fix the sidebar toggle from overflowing when hovered over 
Thanks to @Th3M3 for finding the issue and solution.

Fixes #945

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-09-12 21:05:47 -04:00
DL6ER 19d6f4ae9f Move dataIndex definition into dataSrc function 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:46 -04:00
DL6ER cdefb1ca60 Use Array.map() instead of looping over elements and pushing the content to a new array 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:45 -04:00
DL6ER a4fe802fb9 Apply the same changes also for the database query list 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:44 -04:00
DL6ER 2175efd605 Use the render option of the columns definition to specify how and when the date string is shown. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:44 -04:00
DL6ER 77931b499a Remove extra ID column, this is intentionally done in a separate commit 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:43 -04:00
DL6ER 695730920a Ensure correct sorting of queries even if they happened withing the same second. Fixes #934 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-12 21:05:42 -04:00
Mcat12 b8088e7f0f Replace fa-refresh with fa-sync 
Font Awesome 5 replaced the refresh icon from 4 with fa-sync:
https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4#name-changes

Fixes #941

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-09-12 21:05:41 -04:00
Sandro Jäckel 5713a65e06 Update link to git-scm.com, make the checkboxes actual checkboxes 
Signed-off-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
 2019-09-12 21:05:27 -04:00
Mark Drobnak f370fd96b6 Merge pull request #1001 from pi-hole/tweak/teleporter-wildcard 
Extend description of regex lists in teleporter
 2019-09-07 10:54:26 -04:00
DL6ER fb17a8536c Extend description of regex lists (they also contain the wildcard-style rules) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-05 19:08:05 +02:00
Mark Drobnak dc2064ef30 Merge pull request #1000 from pi-hole/tweak/show_error_on_db_connection_failure 
Pass possible exception from SQLite3_connect_try() to the calling pro…
 2019-09-03 10:35:40 -04:00
DL6ER d42180d2be Pass possible exception from SQLite3_connect_try() to the calling process. This makes this function return either valid SQLite3 objects (success) or strings (errors). We can pass the errors to the user interface to help user helping themselves. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-09-02 21:34:39 +02:00
DL6ER bc4f508970 Merge pull request #986 from pi-hole/new/whitelist-regex-support 
Add whitelist regex support
 2019-09-01 14:23:50 +02:00
Mark Drobnak fafbc4cc68 Merge pull request #993 from pi-hole/fix/removed_dead_code 
Removed outdated code
 2019-08-31 12:46:05 -04:00
DL6ER d97c85f724 Slightly change the message shown when domains are duplicates. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-29 17:26:32 +02:00
DL6ER 50e5349ee4 If some domains are not added, then this happened because they are duplicates. Highlight this in the success message. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-29 16:53:00 +02:00
DL6ER fcc49e3928 Wrap addition and removal of domains in a transaction + deliver a more detailed success message to the user specifying how many domains are actually added (in case some already existed). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-27 19:26:51 +02:00
DL6ER d101465c62 Pass through errors to user interface 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-27 18:53:10 +02:00
DL6ER 4743228a86 Allow domains to be added by hitting return (add them as exact domains). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-27 17:19:05 +02:00