Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-28 13:49:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,894 Commits 27 Branches 113 Tags
8819825dc8a7b8b0326433a4fa55377eede62ced
Commit Graph

2894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mcat12
8819825dc8 Upgrade the exporter/importer (teleporter) to use the gravity database 
Also fixed the content type of the tar.gz archive from zip to gzip.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-04 12:31:02 -07:00
Mark Drobnak
4e1df1664c Merge pull request #951 from pi-hole/new/arp-flush 
Add button for pihole arpflush on Pi-hole settings page
 2019-07-04 14:10:29 -04:00
DL6ER
2e2896add3 Merge pull request #964 from pi-hole/new/networktable_ip_neigh 
Add IPv6 support for network table
 2019-07-04 11:44:10 +02:00
Mark Drobnak
00d9b3d9c4 Merge pull request #974 from pi-hole/fix/admin-email-validation 
Prevent command injection via admin email
 2019-07-02 21:49:26 -04:00
Mcat12
f7905167c0 Prevent command injection via admin email 
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-07-01 20:17:10 -07:00
Mark Drobnak
392802687d Merge pull request #900 from pi-hole/tweak/long_term_data_padding 
Always show the full requested range in the long-term API results
 2019-06-16 17:32:22 -04:00
DL6ER
fb96e6ff21 Reposition parseDBData() to simplify diff output 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-16 14:08:26 +02:00
DL6ER
7c4dee6f2d Simplify getGraphData and round and to match the requested . 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-16 14:06:52 +02:00
DL6ER
99a53fcfd4 Remove fallback to ip column in network table as we removed this column in DB version 5. There will always be a corresponding entry for each device in the network table. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-16 12:30:36 +02:00
DL6ER
9ba59b9ef3 Merge branch 'devel' into new/networktable_ip_neigh 2019-06-16 12:28:18 +02:00
Mark Drobnak
91c9865b70 Merge pull request #967 from pi-hole/fix/clarify_advanced_dns_settings_text 
Clarify that the router does not always have to be the DHCP server
 2019-06-16 00:20:54 -04:00
Mark Drobnak
889c5d5143 Merge pull request #966 from pi-hole/fix/clients_over_time_privacy_level_3 
Hide clients over time graph is no data is available
 2019-06-16 00:19:33 -04:00
DL6ER
2f5f95dba1 Clarify that the router does not always have to be the DHCP server. Fixes #893 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-15 17:47:07 +02:00
DL6ER
d616a1180a 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-06-15 17:20:49 +02:00
DL6ER
1096179245 Fix (almost) endless loop when there are no (or no blocked) queries in the selected interval. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-15 16:24:00 +02:00
DL6ER
d2ce57b48b Check IP field not entire object 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-15 15:58:12 +02:00
DL6ER
764a0b1a3a If a device is unknown in the network_addresses table, we fall back to the IP address stored in the network table. This might be the case for devices that have not been seen since a long time. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-15 08:52:47 +02:00
DL6ER
cbd8eb6148 Remove variable $ipaddr 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-15 08:45:31 +02:00
DL6ER
f0458e518a Disable ordering by IP address as this is not really meaningful if we have multiple IPs in each row 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-14 19:19:53 +02:00
DL6ER
425b6ba5a7 Show at only the three most recent IP addresses for each device. The hover text of contains all IP addresses. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-14 19:17:52 +02:00
DL6ER
0895a6f044 network_addresses(id) has been renamed to netword_addresses(network_id) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-14 18:09:27 +02:00
DL6ER
4aea8999cb Offer multiple IP addresses through API if available 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-06-11 00:18:54 +02:00
Mark Drobnak
542aa8b4bc Merge pull request #957 from donnykurnia/update-fontawesome-clock-icon 
update font-awesome class for clock icon in Fontawesome 5
 2019-06-04 23:18:35 -04:00
Donny Kurnia
8d18cfcd8f update font-awesome class for clock icon in Fontawesome 5 
Signed-off-by: Donny Kurnia <donnykurnia@gmail.com>
 2019-06-04 16:13:01 +07:00
DL6ER
de2dd7177e Merge pull request #935 from pi-hole/fix/audit-log-button 
Fix audit log button being too wide
 2019-05-31 13:28:59 +02:00
Mark Drobnak
f4029c73a0 Merge pull request #948 from pi-hole/fix/arp_IP_sorting 
Add correct IP sorting for the ARP table
 2019-05-30 23:12:16 -04:00
DL6ER
43fa24fbea Glue needs to be the first argument of implode 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 22:11:13 +02:00
DL6ER
72abc5dad4 Add button for pihole arpflush on Pi-hole settings page 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 22:05:13 +02:00
DL6ER
611db2b4a9 Add source URL to the JS file 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 17:27:31 +02:00
DL6ER
0e2d30dd11 Also show "N/A" if the name column is NULL 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 12:48:53 +02:00
DL6ER
dddc791052 Move ip-address-sorting into its own file 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 12:44:09 +02:00
DL6ER
5f79025cc9 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-05-30 12:30:55 +02:00
DL6ER
09eb4f5dc3 Check fields against null before trying to obtain their lengths. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-30 12:24:43 +02:00
Mark Drobnak
4ed39ff8d2 Merge pull request #946 from pi-hole/fix/sidebar-toggle-height 
Fix the sidebar toggle from overflowing when hovered over
 2019-05-26 15:50:07 -04:00
Mcat12
7b796f2ad8 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-05-26 12:27:00 -07:00
Mark Drobnak
2e27a29c76 Merge pull request #938 from pi-hole/fix/query_table_aditional_sorting_by_id 
Fix sorting of queries with identical timestamps
 2019-05-22 15:40:24 -04:00
Mcat12
dd683cffc1 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-05-21 17:51:41 -07:00
Dan Schaper
a25195636c Merge pull request #939 from pi-hole/release/v4.3 
Update Dev with v4.3 fixes
 2019-05-21 17:45:25 -07:00
Mark Drobnak
5563dbe5a2 Merge pull request #942 from pi-hole/fix/refresh-icon 
Replace fa-refresh with fa-sync
 2019-05-19 18:11:55 -04:00
Mcat12
db68782f62 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-05-19 14:16:55 -07:00
Mark Drobnak
166d684d8d Merge pull request #940 from SuperSandro2000/fix-pr-template 
Fix pr template
 2019-05-18 17:44:54 -04:00
Sandro Jäckel
7c50e0ba8d Update link to git-scm.com, make the checkboxes actual checkboxes 
Signed-off-by: Sandro Jäckel <sandro.jaeckel@gmail.com>
 2019-05-18 23:43:01 +02:00
Mark Drobnak
4a062c35b9 Merge pull request #933 from pi-hole/new/gravityDB 
Store domains in a database
 2019-05-12 18:47:18 -04:00
DL6ER
468cd0ccfd Move dataIndex definition into dataSrc function 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-10 22:02:52 +02:00
DL6ER
6d896f9892 Use Array.map() instead of looping over elements and pushing the content to a new array 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-09 20:10:32 +02:00
DL6ER
1d5b212d93 Apply the same changes also for the database query list 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-06 07:44:11 +02:00
DL6ER
ce88417d55 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-05-06 07:41:13 +02:00
DL6ER
7afa31c6d1 Merge branch 'release/v4.3' into fix/query_table_aditional_sorting_by_id 2019-05-05 20:34:27 +02:00
DL6ER
c4df1bcced Remove extra ID column, this is intentionally done in a separate commit 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-05 13:51:23 +02:00
DL6ER
0590127865 Ensure correct sorting of queries even if they happened withing the same second. Fixes #934 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-05-05 13:50:33 +02:00