Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-23 18:29:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,042 Commits 23 Branches 114 Tags
8bc4115c2cce338db4e132efbfb71a406673d6af
Commit Graph

504 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
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
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
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
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
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
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
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
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
Mark Drobnak
a7d07f9f79 Merge pull request #991 from pi-hole/new/user-definable-temp-limit 
Add TEMPERATURELIMIT setting
 2019-08-21 09:02:54 -04:00
DL6ER
693a2f4e60 Change key: TEMPERATURELIMIT -> TEMPERATURE_LIMIT 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-21 10:09:47 +02:00
DL6ER
9f25f34398 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-08-20 14:07:34 +02:00
TheME
ee3d7b2803 remove unneeded class 'far' 
Signed-off-by: Th3M3 <the_me@hotmail.de>
 2019-08-09 11:56:15 +02:00
DL6ER
e66d0c4a74 Limit maximum length of each domain to 253 characters. We should document this somewhere if power users want to add insanely long regex filters, they will have to do this by directly interacting with the database. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-07 22:25:17 +02:00
DL6ER
965f2083a6 Remove special handling for audited domains and just add them separately to both lists. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-07 22:20:00 +02:00
DL6ER
586224fde2 Replace PREG_SPLIT_NO_EMPTY by using trim(). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-07 21:57:59 +02:00
DL6ER
3770556732 Use database.php:add_to_table() in teleporter.php:archive_insert_into_table(). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-07 21:49:51 +02:00
DL6ER
838516e558 Ensure preg does not output empty array elements. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-07 21:44:01 +02:00
DL6ER
07af532b09 Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-07 21:32:49 +02:00
DL6ER
d568b49fb1 Add busy timeout so adding/removing domains does not immediately fail in case the database is busy. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-07 21:24:05 +02:00
DL6ER
71fc7a4791 Use preg_split() instead of explode() for better space handling. Skip empty domains in add_to_table() and remove_from_table(). 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-07 21:23:29 +02:00
DL6ER
7807f12d65 Fix codefactor complaints. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-06 22:08:18 +02:00
DL6ER
7fdafb2dcc Update comment and code in sub.php 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-06 22:06:44 +02:00
DL6ER
424fe7636b Call "sudo pihole restartdns reload" after having added or removed domains to notify FTL of the updated lists. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-06 22:02:36 +02:00
DL6ER
98e5f21373 Move add_to_table() to database.php. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-08-06 20:49:49 +02:00