17 Commits

Author	SHA1	Message	Date
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	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	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
Mcat12	d1da1de597	Move PHP scripts to scripts folder	2016-12-19 19:44:51 -05:00