Commit Graph

27 Commits

Author SHA1 Message Date
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 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 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
Promofaux da39612a0b replace double spaces with single spaces before exploding line to array 2017-01-01 19:57:43 +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 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
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 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
Promofaux d0553ef169 Organise folder structure a bit better... Seperates vendor packages from self-written scripts. 2016-12-21 21:09:45 +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
DL6ER 34a0a57447 Merge branch 'devel' into folderStructure 2016-12-20 12:52:37 +01:00
DL6ER bb2c2e2244 Moved more private files out of the root directory 2016-12-20 12:52:19 +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
Promofaux 6a13796d99 Organise folder structure a bit better... Seperates vendor packages from self-written scripts. 2016-12-19 18:30:16 +00:00