4435 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Schaper	e4b2d29552	Merge pull request #3548 from pi-hole/tweak/supportedos.txt ... add one	2020-07-15 14:14:32 -07:00
Adam Warner	b4ca13b3ad	add one ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-07-15 22:03:07 +01:00
Adam Warner	b9b7d5f8eb	Merge pull request #3547 from pi-hole/fix/debug20.04 ... fallback to NC if curl fails on uploadgit checkout	2020-07-15 22:01:36 +01:00
Adam Warner	849139176e	fallback to NC if curl fails on uploadgit checkout ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-07-15 21:54:45 +01:00
Adam Warner	ae0d1de188	Merge pull request #3545 from pi-hole/tweak/debugoutput ... Add additional information about local debug log location	2020-07-15 21:25:59 +01:00
Adam Warner	b8bba7951f	Just one more newline, give it to me. ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-07-15 20:49:18 +01:00
Adam Warner	76ce5ec66b	Add additional information about local debug log location ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-07-15 20:45:02 +01:00
Adam Warner	7b41b99549	Merge pull request #2887 from tlk/fix/reenable ... Prevent "pihole disable $timeout" from messing up future state changes	2020-07-15 20:23:33 +01:00
DL6ER	0cc999ea1f	Merge pull request #3543 from pi-hole/tweak/readme ... Update README.md	2020-07-14 05:36:12 +02:00
Dan Schaper	a99eac9d10	Update README.md ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2020-07-13 14:29:45 -07:00
Adam Warner	6ff0926f4a	Merge pull request #3532 from pi-hole/XhmikosR-patch-1 ... Fix minor typo	2020-07-05 13:36:41 +01:00
XhmikosR	d8822b70cf	Fix minor typo ... Signed-off-by: XhmikosR <xhmikosr@gmail.com>	2020-07-05 15:12:02 +03:00
Adam Warner	f50d59fe94	Merge pull request #3425 from XhmikosR/lighttpd ... Tweak lighttpd configs	2020-07-02 10:53:56 +01:00
XhmikosR	cf1c1e2e7e	Tweak lighttpd configs ... * Compress more types * Add charset=utf-8 in more text types * Use proper media types * Add default expire header * Use consistent indentation Signed-off-by: XhmikosR <xhmikosr@gmail.com>	2020-07-02 12:28:26 +03:00
Adam Warner	f5a5f68a1a	Merge pull request #3403 from XhmikosR/XhmikosR-patch-1 ... Fix/tweak blocking page	2020-07-02 10:27:16 +01:00
Dan Schaper	56e0549c7a	Merge pull request #3420 from XhmikosR/XhmikosR-patch-4 ... Markdown tweaks	2020-06-30 13:20:29 -07:00
Adam Warner	49f099e382	Merge pull request #3510 from pi-hole/fix/ip_validation_setdns ... Also validate IPV6 in the `setdns` function	2020-06-25 17:58:55 +01:00
Adam Warner	3205606fc3	Also validate IPV6 in the setdns function ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-06-23 20:38:18 +01:00
Dan Schaper	3aaf9d89b3	Merge pull request #3260 from pi-hole/new/rev-server ... Improve conditional forwarding	2020-06-21 13:26:07 -07:00
DL6ER	2c3aa9ab00	Merge pull request #3491 from pi-hole/fix_ip_address_section ... Fix fresh install on dev branch not working	2020-06-21 21:58:36 +02:00
DL6ER	bf392d7a60	Merge pull request #3489 from pi-hole/ip_validation ... Improve IP validation function	2020-06-21 21:56:30 +02:00
DL6ER	9bf0f2a161	Reduce handholding when trying to foresee the intentions of the user. The code does now preserve legacy behavior and users can open up the subnet manually if they like. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-06-21 21:47:30 +02:00
Adam Warner	bbfbf67fcf	further simplify the function, per @dl6er's suggestion ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-06-15 22:52:24 +01:00
Adam Warner	fe30ce10d3	simpler regex suggested by @MichaIng ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-06-15 21:21:40 +01:00
Dan Schaper	3136d239df	Merge pull request #3492 from pi-hole/fix/man-restartdns ... Improve man pihole restartdns section	2020-06-15 10:05:05 -07:00
DL6ER	c9350fa76d	Improve man pihole restartdns section. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-06-14 21:59:20 +02:00
Adam Warner	b96ce13085	Merge pull request #3490 from pi-hole/fix_os_check ... Fix new os_check	2020-06-14 00:24:33 +01:00
Adam Warner	7ea6d7b92b	remove ; so IFS changes don't stick ... Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net> Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-06-14 00:17:51 +01:00
Adam Warner	011fa8c6ea	fix sticklr complaint ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-06-13 21:47:00 +01:00
Adam Warner	1ebf0785b6	move dnsutils/bind-utils to installed deps and only check OS is supported after installing installer deps ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-06-13 21:33:03 +01:00
Adam Warner	0320d85028	Additionally source the install script in webpage.sh to validate IP entered on pihole -a setdns ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-06-13 20:57:57 +01:00
Adam Warner	95f4c632f7	expand valid_ip to allow for custom ports ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-06-13 20:30:03 +01:00
Dan Schaper	4b59287683	Merge pull request #3441 from pi-hole/new/os_check ... Display warning if unsupported OS is detected	2020-06-05 13:39:39 -07:00
Dan Schaper	5f9dac8d2b	Merge pull request #3434 from pi-hole/new/os_detect ... Change OS Detection in debug script	2020-06-05 13:38:50 -07:00
Adam Warner	9844a3288f	Same change as 03a8cff ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-06-05 21:06:25 +01:00
Adam Warner	03a8cff55e	read > mapfile as suggested by @dschaper ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-06-05 21:01:53 +01:00
Dan Schaper	c9dd3ee2e9	Merge pull request #3470 from pi-hole/fix/escape_where_should_be_none ... Replace possible "\#" by "#" to fix AdminLTE#1427	2020-06-05 12:25:53 -07:00
XhmikosR	52cb389d94	Markdown tweaks ... Signed-off-by: XhmikosR <xhmikosr@gmail.com>	2020-06-04 16:19:21 +03:00
DL6ER	2b1bc6a46e	Replace possible "\#" by "#". This fixes AdminLTE#1427 ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-06-04 09:32:40 +02:00
DL6ER	6160eb6894	This regex is too complex for bash's own replacement. Add ignore for the shellcheck rule. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-06-04 09:22:40 +02:00
DL6ER	318ca75269	Merge branch 'development' into new/rev-server	2020-06-04 08:56:08 +02:00
Adam Warner	13a49b0753	Merge pull request #3466 from pi-hole/tweak/improve_unique_domains ... Allow certain domain duplicates	2020-06-03 21:41:20 +01:00
Adam Warner	58724a38a9	Improve detection and display of supported/unsupported OS in debug script ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-06-03 17:57:22 +01:00
Adam Warner	8fef35be0f	Update README.md ... remove dead link to gitter	2020-06-03 16:11:09 +01:00
DL6ER	202ba055ea	Change UNIQUEness constraint from (domain) to (domain, type) in the domainlist table. This will allow duplicates which can be associated to different groups. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-06-02 10:49:35 +02:00
Adam Warner	5488fb0caf	Merge pull request #3463 from jesterchen/patch-1 ... Patch 1	2020-06-01 11:29:17 +01:00
jesterchen	0a47140239	Merge branch 'patch-1' of github.com:jesterchen/pi-hole into patch-1	2020-06-01 12:06:38 +02:00
jesterchen	7248d1a504	Ensure that adlistFile is created before chmodding ... If an user installs Pi-hole without selecting any adlists, the installer emits a warning and exits. By touching the file this is prevented. Signed-off-by: jesterchen <github@jesterweb.de>	2020-06-01 12:06:02 +02:00
jesterchen	7934a9bcb4	Ensure that adlistFile is created before chmodding ... If an user installs Pi-hole without selecting any adlists, the installer emits a warning and exits. By touching the file this is prevented.	2020-06-01 12:00:29 +02:00
XhmikosR	d90313fe4d	Fix/tweak blocking page ... * fix favicon * add meta charset * add html lang * add a page title * remove unneeded html end tags * fix viewport tag to allow zooming * compress the "blocked by Pi-hole" SVG * remove trailing spaces * switch to double colon pseudo elements (works from IE9 and newer) * add missing vendor prefixes * other minor tweaks * add `Access-Control-Allow-Origin` header to all font types Signed-off-by: XhmikosR <xhmikosr@gmail.com>	2020-05-31 15:54:11 +03:00