Commit Graph

787 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
c6d98a88e4 Tell if IPv6 has been enabled or not in success message 2017-01-03 14:29:20 +01:00
DL6ER
a04c89f12f Pass true/false to backend 2017-01-03 14:25:38 +01:00
DL6ER
645aab6571 Add option to disable IPv6 part of the DHCP server 2017-01-03 14:07:16 +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
DL6ER
9221d8a5e7 Avoid double " 2017-01-03 13:44:24 +01:00
DL6ER
ae9a2ad616 Fix responsive icon on Gecko engine (Firefox + derivatives) 2017-01-03 10:57:39 +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
be36de8f03 Merge pull request #317 from pi-hole/tweak/settings
Several minor tweaks for the Settings page
2017-01-02 17:23:12 +01:00
DL6ER
0e37bc89a9 Fix codacy 2017-01-02 17:18:54 +01:00
DL6ER
1438a9d71a Display which page will be shown when hitting Return + Logout always goes to the very same URL 2017-01-02 17:13:54 +01:00
DL6ER
8220c27a20 Try to detect it also on non-Unix platforms 2017-01-02 17:05:46 +01:00
DL6ER
fba19e66cf Rephrase explaination what the code is doing because it is doing more than we expected 2017-01-02 16:46:13 +01:00
DL6ER
06cc3ca550 Logout -> Go to Settings page instead of Main page (will show log in page again) 2017-01-02 16:33:27 +01:00
DL6ER
b41e4e0a0a Add infotext 2017-01-02 16:29:53 +01:00
DL6ER
6da6805c5c Fix three codacy issues 2017-01-02 16:17:37 +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
ffe40009f1 Add "Save and Update" button 2017-01-02 15:07:23 +01:00
DL6ER
4b3173b434 Merge branch 'devel' into customizeadlists 2017-01-02 14:43:38 +01:00
DL6ER
207be6ba6d Codacy fixes ( Strings must use doublequote. ) 2017-01-02 13:30:03 +01:00