3591 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Dan Schaper	037989b8e4	Merge pull request #2271 from pi-hole/feature/installer_spacing ... Start changes to new code style for repository. Revise basic installer.sh spacing.	2018-07-14 19:55:13 -07:00
Dan Schaper	dbc82cfb6a	Merge pull request #2236 from pi-hole/new/regex-lists ... Use regex lists instead of wildcards for blocking	2018-07-14 06:10:44 -07:00
Mcat12	941a766aa3	Replace -wild and -regex with --wild and --regex ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-12 21:38:43 -04:00
Mcat12	72be7ad5f0	Don't count commented out regex lines ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-12 21:21:06 -04:00
Mcat12	b2a36f71a0	Fix wildcard description in pihole man page ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-12 21:17:32 -04:00
Adam Hill	6b17620389	Update .travis.yml	2018-07-12 10:24:01 -05:00
Adam Hill	b04195041a	Update README.md	2018-07-12 10:22:50 -05:00
Adam Hill	8ca4c66e3c	make smarter assertions rathe than largestring not in string ... Signed-off-by: Adam Hill <adam@diginc.us>	2018-07-12 00:03:25 -05:00
Adam Hill	449b7bf6e4	reduce the amount of strict not in checks ... Signed-off-by: Adam Hill <adam@diginc.us>	2018-07-11 23:25:16 -05:00
Adam Hill	88e4b6390c	Tox! ... Signed-off-by: Adam Hill <adam@diginc.us>	2018-07-11 23:24:28 -05:00
Dan Schaper	de92bd1884	Merge pull request #2268 from pi-hole/fix/add-back-conditional-forwarding ... Add back conditional forwarding to webpage.sh	2018-07-09 18:27:09 -07:00
Mcat12	1b276a74fe	Display all lines of a list, even if there is no newline at the end ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-08 16:03:16 -04:00
bcambl	fff31558a0	assert REMI repository is not installed for Fedora ... - fix whiptail mock comments to clarify continue vs cancel Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-07-08 14:02:31 -06:00
Mcat12	8084c4b2a3	Fix regex period substitution due to switching to bashism ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-08 15:56:15 -04:00
Mcat12	1ca852191f	Fix stickler complaints ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-08 15:50:05 -04:00
Mcat12	af5fc6547a	Fix echoing wrong domain when converting wildcard ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-08 15:47:18 -04:00
Mcat12	70f2b26c86	Escape periods in wildcard converted regex filters. ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-08 15:45:06 -04:00
Mcat12	cfd95dbe87	Fix incorrect variable usage ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-08 15:38:44 -04:00
Mcat12	c5bb404d6a	Emulate wildcard blacklisting via -wild and move regex to -regex ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-08 14:37:33 -04:00
bcambl	4c23964964	ensure images are build prior to running tests ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-07-07 18:43:11 -06:00
bcambl	e4a6dcd35c	update travis.yml to run tests in parallel ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-07-07 17:51:36 -06:00
bcambl	d4addd53ad	Add tests for Fedora/CentOS distro_check ... - test to ensure installer behavior with unsupported CentOS releases - test to ensure repository enablement - test to ensure PHP upgrade opt-in/opt-out behavior Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-07-07 17:44:05 -06:00
Mcat12	d21298c156	Add back conditional forwarding to webpage.sh ... This was accidentally removed in a previous PR. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-07 15:23:47 -04:00
Dan Schaper	9dba9fb366	Convert multiline echos to individual echo statements so they don't lead with different amounts of space. ... Signed-off-by: Dan Schaper <dan.schaper@pihole.net>	2018-07-06 21:29:20 -07:00
bcambl	09d40679c0	add test for unsupported distro checking ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-07-06 10:07:43 -06:00
Dan Schaper	a323b126e5	Finished space conversion ... Signed-off-by: Dan Schaper <dan.schaper@pihole.net>	2018-07-05 23:47:55 -07:00
bcambl	553aad6ed2	add Fedora container to test matrix ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-07-05 18:12:39 -06:00
bcambl	5ca2ad6148	move test globals & mock commands to conftest ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-07-05 18:10:43 -06:00
bcambl	40537e1522	python linting: missing whitespace after ',' (E231) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-07-03 00:43:24 -06:00
bcambl	064a75b21b	python linting: missing whitespace around operator (E225) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-07-03 00:43:18 -06:00
bcambl	1d3445bc0f	python linting: whitespace after '(' and before ')' (E201 & E202) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-07-03 00:43:09 -06:00
bcambl	79232d02c9	python linting: 'pytest' imported but unused (F401) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-07-03 00:30:00 -06:00
bcambl	9bd4986781	python linting: whitespace before ':' (E203) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-07-03 00:21:57 -06:00
bcambl	c3d443aaff	python linting: lines > 79 characters (E501) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-07-03 00:09:56 -06:00
WaLLy3K	b087888f94	Merge pull request #2261 from pi-hole/fix-no-protocol ... Treat adlists URLs without a protocol as HTTP	2018-07-03 09:58:29 +10:00
bcambl	da3dfd0998	python linting: missing whitespace after ':' (E231) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-07-02 15:25:51 -06:00
bcambl	4468d81472	python linting: 2 lines prior to defs (E302) ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	2018-07-02 14:54:19 -06:00
WaLLy3K	7ddae8f2eb	Treat URLs without a protocol as HTTP ... Signed off by WaLLy3K <wally3k@pi-hole.net>	2018-07-02 19:59:22 +10:00
Mark Drobnak	6b2851a671	Merge pull request #2257 from pi-hole/fix/query-process-wildcards ... Move processWildcards to query.sh	2018-06-30 22:18:46 -04:00
Mcat12	4763969c8f	Move processWildcards to query.sh ... Closes #2255 Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-30 22:03:53 -04:00
Mark Drobnak	f9b75e486c	Merge pull request #2256 from pi-hole/fix/query-lists-variable-substitution ... Fix incorrect variable string substitution	2018-06-30 15:56:22 -04:00
Mcat12	f868052062	Fix incorrect variable string substitution ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-30 15:50:43 -04:00
Mcat12	61f0cbe10a	Update pihole man page for regex ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-29 23:34:15 -04:00
Mcat12	0f4968d75c	Merge remote-tracking branch 'origin/development' into new/regex-lists	2018-06-29 23:12:34 -04:00
Mcat12	3077c22e4f	Change help strings from wildcard to regex blacklist ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-29 23:10:49 -04:00
Mcat12	0decc37b5a	Appease stickler ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-29 22:55:00 -04:00
Mcat12	4a953b66e0	Make removing regex domains work correctly ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-29 22:51:37 -04:00
Mcat12	8435eeed4d	Don't validate regex domains ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-28 23:31:50 -04:00
Mcat12	cffb4de83b	Use strict grep instead of regex for duplicates ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-28 23:01:27 -04:00
Mcat12	55175087c4	Set regex file permissions for web access ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-28 22:52:44 -04:00