Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-23 12:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,777 Commits 19 Branches 112 Tags
c99f23c995a12e91fc28214b6ad291afb97f2815
Commit Graph

18 Commits

Author SHA1 Message Date
DL6ER
4f70973cbc EUPL license (#402) 
* Move whole project to EUPL, copy MIT license to scripts/vendor/ and style/vendor/

* Added header to main PHP files

* Modified scripts in scripts/pi-hole/php

* Added header to scripts/pi-hole/js files

* Added license header to our custom style script

* Slight reformulation
 2017-02-18 14:20:51 +01:00
DL6ER
e24c35a528 Merge branch 'devel' into wildcard_blacklisting 2017-01-11 18:26:10 +01:00
DL6ER
3c0c92e8b1 Hide "Whitelist" button on wildcard blocked entries (Query Log page) 2017-01-11 12:41:35 +01:00
DL6ER
bd36baa18b Merge branch 'devel' into wildcard_blacklisting 2017-01-09 14:51:54 +01:00
DL6ER
9eadc26d30 Add more detailed error output recently added to the lists page to the query log action buttons 2017-01-09 14:40:40 +01:00
DL6ER
6fd6af5d62 Prevent query log action buttons from line breaking 2017-01-08 14:32:36 +01:00
Mcat12
459027e962 Add semicolon 2017-01-06 18:47:41 -05:00
DL6ER
3c761b4b50 Clear processing label + remove table content 2017-01-06 18:15:08 +01:00
DL6ER
ea71b64e2c Add error callback to Query Log page 2017-01-06 18:09:05 +01:00
DL6ER
3c3f6ef916 Merge branch 'devel' into wildcard_blacklisting 
Conflicts:
	scripts/pi-hole/js/queries.js
 2017-01-02 16:04:58 +01:00
DL6ER
fd3022abb3 Fix check for white/blacklist action on Query Log 2016-12-31 18:11:31 +00:00
DL6ER
28bea42f88 Implemented wildcard blocking in Query Log 2016-12-31 17:21:50 +00:00
DL6ER
01f31137a3 Merge branch 'devel' into new/clickonmaingraph 2016-12-30 20:37:44 +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