Mcat12
ec361313f9
Merge pull request #320 from pi-hole/tweak/makecommentpretty
...
Rephrase explanation what the code is doing because it is doing more than we expected
2017-01-02 10:51:23 -05: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
Mcat12
76d7329cec
Merge pull request #319 from pi-hole/codacy
...
Fix three codacy issues
2017-01-02 10:23:49 -05:00
DL6ER
6da6805c5c
Fix three codacy issues
2017-01-02 16:17:37 +01:00
DL6ER
32464ab976
Merge pull request #297 from pi-hole/TopItems
...
Rewrite Top Items computation
2017-01-02 16:01:07 +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
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
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
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
Mcat12
DL6ER
DL6ER
Adam Warner
Promofaux
J den Hartog