f4722cf2a9
Merge pull request #1263 from pi-hole/xmr-animate-min
...
Use the minified animate.css file.
2020-05-17 13:05:38 +01:00
0bf2f4e4cc
Merge pull request #1300 from pi-hole/XhmikosR-patch-7
...
header: Move license header at the top
2020-05-17 11:16:08 +01:00
34c9514e07
Merge pull request #1311 from pi-hole/XhmikosR-patch-11
...
header: add X-UA-Compatible meta tag
2020-05-17 11:11:11 +01:00
acbe0edbd4
header: add X-UA-Compatible meta tag
...
For consistency with Bootstrap 3.x.
Signed-off-by: XhmikosR <xhmikosr@gmail.com >
2020-05-17 11:52:52 +03:00
f6bd1a28a2
Use fa-angle-left to see if sidebar transition works
...
Signed-off-by: XhmikosR <xhmikosr@gmail.com >
2020-05-16 19:44:55 +03:00
8283f63c41
Simplify sidebar markup per the latest AdminLTE 2.x demo
...
Signed-off-by: XhmikosR <xhmikosr@gmail.com >
2020-05-16 19:44:05 +03:00
b416075cdc
header: Move license header at the top
...
Signed-off-by: XhmikosR <xhmikosr@gmail.com >
2020-05-16 19:16:44 +03:00
6634fb6856
Merge pull request #1288 from pi-hole/tweak/add_domain_behaviour1
...
Also do this from the query log page
2020-05-15 01:18:33 +02:00
e12ebcbd08
Trim user input where applicable
...
Signed-off-by: Jack'lul <jacklulcat@gmail.com >
2020-05-14 18:01:36 +02:00
c53436ab3f
Also do this from the query log page
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-05-13 23:38:43 +01:00
ef13e69125
Use REPLACE into instead of INSERT into. This allows for a domain's white/blacklist status to be toggled
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-05-13 22:01:58 +01:00
76d50c1897
Use the minified animate.css file.
...
Signed-off-by: XhmikosR <xhmikosr@gmail.com >
2020-05-13 07:34:16 +03:00
eefbef678c
Suppress white 'flashing' on page reloading in dark mode.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-05-12 22:50:29 +02:00
05d5f02a36
Add theme chooser to Setting -> Web interface.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-05-12 22:50:29 +02:00
064a0aae9c
Use the iCheck library for input box styling.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-05-12 22:50:29 +02:00
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
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
08d2676489
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-05-12 21:14:18 +02:00
257f6ce55e
Log number of imported group assignments.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-05-12 20:36:00 +02:00
ac3c178ce9
Add import for Local DNS Records.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-05-12 20:23:26 +02:00
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
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
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
3d6a54ff97
Add hold-transition to body tag
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk >
2020-05-12 16:33:07 +01:00
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
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
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
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
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
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
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
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
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
9cf73959fd
Rename Custom DNS page.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-04-28 18:23:13 +00:00
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
84046528bf
Allow ( and ) in adlist URLs.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-04-26 09:31:45 +02:00
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
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
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
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
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
a64810e00e
Merge branch 'release/v5.0' into devel
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2020-04-08 12:25:18 +02:00
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
fd983a2b68
improve multiselect
...
Signed-off-by: Th3M3 <the_me@outlook.de >
2020-04-05 14:56:28 +02:00
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
57e139bcba
Merge branch 'release/v5.0' into new/space-separated-item-injection
2020-03-31 21:31:41 +00:00
45f98ae0f5
Merge pull request #1176 from pi-hole/master-xmr-btn
...
Streamline button classes and display.
2020-03-31 22:09:23 +01:00
1dbbd3583c
Merge pull request #1190 from Th3M3/fix/allow_empty_emailaddress
...
allow to clear email address
2020-03-31 22:07:13 +01:00
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
2a38bcc074
allow to clear email address
...
Signed-off-by: Th3M3 <the_me@outlook.de >
2020-03-18 21:39:55 +01:00
Adam Warner
XhmikosR
DL6ER
Jack'lul
DL6ER
Dan Schaper
Samu Voutilainen
Th3M3