pi-hole

Commit Graph

Author	SHA1	Message	Date
WaLLy3K	1ae403b742	Merge pull request #1667 from pi-hole/install-space Remove erroneous space	7 years ago
Mcat12	898fdf7a60	Merge pull request #1602 from molikuner/development Fix URL extension parsing	7 years ago
Adam Warner	5799485b0f	Merge branch 'development' into development	7 years ago
Adam Warner	0a9965292c	Additional check to fix any existing cases of "24h" in setupVars.conf automatically. Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	4fb66e632f	The other h	7 years ago
Adam Warner	5787895794	stop an extra `h` being added to leasetime of DHCP server. We already storethe `h` in `setupVars.conf` Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	d90489b31d	Include branch we're switching from Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	f38912a0c9	- Correctly overwrite ${INFO} boxes with ${CROSS} etc - Notify user that branch has been changed Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
WaLLy3K	fdf2649f2f	Clean up known remaining colour output issues (#1613 ) * Print newline on error message * Output last three lines of error if update fails * Consistent error messages & housekeeping * Add shellcheck directive to ignore COL_TABLE * Quoted and braced variables for codebase consistency * Escaped newlines correctly * Made error messages consistent (indenting and wording) * Removed consecutive echos * Conditional formatting consistency * Braced, quoted and used [[ on conditionals * Fix specific ShellCheck issues * Fixed issues that could be safely changed without extensive testing * Update SELinux whiptail behaviour & more * Colourised some strings * Fixed multiple line string indenting * Made output consistent with existing codebase * Removed sequential echos * Make SELinux whiptail use "--defaultno", and change text wording * Add help text for hostrecord, and colourise output * this should fix the tests... Signed-off-by: Adam Warner <adamw@rner.email> * revert changes to `update_package_cache()` to prove tests Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Mcat12	b09c660833	Always process DNS and DHCP settings in installer (#1630 ) * Always process DNS and DHCP settings in installer * Make sure dnsmasq config exists before modifying it Signed-off-by: Mcat12 <newtoncat12@yahoo.com> * Make sure the dnsmasq config directory exists Signed-off-by: Mcat12 <newtoncat12@yahoo.com> * Only remove the DHCP config if it exists (fixes tests, hopefully) Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	7 years ago
WaLLy3K	714fd93292	Provide correct FTL stats (#1619 ) * Provide correct FTL stats * Use the correct lines in the array when displaying FTL stats * Treat ads_blocked_today/dns_queries_today as currency, like domains_being_blocked is on large screens * Chronometer Shellcheck validation * Remove unnecessary \ from CPU usage readout	7 years ago
Adam Warner	0a062d26e6	Merge pull request #1611 from pi-hole/developmentNew Sort out Merge conflicts with master	7 years ago
Adam Warner	eb8333c772	Merge branch 'development' into developmentNew	7 years ago
Adam Warner	247d3ed729	list availible branches for FTL Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	031c6428d5	Merge branch 'tweak/checkout_FTL' of https://github.com/pi-hole/pi-hole into tweak/checkout_FTL Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # advanced/Scripts/piholeCheckout.sh	7 years ago
Adam Warner	f2e9d585f7	* Add helptext for `pihole checkout ftl` * Only attempt to install FTL if branch was found * ~~corebranches~~ webbranches (web branches now actually listed) Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
WaLLy3K	8af9853b9a	Fixed minor formatting issues * Removed useless echo * Quoted and braced conditionals * Explicit escaping of newline * Fixed arrays implicitly concatenating (SC2199) * Fixed incorrect variable used in checkout web	7 years ago
Adam Warner	783f50657b	Merge branch 'development' into tweak/checkout_FTL Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # advanced/Scripts/piholeCheckout.sh	7 years ago
WaLLy3K	3631d1349e	Prevent Web Admin from printing restartdns colour codes (#1575 ) * Prevent Web Admin from printing unnecessary msgs * Make DNS restart behaviour consistent	7 years ago
Adam Warner	7d56e2a937	`FTL` has an `L` in it, innit? Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Jacob Salmela	e1f818ffb7	Tweak/debug improvements (#1585 ) * check for CIDR notation when comparing IPv6 address to that found in setupVars.conf * highlight bad address entries in pihole.log and reference a corresponding FAQ * show header output if Pi-holes x-header does not match * fix automated mode when running from the dashboard. It would previously not automatically upload and generate a token. * show disclaimer message * undocumented feature for now: obfuscate domains in pihole.log so they are not visible when sent to the Pi-hole developers. We need to make an additonal flag for this in the pihole command. if the variable OBFUSCATE has a value, it will replace the domain in the log with a placeholder value * fix small typo in the disclaimer	7 years ago
Molikuner	9934f505a5	Fix URL extension parsing when there is a querystring Pi-hole sometimes parsed a wrong extension	7 years ago
Jacob Salmela	fb66fb12c5	put "no password will be set" on a newline.	7 years ago
Jacob Salmela	042dcf795c	fixes #1430	7 years ago
Jacob Salmela	cb65907e60	Merge branch 'development' of https://github.com/pi-hole/pi-hole into revamp/debug merge in development to avoid shellcheck from travis	7 years ago
DL6ER	bb8a263d70	ShellCheck	7 years ago
DL6ER	70fd94edb3	Edit message when requested branch of FTL is not available	7 years ago
WaLLy3K	1bebcef265	Make Chronometer usable on smaller screens (#1518 )	7 years ago
DL6ER	6ce79ae1d0	Fix git commands (#1577 )	7 years ago
Adam Warner	b3eb5c4f0e	Colour Tweaks (#1549 )	7 years ago
DL6ER	ec4e9780ed	Accept underscores when validating domain names (#1571 )	7 years ago
Jacob Salmela	05a724afae	codacy appeasement: remove useless cats	7 years ago
Jacob Salmela	1957b002bc	add comments about X-Headers and further explain the file descriptor cod.	7 years ago
Jacob Salmela	04cef25add	remove color character codes before uploading so the log is more readable on our plaintext tricorder server	7 years ago
DL6ER	98afb0e998	pihole checkout ftl	7 years ago
DL6ER	e9d81fc883	Backend additions for aufit log feature (#1399 )	7 years ago
Jacob Salmela	22fac5e1e0	additional shellcheck fixes	7 years ago
Jacob Salmela	b6a2a4ad5a	more shellcheck fixes	7 years ago
Jacob Salmela	5f00347019	appease shellcheck by removing two unneccesary functions and making some if/else blocks	7 years ago
Mcat12	009363a7bb	Merge pull request #1560 from pi-hole/fix/ad-domain-hostname Move local.list after the ad blocking lists	7 years ago
Mcat12	8dc94e014f	Merge branch 'development' into fix/invalid-ipv6-wildcard	7 years ago
Mcat12	78e7c8b8e9	Merge branch 'development' into fix/ad-domain-hostname	7 years ago
Dan Schaper	c29c4ceb0f	Integrate DL's update.sh fixes. `shellcheck -x` for following files. Do not test for included files SC1091 Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Mcat12	bc46694ea7	Move local.list after the ad blocking lists Fixes the bug found by [Reddit](https://www.reddit.com/r/pihole/comments/6j3az9/urls_in_my_blacklist_are_showing_up_as_my_default/)	7 years ago
Mcat12	cb09e0bc9a	Strip `/*` from the end of the IPv6 address Fixes #1536	7 years ago
Adam Warner	536585b846	Colourise Core Output Text (#1471 ) * Define colours within COL_TABLE * Do not output colours for non-terminal instances * Removed ":::" * Fixed indenting & spacing * Made output consistent throughout project * Reworded text to fit on standard 80 char wide Terminal screen * Made 'sudo raspi-config' warning (insufficient disk space) only show on RPi * Make "Installation/Update Complete" the final msg * Remove redundant messages * Simplify update available message * Confirm user would like to begin uninstall * If "git pull" string says "Already up-to-date.", place [i] before it * Colour Temp/Interface output * Made `pihole disable 5z` invalid * Added error fallback if invalid argument (not s/m) is detected * Quoted "$2" for consistency * Updated help text * L185/286: Replaced echo with redirect * User agents for adblock.mahakala.is/adaway.org unnecessary * Print newline on confirmation of repository reset * Add output to admin-related dnsmasq restarts * Return error message for "pihole -q" * Imply default checkout behaviour with y/N * Fix uninstall failing to remove pihole user * Print checkout 'git remote show origin' STDERR on new line * Replaced checkout "AdminLTE" wording with "Web Admin"	7 years ago
DL6ER	0283a1ab74	Introduce new file black.list for blacklist content	7 years ago
DL6ER	54a88ab5ab	Change ownership of /etc/pihole to user/group pihole. Fixes #1529 (#1530 )	7 years ago
WaLLy3K	aff5ff08d5	Trim version output when update is successful (#1527 )	7 years ago
Jacob Salmela	fc0440546f	add functions to parse head and tails of gravity.list and pihole.log	7 years ago

1 2 3 4 5 ...

819 Commits (817d6447952e165659a8d92dd15d9aadae3e5330)