Commit Graph

908 Commits

Author SHA1 Message Date
Adam Warner
8bc4115c2c Merge pull request #1023 from Pazekal90/ionicons
Deleted Ionicons as dependency. Changed existing usage to fontawesome…
2019-11-16 13:23:05 +00:00
Adam Warner
339d63736a Merge pull request #1028 from pi-hole/tweak/AddCommentEntryToListPages
Allow user to add in a comment next to domain entry
2019-11-15 21:00:50 +00:00
Adam Warner
acf448f592 Merge pull request #1029 from pi-hole/tweak/AddCommentEntryToBlocklistPage
Add ability for user to include comment when adding a blocklist
2019-11-14 15:46:10 +00:00
DL6ER
23fb8bf16f Merge pull request #1042 from pi-hole/fix/gravity_last_update_intval
Ensure gravity_last_updated values are correctly handled as integers
2019-11-12 20:46:27 +01:00
DL6ER
5ff2aa6235 Merge pull request #1033 from Pazekal90/devel
Fixed Issue: Show shortcuts on bigger screens
2019-11-07 21:40:42 +01:00
DL6ER
130c879597 Ensure gravity_last_updated values are correctly handled as integers, not as strings. This fixes #1041
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-11-07 21:39:55 +01:00
DL6ER
858a916dcb Top Clients (blocked only) tooltip should show total number of blocked queries. The percentage is already computed correctly.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-11-02 11:07:43 +01:00
Pascal Pischel
2f08bdd8a9 Update index.php
Changed Chart Icon and List Icon to ones that are similar in react web interface.

Signed-off-by: Pazekal90 <mail@pascal-pischel.de>
2019-10-23 23:26:47 +02:00
Pazekal90
5019ae8f4e Fixed Issue https://github.com/pi-hole/AdminLTE/issues/1032
Signed-off-by: Pazekal90 <mail@pascal-pischel.de>
2019-10-23 22:08:34 +02: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
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
Adam Warner
8311a0aefc Add ability for user to include comment when adding a blocklist
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-10-14 22:59:05 +01:00
Adam Warner
c65b9a3468 remove unnecessary semicolon as per codefactor.io
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-10-14 22:02:59 +01:00
Adam Warner
07195fb4e7 Allow user to add in a comment next to domain entry
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2019-10-14 21:55:29 +01: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
Pazekal90
70d859af80 Deleted Ionicons as dependency. Changed existing usage to fontawesome to get better performance in browser.
Signed-off-by: Pazekal90 <mail@pascal-pischel.de>
2019-10-03 20:24:54 +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
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
Adam Warner
b7d3ddd2b0 Merge branch 'devel' into release/v4.3.2 2019-09-22 00:58:42 +01: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
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
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
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
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
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
32566b66b3 Use gravity updated timestamp from database. This fixes #989.
Signed-off-by: DL6ER <dl6er@dl6er.de>
2019-09-02 17:25:44 +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
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