Commit Graph

3022 Commits

Author SHA1 Message Date
DL6ER 4d1beeb8bf UTF-8 encode all strings read from the database before JSON-encoding them
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-11-02 10:20:18 +01:00
Mark Drobnak 33dbe06b1e Merge pull request #1024 from Pazekal90/deletedIE9
Deleted conditional comments for lt. IE9 compatibility.
2019-10-20 15:09:32 -04:00
Mark Drobnak 4450d74c07 Merge pull request #1021 from Pazekal90/faupdate5112
Updated Dependency font-awesome 5.6.3 => 5.11.2
2019-10-20 14:52:36 -04:00
Mark Drobnak edcaf4a607 Merge pull request #1022 from Pazekal90/BootstrapUpdate
Updated Dependency Bootstrap to newest Version of 3.x. Updated from 3.3.6 to 3.4.1
2019-10-20 14:51:06 -04:00
Mark Drobnak 49c6832484 Merge pull request #1017 from Pazekal90/changeLogin
Dont show Shortcuts on small devices, because mostly there is not key…
2019-10-20 14:38:28 -04:00
Mark Drobnak 5e62f0e01f Merge pull request #1015 from Pazekal90/ChangedReadme
Deleted not working image in Readme.md
2019-10-20 14:37:24 -04:00
DL6ER 34de877ccf Merge pull request #999 from pi-hole/fix/gravity-timestamp
Use gravity updated timestamp from database
2019-10-08 10:17:23 +02:00
Pazekal90 4b27773c0c Deleted conditional comments for lt. IE9 compatibility.
Signed-off-by: Pazekal90 <mail@pascal-pischel.de>
2019-10-03 20:37:12 +02:00
DL6ER ba4dd33b9f Reduce nesting by inverting if statement and rearranging code.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-10-03 08:48:47 +02:00
Pazekal90 998486f35a Updated Dependency Bootstrap to newest Version of 3.x. Updated from 3.3.6 => 3.4.1. Contains Security Fixes.
Signed-off-by: Pazekal90 <mail@pascal-pischel.de>
2019-10-03 00:49:51 +02:00
Pazekal90 007b0cf1ea Deleted not working image in Readme.md
Signed-off-by: Pazekal90 <mail@pascal-pischel.de>
2019-10-03 00:31:54 +02:00
Pazekal90 a7bbe98e60 Dont show Shortcuts on small devices, because mostly there is not keyboard to use on smartphone. Some changes to optimize view on small devices.
Signed-off-by: Pazekal90 <mail@pascal-pischel.de>
2019-10-03 00:30:08 +02:00
Pazekal90 1cfc5e44e5 Updated Dependency font-awesome 5.6.3 => 5.11.2
Signed-off-by: Pazekal90 <mail@pascal-pischel.de>
2019-10-03 00:27:18 +02:00
Mark Drobnak 3495d0b222 Merge pull request #1007 from pi-hole/release/v4.3.2
Release v4.3.2 merge to development for update.
2019-09-21 20:40:47 -04:00
Adam Warner b7d3ddd2b0 Merge branch 'devel' into release/v4.3.2 2019-09-22 00:58:42 +01:00
Adam Warner 38d8e77f99 Merge pull request #1003 from pi-hole/release/v4.3.2
Pi-hole Web v4.3.2
v4.3.2
2019-09-22 00:06:20 +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