Commit Graph

20 Commits

Author SHA1 Message Date
DL6ER c409cf20bf Hide h3 headings if list is empty 2016-12-31 16:35:16 +00:00
DL6ER a33301911a Made everything working 2016-12-31 16:24:10 +00:00
DL6ER 05f2df720e Put wildcard blocking entries into their own table 2016-12-31 16:06:21 +00:00
DL6ER 754fa117ec Detect if wildcard blocking entry on Blacklists page 2016-12-31 15:45:12 +00:00
DL6ER 8080afadac Make ADD, SUB and GET compatible with the wildcard blocking list 2016-12-31 15:36:47 +00:00
DL6ER 72246d47c9 Merge branch 'devel' into fix/status 2016-12-30 20:35:43 +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