Commit Graph

51 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
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
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
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
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
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
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
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
459027e962 Add semicolon 2017-01-06 18:47:41 -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
23149709db Merge pull request #327 from pi-hole/tweaks
Tweaks for the webUI
2017-01-03 17:26:20 -05:00
DL6ER
cd0c62665d Minor change to kick codacy 2017-01-03 15:54:45 +01:00
DL6ER
810b994af2 Fix IE support for main page (untested). Has been broken because codacy enforces Object Literal Shorthand Syntax 2017-01-03 14:59:37 +01:00
DL6ER
5d0da1a8eb Fix JS inconsistency that is tolerated by FF and Chrome but not IE 2017-01-03 13:48:02 +01:00
Mcat12
3e139b1b96 Merge pull request #318 from pi-hole/tweak/loginpage
Ctrl+Return on login page -> Go immediately to Settings page
2017-01-02 15:31:23 -05:00
DL6ER
0e37bc89a9 Fix codacy 2017-01-02 17:18:54 +01:00
DL6ER
8220c27a20 Try to detect it also on non-Unix platforms 2017-01-02 17:05:46 +01:00
DL6ER
3c3f6ef916 Merge branch 'devel' into wildcard_blacklisting
Conflicts:
	scripts/pi-hole/js/queries.js
2017-01-02 16:04:58 +01:00
DL6ER
207be6ba6d Codacy fixes ( Strings must use doublequote. ) 2017-01-02 13:30:03 +01:00
DL6ER
ed01434506 Strg+Return -> Go immediately to Settings page 2017-01-02 13:24:48 +01:00
DL6ER
4209320b87 Add glowing notification that users should disabled their router's DHCP server when first activating the DHCP server 2017-01-02 13:17:45 +01:00
Adam Warner
79073e15c8 Merge pull request #309 from pi-hole/new/dhcpv6settings
Add DHCP lease time settings.
2017-01-01 20:11:49 +00:00
DL6ER
fd3022abb3 Fix check for white/blacklist action on Query Log 2016-12-31 18:11:31 +00:00
DL6ER
28bea42f88 Implemented wildcard blocking in Query Log 2016-12-31 17:21:50 +00:00
DL6ER
33714c540c codacy fixes 2016-12-31 16:44:03 +00:00
DL6ER
c409cf20bf Hide h3 headings if list is empty 2016-12-31 16:35:16 +00:00
DL6ER
a33301911a Made everything working 2016-12-31 16:24:10 +00:00
DL6ER
05f2df720e Put wildcard blocking entries into their own table 2016-12-31 16:06:21 +00:00
DL6ER
754fa117ec Detect if wildcard blocking entry on Blacklists page 2016-12-31 15:45:12 +00:00
DL6ER
01f31137a3 Merge branch 'devel' into new/clickonmaingraph 2016-12-30 20:37:44 +00:00
DL6ER
d9c695dc4a Merge branch 'devel' into new/dhcpv6settings 2016-12-30 20:33:21 +00:00
Mcat12
4cffd16aae Update tail log and query ads 2016-12-30 15:00:06 -05:00
Promofaux
8240e2d23b merge devel 2016-12-29 19:59:09 +00:00
Mcat12
fab94e07fd Fix php links in js files
Also removed help.js because it's no longer used
2016-12-21 21:10:10 +01:00
Mcat12
2f65430a4d Move PHP scripts to scripts folder 2016-12-21 21:09:58 +01:00
DL6ER
e188cb6fbc Revert "Merge pull request #267 from pi-hole/folderStructure"
This reverts commit fba3d10fa4, reversing
changes made to 4ee75f4167.
2016-12-21 17:16:52 +01:00
DL6ER
42c9439d1e Merge branch 'devel' into folderStructure 2016-12-20 23:09:39 +01:00
Mcat12
30d70baf5e Fix php links in js files
Also removed help.js because it's no longer used
2016-12-19 19:59:08 -05:00