Commit Graph

26 Commits

Author SHA1 Message Date
Mcat12 7a5c8e899e Use button to remove lists 2017-03-31 20:16:58 -04:00
Mcat12 86d8869867 Handle deletion of list in savesettings.php 2017-03-31 18:42:00 -04:00
Adam Warner c11172d7c4 modify to work with changes in pihole#1365 2017-03-31 21:05:53 +01:00
DL6ER ffe40009f1 Add "Save and Update" button 2017-01-02 15:07:23 +01:00
DL6ER 4b3173b434 Merge branch 'devel' into customizeadlists 2017-01-02 14:43:38 +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 5735a5b9a2 Merge branch 'devel' into customizeadlists 2016-12-30 20:43:07 +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