Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-23 02:09:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,520 Commits 23 Branches 114 Tags
ee0f9fdf68edcf0d3737d8a3a4d3a4e57800a30d
Commit Graph

664 Commits

Author SHA1 Message Date
DL6ER
f9fd89cda7 Merge pull request #1149 from pi-hole/new/space-separated-item-injection 
Allow space separated multiple items injection
 2020-03-31 23:40:39 +02:00
DL6ER
57e139bcba Merge branch 'release/v5.0' into new/space-separated-item-injection 2020-03-31 21:31:41 +00:00
Adam Warner
45f98ae0f5 Merge pull request #1176 from pi-hole/master-xmr-btn 
Streamline button classes and display.
 2020-03-31 22:09:23 +01:00
Adam Warner
1dbbd3583c Merge pull request #1190 from Th3M3/fix/allow_empty_emailaddress 
allow to clear email address
 2020-03-31 22:07:13 +01:00
DL6ER
f0034b305d Check adlist URL for valid characters before adding record to the database. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-03-31 20:41:50 +00:00
Th3M3
2a38bcc074 allow to clear email address 
Signed-off-by: Th3M3 <the_me@outlook.de>
 2020-03-18 21:39:55 +01:00
Adam Warner
49da88949c Merge pull request #1074 from XhmikosR/favicons 
New favicons.
 2020-03-11 19:41:46 +00:00
XhmikosR
b2bc0cb211 Streamline button classes and display. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-03-06 17:44:28 +02:00
Dan Schaper
aa51f014ab Fix domain and group disassociation when toggling from Black/Whitelis… (#1172) 
* Fix domain and group disassociation when toggling from Black/Whitelist page

* Properly set the groups variable

Signed-off-by: trillaxe <trillax@tutanota.com>

* Trim whitespace

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2020-03-05 12:59:42 -08:00
DL6ER
2530db8944 Responsiveness improvements for audit log page. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-22 12:35:04 +01:00
DL6ER
214bb004db Merge branch 'release/v5.0' into fix/audit_log 2020-02-22 11:43:43 +01:00
TheME
9fde58d7e0 make id names unique, ...* (#1170) 
* - remove unneeded code
- fix php notice in log if url parameter 'type' is not set

Signed-off-by: Th3M3 the_me@outlook.de
 2020-02-21 12:04:51 -08:00
DL6ER
1300b5411a Fix audit log page. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-21 19:11:17 +01:00
DL6ER
59085c237e Merge branch 'release/v5.0' into new/clients_comment_fields 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-18 16:44:12 +01:00
DL6ER
7274b9bca7 Only use IDN subroutines when the module is available. We have seen reports that at least DietPi is having issues with not matching PHP base and extension versions. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-16 21:16:06 +01:00
DL6ER
3c3e22bd98 Add support for client comment and timestamp fields. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-16 15:55:29 +01:00
DL6ER
32815cb7f0 Merge branch 'release/v5.0' into new/unify_domain_pages 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-16 09:13:45 +01:00
DL6ER
d584c2e2c2 Re-add add.php as it is used by the Query Log as well as the blocking page. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-15 18:18:46 +01:00
DL6ER
268a6d9144 Extract domain in addition request for all domain types, not just the exact ones. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-15 07:35:37 +01:00
DL6ER
2d975b8bac Simplify domain management by using the same page for both locations where domains can be edited. This removes a large amount of duplicated code, each prone to its own bugs. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-14 20:31:54 +01:00
DL6ER
b2cc349abf Only try to convert exact domains using the IDN library. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-14 17:27:45 +01:00
8633brown
8d60ef30f5 only print hostname in title if gethostname function returns a valid hostname 
Signed-off-by: 8633brown <toddbrown.8633@yahoo.co.uk>
 2020-02-12 22:16:05 -07:00
8633brown
908c24c6c5 Add "-" separator between title and hostname 
Co-Authored-By: Dan Schaper <dan@glacialmagma.com>
Signed-off-by: 8633brown <toddbrown.8633@yahoo.co.uk>
 2020-02-12 21:57:42 -07:00
8633brown
5676ca6e3d resolve change request 
Signed-off-by: 8633brown <toddbrown.8633@yahoo.co.uk>
 2020-02-12 13:40:44 -07:00
8633brown
84f635296c add gethostname function to html title 
Signed-off-by: 8633brown <toddbrown.8633@yahoo.co.uk>
 2020-02-11 18:48:19 -07:00
DL6ER
13b7b3d1a9 Remove redundant adlist management on settings page. This is still using CLI callbacks instead of working directly on the database. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-11 20:07:43 +01:00
DL6ER
ae470b2d3d Add ability to mass-inject space-separated domains. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-11 20:00:54 +01:00
Adam Warner
519e2771f1 Merge pull request #1124 from pi-hole/master-xmr-fa 
Switch to using Font Awesome
 2020-02-08 12:31:07 +00:00
DL6ER
2860ce3fc8 Merge pull request #1130 from pi-hole/new/intl_domains 
Add support for international domain names
 2020-02-04 21:07:28 +01:00
DL6ER
2c12b0d2d2 Merge pull request #1143 from pi-hole/fix/teleporter_legacy_import 
Fix teleporter's ability to import v4.x archives
 2020-02-04 20:23:25 +01:00
Adam Warner
174c063ffb Merge branch 'release/v5.0' into fix/FTL_group_update 2020-02-03 22:03:20 +00:00
DL6ER
917fd5949f Merge pull request #1129 from pi-hole/fix/underscore_TLDs 
Allow underscores in the middle of TLDs
 2020-02-03 22:44:09 +01:00
DL6ER
6ad2430f95 Import legacy adlist.list and fix/remove debugging output 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-02-02 19:10:26 +01:00
DL6ER
870ab035fc Fix teleporter's ability to import v4.x archives. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-01-28 22:26:19 +01:00
DL6ER
abe0b760bd Ensure we reach the end of groups.php to send SIGRTMIN to FTL. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-01-27 12:40:45 +00:00
Dan Schaper
89cf4b279b Merge branch 'release/v5.0' into new/intl_domains 2020-01-25 17:49:02 -08:00
DL6ER
f92812d4cd Substitute null client names by empty strings. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-01-19 22:32:28 +01:00
Samu Voutilainen
b7e9bd492c Use piholeFTLConfig() to resolve pihole-FTL.conf contents 
Signed-off-by: Samu Voutilainen <smar@smar.fi>
 2020-01-19 16:07:33 +02:00
Samu Voutilainen
ab04607087 FTL.php: parse port path from pihole-FTL.conf 
Signed-off-by: Samu Voutilainen <smar@smar.fi>
 2020-01-19 16:07:33 +02:00
XhmikosR
dee16f6c7a Switch to using Font Awesome 
This should be more consistent.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-01-19 13:53:48 +02:00
DL6ER
65be9d89ef Add support for international domain names. Note that this relies on php-intl to be installed 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-01-12 13:53:12 +01:00
DL6ER
1c4e8056c2 Allow underscores in the middle of TLDs. Fixes #1036 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-01-12 13:16:55 +01:00
XhmikosR
0ed702197a Change logo link to point to the dashboard. 
Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-01-08 18:36:11 +02:00
Adam Warner
b447d526d9 Merge pull request #1104 from pi-hole/fonts 
Move fonts to the header.php
 2020-01-04 16:09:43 +00:00
DL6ER
250457abc3 Merge branch 'devel' into tweak/customDNS_page 2019-12-28 16:47:42 +01:00
DL6ER
f96bbcb37f Merge pull request #1102 from pi-hole/fix/domains_lower_case 
Ensure added domains are lower-case.
 2019-12-28 16:46:09 +01:00
DL6ER
de8ead6a91 Merge pull request #1106 from pi-hole/tweak/teleporter-etc-hosts 
Add /etc/hosts to teleporter export.
 2019-12-28 16:45:25 +01:00
DL6ER
c81d690be4 Add /etc/hosts to teleporter export. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-28 13:30:57 +00:00
XhmikosR
cee3d536bc Move fonts to the header.php 
`@import` is discouraged because it's blocking.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2019-12-26 18:00:21 +02:00
DL6ER
da1276363d Ensure added domains are lower-case. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-12-23 09:33:30 +00:00