Commit Graph

21 Commits

Author SHA1 Message Date
DL6ER
13a73f5217 Move ampersand 2017-02-06 15:40:49 +01:00
DL6ER
3be0cb0de4 Codacy 2017-01-14 15:36:30 +01:00
DL6ER
a6b3bc1cb4 Add IE mode to PHP scripts 2017-01-14 15:29:23 +01:00
DL6ER
b7b7217fb0 Implemented filter functions 2017-01-14 14:02:18 +01:00
DL6ER
f9d353af83 codacy 2017-01-14 13:36:43 +01:00
DL6ER
1b211cbe5c IE test 2017-01-14 13:33:15 +01:00
DL6ER
3aa1ffe114 Merge branch 'devel' into fix/IEonceagain 2017-01-14 13:27:00 +01:00
Martin
019910c319 Update queryads.js 2017-01-14 00:34:18 +01:00
Martin
4cd19dfb60 Update queryads.js 2017-01-14 00:33:31 +01:00
Martin
bd7be220b5 Update queryads.js 2017-01-14 00:22:56 +01:00
DL6ER
5114e4cbd5 Reinsert newline at end of file 2017-01-13 15:43:03 +01:00
DL6ER
d597b52f49 Some more IE compatibility tricks 2017-01-13 15:39:28 +01:00
Martin
fed83cb49f Fix HTTPS
small edit
2017-01-12 11:25:36 +01:00
Martin
fd21d04bfb Fixed querying ads over HTTPS
changed http: to // to always use the correct protocol

Fixes #352
2017-01-12 11:07:49 +01: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
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