Adam Warner 0a062d26e6 Merge pull request #1611 from pi-hole/developmentNew ...

Sort out Merge conflicts with master

2017-07-17 14:49:55 +01:00

..

bash-completion

Pi-hole checkout feature

2017-03-08 13:16:40 +01:00

GIFs

Multiple gif files to choose from

2015-06-06 23:29:54 -05:00

Scripts

Merge pull request #1611 from pi-hole/developmentNew

2017-07-17 14:49:55 +01:00

01-pihole.conf

Move local.list after the ad blocking lists

2017-06-25 12:18:09 -04:00

blockingpage.css

Add whitelisting on blocking page feature

2016-12-30 12:03:45 +00:00

cmdline.txt

consoleblank=0

2016-02-20 01:15:14 -06:00

console-setup

file to set lcd font size

2016-01-23 11:48:12 -06:00

dnsmasq.conf.original

remove trailing whitespace dnsmasq.conf.original

2016-03-05 21:14:17 -08:00

index.js

no need for the X- header prefix in the string

2016-03-14 22:59:38 -05:00

index.php

whitelist on website blocked doesnt work (#1452)

2017-05-12 22:29:07 +02:00

lighttpd.conf.debian

update license to EUPL on core files

2017-02-22 11:55:20 -06:00

lighttpd.conf.fedora

update license to EUPL on core files

2017-02-22 11:55:20 -06:00

logrotate

Add weekly logrotation of FTL's log (#1509)

2017-06-03 14:51:35 +02:00

pihole-FTL.service

Change ownership of /etc/pihole to user/group pihole. Fixes #1529 (#1530)

2017-06-17 08:43:05 +02:00

pihole.cron

Add "quiet" mode + update comments in the cron file

2017-05-17 12:54:43 +02:00

pihole.sudo

update license to EUPL on core files

2017-02-22 11:55:20 -06:00