Commit Graph

1637 Commits

Author SHA1 Message Date
Martin
bd7be220b5 Update queryads.js 2017-01-14 00:22:56 +01:00
Martin
fed83cb49f Fix HTTPS
small edit
2017-01-12 11:25:36 +01:00
Martin
fd21d04bfb Fixed querying ads over HTTPS
changed http: to // to always use the correct protocol

Fixes #352
2017-01-12 11:07:49 +01:00
DL6ER
c1093527d0 Merge pull request #312 from pi-hole/wildcard_blacklisting
Add blacklisting wildcard support
2017-01-12 00:14:04 +01:00
DL6ER
fce8fe6021 Show headings if entry is added to list 2017-01-11 22:38:50 +01:00
DL6ER
e24c35a528 Merge branch 'devel' into wildcard_blacklisting 2017-01-11 18:26:10 +01:00
DL6ER
b521a8de96 Show notice that whitelisting of wildcard blocking is not possible 2017-01-11 16:50:46 +01:00
DL6ER
3c0c92e8b1 Hide "Whitelist" button on wildcard blocked entries (Query Log page) 2017-01-11 12:41:35 +01:00
Mcat12
c98399d6b1 Merge pull request #350 from pi-hole/tweak/querylogbuttonserrormessage
Add more detailed error output recently added to the lists page to the query log action buttons
2017-01-10 18:01:19 -05:00
DL6ER
bc5dbac376 Merge pull request #347 from donmahallem/patch-1
Unhide the domain if the list removal fails
2017-01-09 16:54:07 +01:00
DL6ER
6f8287b17f Merge pull request #348 from donmahallem/patch-2
Unused variable $tmp
2017-01-09 16:52:23 +01:00
DL6ER
bd36baa18b Merge branch 'devel' into wildcard_blacklisting 2017-01-09 14:51:54 +01:00
DL6ER
9eadc26d30 Add more detailed error output recently added to the lists page to the query log action buttons 2017-01-09 14:40:40 +01:00
donmahallem
f8dc8f0ccb Unused variable $tmp
This variable is in its current form never used
2017-01-08 22:26:11 +01:00
donmahallem
8707e04c55 If domain removal fails unhide the domain
Currently the domain keeps hidden if the domain removal fails.
2017-01-08 18:26:55 +01:00
Mcat12
a05c03fec1 Merge pull request #345 from pi-hole/tweak/querylogactionbuttons
Prevent query log action buttons from line breaking
2017-01-08 11:16:01 -05:00
Mcat12
0cee14816f Merge pull request #346 from pi-hole/tweak/display_IPs
Display IP addresses in Top Clients and Forward Destinations
2017-01-08 11:13:31 -05:00
Mcat12
b2279add88 Merge pull request #343 from pi-hole/tweak/multiadd
Add multiple domains separated by whitespace
2017-01-08 10:57:36 -05:00
Mcat12
0d82d03c30 Merge pull request #344 from pi-hole/fix/auth
Ensure that $auth is always set
2017-01-08 10:53:45 -05:00
DL6ER
1e694b31aa Show IP for forward destination (if available) 2017-01-08 16:26:37 +01:00
DL6ER
a004b90ea1 Top Clients List: Show IP address of host name when hovering over the link 2017-01-08 16:23:54 +01:00
DL6ER
6fd6af5d62 Prevent query log action buttons from line breaking 2017-01-08 14:32:36 +01:00
DL6ER
9db9eff3d8 Ensure that $auth is always set 2017-01-08 11:01:26 +01:00
DL6ER
b6695f9882 Show failure response in error message (e.g. abd<>.de is not a valid domain) 2017-01-08 10:40:21 +01:00
DL6ER
3808f74d4d Change function check_domain() to validate multiple domains separated by spaces 2017-01-08 10:37:20 +01:00
DL6ER
f5ac5105e3 Revert "Add multiple domains separated by whitespace"
This reverts commit 066bb14044.
2017-01-08 10:34:45 +01:00
Mcat12
066bb14044 Add multiple domains separated by whitespace 2017-01-07 19:46:45 -05:00
Mcat12
29f3c2fa8b Merge pull request #330 from codacy-badger/codacy-badge
Add a Codacy badge to README.md
2017-01-07 19:11:53 -05:00
Mcat12
f45ebbf517 Merge pull request #342 from pi-hole/whyarestatusitemshyperlinks
These don't need to be links
2017-01-07 19:08:14 -05:00
Mcat12
bac5bd7fcd Preserve <a> but take off href
Need the styling provided by <a>
2017-01-07 19:03:37 -05:00
Promofaux
f53ea25bd4 These don't need to be links 2017-01-07 22:40:04 +00:00
Mcat12
b2b5a00e18 Merge pull request #341 from pi-hole/fix/add-domain-output
Sanitize error output
2017-01-07 14:37:51 -05:00
Mcat12
79f7d93c52 Sanitize error output 2017-01-07 14:34:30 -05:00
DL6ER
c32b3c2925 Merge pull request #340 from pi-hole/fix/leaked-token
Only show token when authorized and sanitize list action output
2017-01-07 20:15:12 +01:00
Mcat12
ed496afc1e Do not hide the session info
The JS will handle that
2017-01-07 14:10:42 -05:00
Mcat12
9ff6561e71 Merge pull request #339 from pi-hole/tweak/querylogpage
Add error callback to Query Log page
2017-01-06 18:52:38 -05:00
Mcat12
459027e962 Add semicolon 2017-01-06 18:47:41 -05:00
Mcat12
2386059780 Merge pull request #337 from pi-hole/fix/maingraph
Fix overTime algorithms
2017-01-06 13:50:09 -05:00
DL6ER
3c761b4b50 Clear processing label + remove table content 2017-01-06 18:15:08 +01:00
DL6ER
ea71b64e2c Add error callback to Query Log page 2017-01-06 18:09:05 +01:00
Mcat12
7765eeea34 Only show token when authorized 2017-01-06 10:53:01 -05:00
DL6ER
d7afada93c Fix overTime algorithms 2017-01-06 10:19:41 +01:00
Dan Schaper
7be7956c17 Merge pull request #332 from pi-hole/devel
[RELEASE] Pi-hole Web Admin 2.3.1
v2.3.1
2017-01-04 12:33:39 -08:00
Mcat12
23149709db Merge pull request #327 from pi-hole/tweaks
Tweaks for the webUI
2017-01-03 17:26:20 -05:00
Mcat12
c1f997cb11 Merge pull request #328 from pi-hole/new/ipv6settings
Make IPv6 features of the Pi-hole DHCP server switchable
2017-01-03 17:23:23 -05:00
Mcat12
edbfc53931 Merge pull request #329 from pi-hole/fix/IEsupport
Fix IE support for main page
2017-01-03 17:07:41 -05:00
DL6ER
95c5965e9e Merge pull request #326 from pi-hole/fix/responsiveIcon
Fix responsive icon on Gecko engine (Firefox + derivatives)
2017-01-03 21:19:35 +01:00
DL6ER
c5f99af46c Detect if IPv6 is used 2017-01-03 18:04:20 +01:00
DL6ER
cd0c62665d Minor change to kick codacy 2017-01-03 15:54:45 +01:00
The Codacy Badger
e84f2e49a0 Add Codacy badge 2017-01-03 14:07:53 +00:00