Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-22 19:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,637 Commits 19 Branches 112 Tags
bd7be220b58399056f5725dc8ac6349557b51a8c
Commit Graph

53 Commits

Author SHA1 Message Date
DL6ER
e24c35a528 Merge branch 'devel' into wildcard_blacklisting 2017-01-11 18:26:10 +01:00
DL6ER
bd36baa18b Merge branch 'devel' into wildcard_blacklisting 2017-01-09 14:51:54 +01:00
donmahallem
f8dc8f0ccb Unused variable $tmp 
This variable is in its current form never used
 2017-01-08 22:26:11 +01: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
9db9eff3d8 Ensure that $auth is always set 2017-01-08 11:01:26 +01:00
DL6ER
3808f74d4d Change function check_domain() to validate multiple domains separated by spaces 2017-01-08 10:37:20 +01: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
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
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
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
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
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
ed01434506 Strg+Return -> Go immediately to Settings page 2017-01-02 13:24:48 +01:00
DL6ER
33d6f6da8f Exit TopLists loop early, but not too early 2017-01-02 11:29:30 +01:00
DL6ER
3cf00165ba Merge branch 'devel' into TopItems 2017-01-02 11:25:05 +01:00
DL6ER
2d72ae75b2 Some fixes to some warnings and errors 2017-01-02 11:23:57 +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
Adam Warner
57fcb3493e Merge pull request #304 from pi-hole/new/clickonmaingraph 
Clicking on main graph redirects to the Query Log page
 2017-01-01 20:10:34 +00:00
Promofaux
da39612a0b replace double spaces with single spaces before exploding line to array 2017-01-01 19:57:43 +00:00
DL6ER
01d0f474a3 Minor improvement of couting regexp 2016-12-31 21:11:36 +00:00
DL6ER
2998e0b03a Improved counting algorithm for blocked queries. Added couting of blocked DNS queries due to wildcard blocking 2016-12-31 21:10:02 +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
754fa117ec Detect if wildcard blocking entry on Blacklists page 2016-12-31 15:45:12 +00:00
DL6ER
8080afadac Make ADD, SUB and GET compatible with the wildcard blocking list 2016-12-31 15:36:47 +00:00
DL6ER
5cbfe6a5be Merge branch 'devel' into TopItems 2016-12-30 20:42:33 +00:00
DL6ER
01f31137a3 Merge branch 'devel' into new/clickonmaingraph 2016-12-30 20:37:44 +00:00
DL6ER
72246d47c9 Merge branch 'devel' into fix/status 2016-12-30 20:35:43 +00:00
DL6ER
d9c695dc4a Merge branch 'devel' into new/dhcpv6settings 2016-12-30 20:33:21 +00:00
Mcat12
ca9418a245 Merge branch 'devel' into restructureFolders 2016-12-30 14:44:26 -05:00
Promofaux
8240e2d23b merge devel 2016-12-29 19:59:09 +00:00
DL6ER
e5a9826078 Moved more private files out of the root directory 2016-12-21 21:10:21 +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