Mcat12
|
7014b5a150
|
Reverted password for web interface
Work will continue in the secure-web-interface branch
|
2016-03-29 17:45:00 -04:00 |
|
Mcat12
|
724075e448
|
Merge pull request #413 from pi-hole/fix-template-team-link
fix template team link
|
2016-03-28 23:03:32 -04:00 |
|
Mcat12
|
45cb9a2e80
|
fix template team link
|
2016-03-28 22:51:54 -04:00 |
|
Promofaux
|
26b7e7ec8e
|
Merge lighttpd JS changes into development
|
2016-03-24 23:21:11 +00:00 |
|
Promofaux
|
bc09760c84
|
Grab changes by @rosskevin. (#386 - lighttpd changes to handle JS files)
|
2016-03-24 23:19:44 +00:00 |
|
Promofaux
|
ceb229c6ac
|
Merge branch 'master' into development
|
2016-03-24 23:18:40 +00:00 |
|
Promofaux
|
1e6ac33ef1
|
Fix merge conflicts
|
2016-03-24 23:18:14 +00:00 |
|
Jacob Salmela
|
396c7ab9ee
|
link to tekthing mention
tekthing mentioned us again as one of 5 easy projects for the Raspberry Pi.
|
2016-03-22 21:21:08 -05:00 |
|
Jacob Salmela
|
fa2cef6395
|
link to get LED alerts article
added a link to a cool project that makes an LED blink for each ad that gets blocked.
|
2016-03-21 08:29:19 -05:00 |
|
Adam Warner
|
02bb5b6742
|
Revert previous change
Reopens #384
|
2016-03-20 20:50:31 +00:00 |
|
Adam Warner
|
fad5fafa32
|
Increase disk space to verify...
.. was missing a couple of zeros, and not verifying enough space!
Fixes #384
|
2016-03-20 13:26:02 +00:00 |
|
Mcat12
|
babca8d47b
|
Merge pull request #389 from pi-hole/feature/httpsPull
Secure Pulls now with HTTPS
|
2016-03-16 08:19:39 -04:00 |
|
Dan Schaper
|
eb462955fe
|
Secure Pulls now with HTTPS
Closes #310
|
2016-03-16 05:06:03 -07:00 |
|
Kevin Ross
|
b79db36336
|
no need for the X- header prefix in the string
|
2016-03-14 22:59:38 -05:00 |
|
Kevin Ross
|
404ea0ce6d
|
copy both the html and js stubs during install
|
2016-03-14 22:54:45 -05:00 |
|
Kevin Ross
|
d3971b26e4
|
add a valid js stub
|
2016-03-14 22:52:02 -05:00 |
|
Kevin Ross
|
a44a201f00
|
rewrite js files to a valid stub
|
2016-03-14 22:51:16 -05:00 |
|
Mcat12
|
1d80fdddd4
|
Merge pull request #372 from Morlok8k/development
fix for older versions of uptime, on development branch.
|
2016-03-11 15:51:18 -05:00 |
|
Mcat12
|
f09745b4ad
|
Update README.md
|
2016-03-08 16:28:45 -05:00 |
|
Morlok8k
|
d13ae0610e
|
fix for older versions of uptime, on development branch.
|
2016-03-08 10:19:01 -08:00 |
|
Dan Schaper
|
3eaa447323
|
Merge pull request #369 from jpsingleton/development
Optionally block the BBC Breaking News banner
|
2016-03-08 00:28:18 -08:00 |
|
Mcat12
|
604506da10
|
Merge pull request #370 from stejoo/development
Fix URL for Windows 10 Telemetry list.
|
2016-03-07 18:31:56 -05:00 |
|
Stefan Joosten
|
122ce11381
|
Fix URL for Windows 10 Telemetry list.
|
2016-03-08 00:23:39 +01:00 |
|
James Singleton
|
8cbd9f7f08
|
Optionally block the BBC Breaking News banner
|
2016-03-07 13:31:50 +00:00 |
|
Dan Schaper
|
7c41e5bafc
|
Merge pull request #367 from yoosi/fix-trailling-whitespace
Fix trailing whitespace
|
2016-03-05 23:17:31 -08:00 |
|
Carter Maxwell
|
4452f784a8
|
remove trailing whitespace basic-install.sh
|
2016-03-05 21:16:23 -08:00 |
|
Carter Maxwell
|
ced0ae0d65
|
remove trailing whitespace whitelist.sh
|
2016-03-05 21:15:53 -08:00 |
|
Carter Maxwell
|
876c51302a
|
remove trailing whitespace updateDashboard.sh
|
2016-03-05 21:15:36 -08:00 |
|
Carter Maxwell
|
a6877e7c13
|
remove trailing whitespace chronometer.sh
|
2016-03-05 21:15:11 -08:00 |
|
Carter Maxwell
|
f633d1fa5b
|
remove trailing whitespace blacklist.sh
|
2016-03-05 21:14:56 -08:00 |
|
Carter Maxwell
|
4f90b41343
|
remove trailing whitespace dnsmasq.conf.original
|
2016-03-05 21:14:17 -08:00 |
|
Carter Maxwell
|
e4ddf8bc33
|
remove trailing whitespace gravity.sh
|
2016-03-05 21:13:43 -08:00 |
|
Carter Maxwell
|
613ab9febc
|
remove trailing whitespace adlists.default
|
2016-03-05 21:13:23 -08:00 |
|
Carter Maxwell
|
e92cceecc1
|
remove trailing whitespace README.md
|
2016-03-05 21:12:58 -08:00 |
|
Jacob Salmela
|
3283f3ed7d
|
Show off our pretty dashboard
|
2016-03-04 12:07:29 -06:00 |
|
Jacob Salmela
|
0ed30b802d
|
adafruit blog mention
|
2016-03-04 11:52:19 -06:00 |
|
Dan Schaper
|
beefff8cce
|
Merge pull request #362 from pi-hole/Social-README
Add social addresses
|
2016-03-04 04:41:54 -08:00 |
|
Dan Schaper
|
b1554d6a89
|
Add links
|
2016-03-04 04:38:31 -08:00 |
|
Mcat12
|
4230b03884
|
Update README.md
|
2016-03-04 07:34:17 -05:00 |
|
Dan Schaper
|
2182b8339e
|
Add social addresses
|
2016-03-04 04:22:54 -08:00 |
|
Mcat12
|
b07b77c58f
|
Update README.md
|
2016-02-29 20:09:49 -05:00 |
|
Mcat12
|
6542407fa3
|
Merge pull request #344 from ChadBHowell/CBH-Update_README.md
Update README.md
|
2016-02-29 20:08:57 -05:00 |
|
Mcat12
|
ebf995536b
|
Merge pull request #354 from pi-hole/protectTheLists
Protect the lists
|
2016-02-29 20:07:20 -05:00 |
|
Mcat12
|
adcd7f10ee
|
Fixed password input
|
2016-02-28 15:24:38 -05:00 |
|
Mcat12
|
af83936047
|
Added password to install
Saves in password.txt
|
2016-02-28 15:18:48 -05:00 |
|
Chad Howell
|
c3b5b97a41
|
Update README.md
Changed wording per @PromoFaux recommendations.
|
2016-02-25 19:42:43 -05:00 |
|
Mcat12
|
6c58ea18dc
|
Update README.md
|
2016-02-24 12:02:18 -05:00 |
|
Chad Howell
|
830b287e5d
|
Update README.md
Add NTC CHIP and Debian based distros
|
2016-02-23 00:08:50 -05:00 |
|
Adam Warner
|
52549d51ab
|
Update adlists.default
Add extra warning regarding mahakala.is list. See comment by @leichterleben in #341
|
2016-02-22 09:24:17 +00:00 |
|
Adam Warner
|
fe05ed13e5
|
Merge pull request #314 from pi-hole/development
Pi-hole v2.5.3
|
2016-02-21 21:04:16 +00:00 |
|