Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-23 04:08:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,823 Commits 19 Branches 112 Tags
c42c06be2dea820da599e1598b51a6aa6c39aafc
Commit Graph

744 Commits

Author SHA1 Message Date
DL6ER
a08a85994e Initial (incomplete) support for themes. Currently, the default is the new Pi-hole dark theme. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 22:44:52 +02:00
XhmikosR
bfd944e41c Switch to the plain chart.js build and moment.js to v2.24 
This avoids including moment.js twice since chart.js bundle included moment.js

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-12 23:05:59 +03:00
DL6ER
08d2676489 Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 21:14:18 +02:00
DL6ER
257f6ce55e Log number of imported group assignments. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 20:36:00 +02:00
DL6ER
ac3c178ce9 Add import for Local DNS Records. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 20:23:26 +02:00
DL6ER
67b68b4400 Add pihole-FTL.conf ans custom.list (Local DNS Records) to Teleporter Backup 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 20:23:26 +02:00
DL6ER
ad4a10c01e Add import for missing tables: group, client + the group linking tables. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 20:23:26 +02:00
DL6ER
cb48efff19 Add export for missing tables: group, client + the group linking tables. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-05-12 20:23:26 +02:00
Adam Warner
3d6a54ff97 Add hold-transition to body tag 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 16:33:07 +01:00
Adam Warner
3e94ff0f43 Update adminLTE to 2.4. 
- Change a few references per upgrade guide
 - define colors[] at the top of index.js as AdminLTE.options does not appear to exist. (there may be a better way of doing this)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2020-05-12 12:58:45 +01:00
DL6ER
e96acc415d Merge pull request #1262 from pi-hole/xmr-button-type 
Add `type="button"` to all buttons.
 2020-05-11 22:05:34 +02:00
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
XhmikosR
43151d3c43 Add type="button" to all buttons. 
The default is `type="submit"`.

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
 2020-05-11 21:40:26 +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
373d59f751 Improve conditional forwarding settings so users can specify the subnet according to their needs. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2020-04-10 10:54:41 +02: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