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

631 Commits

Author SHA1 Message Date
XhmikosR
8db0957a28 Minor tweaks 
* use the background-color property instead of the background shorthand
* add multiple classes with one `addClass` call
* rename `underline` to `text-underline`
* use the CSS class `pointer` instead of adding CSS via JS
* change `border-color: transparent` to `border: 0` in the navbar right dropdown image
* add image dimensions in the dropdown donate image
* remove the obsolete and unneeded `center` element from network.php
* remove commented out PHP code from header.php
* fix wrong `form-control` class used in buttons

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-11 21:49:48 +03:00
DL6ER
73ee91a024 Merge branch 'master' into master-to-development-v5.0 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-10 22:00:07 +02:00
Adam Warner
d8706620de Replace paypal link with link to pi-hole.net donate page 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-09 12:57:15 +01:00
Adam Warner
6e5bbfb68a Check IP addresses read in from dns-server.conf are valid before adding them to the array. 
Fix for CVE-2020-12620

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-03 22:47:33 +01:00
DL6ER
81a2932f6a Merge branch 'release/v5.0' into tweak/trim_domains_input 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-28 21:12:45 +02:00
Dan Schaper
eaf2d7ed62 Merge pull request #1226 from pi-hole/tweak/allow_()_in_urls 
Allow ( and ) in adlist URLs.
 2020-04-28 11:46:32 -07:00
DL6ER
9cf73959fd Rename Custom DNS page. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-28 18:23:13 +00:00
DL6ER
4889350038 Merge branch 'release/v5.0' into tweak/trim_domains_input 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-28 17:30:13 +00:00
DL6ER
84046528bf Allow ( and ) in adlist URLs. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-26 09:31:45 +02:00
DL6ER
f17b216b6b As of ICU 55.1 (released 2015-04-01) the IDNA2003 APIs are deprecated, because UTS #46 should be preferred over the obsolete IDNA 2003 variant. Implement this change. Fixes #1223 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-25 07:02:37 +02:00
DL6ER
77b421b133 Show how many domains have been added in case of an error. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 13:47:50 +02:00
DL6ER
7d1163ff9c Try to be clearer with the "failed to add domain" message by showing the original input when idn_to_ascii() failed and by showing both, the original and the converted domain when the conversion result itself is invalid. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 11:39:57 +02:00
DL6ER
14dd1350df Strip whitespaces from the beginning and end of user input to prevent errors getting triggered due to users trying to add "empty" domains. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-23 11:27:24 +02:00
Samu Voutilainen
39ec67829b Execute pihole through wrapper 
All different exec() calls basically just calls sudo pihole,
with various different syntaxes. Using a wrapper function
allows sanitization of arguments for better safety.

Signed-off-by: Samu Voutilainen <smar@smar.fi>
 2020-04-17 07:55:16 +03:00
DL6ER
a64810e00e Merge branch 'release/v5.0' into devel 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-08 12:25:18 +02:00
DL6ER
0f892c9ffc Check for existance and readability of static leases file before trying to access it. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-07 12:30:51 +02:00
Th3M3
fd983a2b68 improve multiselect 
Signed-off-by: Th3M3 <the_me@outlook.de>
 2020-04-05 14:56:28 +02:00
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