Commit Graph

1543 Commits

Author SHA1 Message Date
DL6ER
b41e4e0a0a Add infotext 2017-01-02 16:29:53 +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
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
Mcat12
54a233f41e Merge pull request #314 from pi-hole/fixSingleDigitNumbersInLogFileDates
replace double spaces with single spaces before exploding line to array
2017-01-01 15:02:35 -05:00
Promofaux
da39612a0b replace double spaces with single spaces before exploding line to array 2017-01-01 19:57:43 +00:00
Adam Warner
26d5773756 Merge pull request #313 from JdenHartog/patch-2
Minor typo in help.php
2017-01-01 14:59:23 +00:00
J den Hartog
41bb9258b9 Minor typo in help.php
By submitting this pull request, I confirm the following (please check boxes, eg [X] - no spaces) Failure to fill the template will close your PR:

Please submit all pull requests against the development branch. Failure to do so will delay or deny your request

[X] I have read and understood the contributors guide.
[X] I have checked that another pull request for this purpose does not exist.
[X] I have considered, and confirmed that this submission will be valuable to others.
[X] I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
[X] I give this submission freely, and claim no ownership to its content.
How familiar are you with the codebase?:
2

Fixed minor typo in help.php text.

This template was created based on the work of udemy-dl.
2017-01-01 11:26:26 +01:00
Mcat12
295c71ad2c Merge pull request #307 from pi-hole/fix/status
Add display for new "-1" status
2016-12-30 15:53:34 -05: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
72fcf549cd Merge pull request #276 from pi-hole/restructureFolders
Restructure folders
2016-12-30 15:26:23 -05:00
Mcat12
4cffd16aae Update tail log and query ads 2016-12-30 15:00:06 -05:00
Mcat12
ca9418a245 Merge branch 'devel' into restructureFolders 2016-12-30 14:44:26 -05:00
Mcat12
4c074cf8b9 Merge pull request #311 from pi-hole/new/allowwhitelistwithpassword
Allow whitelisting when correct passwort is given via POST
2016-12-30 12:53:19 -05:00
Mcat12
7c322cc542 Don't limit list verification to only whitelist 2016-12-30 12:48:25 -05:00
Mcat12
5e0bef54c4 Fix parameter check 2016-12-30 12:44:33 -05:00
Mcat12
da1ea9c2f2 Tabs to spaces 2016-12-30 11:54:38 -05:00
Mcat12
5ab9f75e45 Condense list verification and use in both add and sub 2016-12-30 11:49:39 -05:00
DL6ER
ea817bf508 Fix behavior on medium sized screens 2016-12-30 16:29:05 +00:00
DL6ER
769525342b Add fallback kill option 2016-12-30 11:52:48 +00:00
DL6ER
739127b152 Added missing <br/> 2016-12-30 10:30:40 +00:00
Mcat12
1e2bb69efa Restructure variable check 2016-12-29 20:34:00 -05:00
Mcat12
aabbc51e67 Fix variable check 2016-12-29 20:29:44 -05:00
Mcat12
3fbd96e399 Change wording of error msg with no set password 2016-12-29 18:55:34 -05:00
DL6ER
8e691b65da Changing strings and omiting MAC address entirely 2016-12-29 23:40:48 +00:00
DL6ER
d6f150c123 Making it a bit nicer on small screens 2016-12-29 23:39:36 +00:00
DL6ER
65da042c27 Pleasing codacy 2016-12-29 23:34:35 +00:00
DL6ER
f0d175255a Use Bootstrap tooltips for further information 2016-12-29 23:33:49 +00:00
DL6ER
9185d11b02 Allow whitelisting when correct passwort is given via POST 2016-12-29 22:51:54 +00:00
Promofaux
8240e2d23b merge devel 2016-12-29 19:59:09 +00:00
DL6ER
4e9f39dda4 Put lease time in hover text 2016-12-29 18:58:25 +00:00
DL6ER
4137c0ff3d Pleasing codacy 2016-12-29 18:53:22 +00:00
DL6ER
cf2e3ddac0 Force redraw on expand necessary with scrolling enabled... 2016-12-29 18:50:21 +00:00
DL6ER
8006d9555e Show MAC address when hovering over table row + enable scrolling for table (no pagination) 2016-12-29 18:40:20 +00:00
DL6ER
9c34853daa Fix labels 2016-12-29 18:30:22 +00:00
DL6ER
fb576acf19 Allow horizontal scrolling for the DHCP leases table 2016-12-29 17:59:36 +00:00
DL6ER
b030690aaf Generate a better human readable output for the remaining lease time 2016-12-29 14:55:02 +00:00
DL6ER
96dcccffd6 Making codacy happy 2016-12-29 14:50:12 +00:00
DL6ER
c6a37b46cf Also handle infinite 2016-12-29 14:47:12 +00:00
DL6ER
9ea0158591 Interpret lease time and show in table 2016-12-29 14:46:21 +00:00
DL6ER
bd77160550 Send DHCP lease time to backend 2016-12-29 14:12:47 +00:00
DL6ER
9eadb9b325 Finished implementation of DHCP lease time settings on Setting page 2016-12-29 12:34:43 +00:00
DL6ER
7ddf94e41b Add filter that lease time can only be numbers 2016-12-29 12:29:40 +00:00
DL6ER
19f0d6b110 Put DHCP leases in dropdown 2016-12-29 12:22:05 +00:00
DL6ER
d54118717f Added "Advenaces DHCP settings" dropdown menu 2016-12-29 12:17:59 +00:00
Mcat12
a5f0665385 Merge pull request #308 from pi-hole/new/modifyphplimits
Add ini file to modify PHP settings for web UI
2016-12-28 14:33:42 -05:00
Mcat12
8d8787f343 Merge pull request #306 from pi-hole/fix/APImaingraphwithzeroAds
Fix output of API for overTimeData if there are 0 blocked queries
2016-12-28 13:54:49 -05:00