563 Commits (8ab5ffd8760dbfbb0088fc56a8868b517ac9ccfe)

Author	SHA1	Message	Date
WaLLy3K	aff5ff08d5	Trim version output when update is successful (#1527)	7 years ago
DL6ER	f1146a3443	Don't update FTL when there is a core update (as this will update FTL a second time). Fixes #1516	7 years ago
DL6ER	2516a1e298	Make clear that NO is the default if the user just hits return (#1514)	7 years ago
WaLLy3K	10139241f5	Fix output IPv4 addr when removing CIDR notation (#1498)	7 years ago
WaLLy3K	4ad0cdf5d4	Rewrite Chronometer to output more stats	7 years ago
WaLLy3K	f6732a484e	Merge pull request #1317 from r0ckarong/development ... Fixed handling of `pihole -wild` help text	7 years ago
DL6ER	42eb811910	Add "quiet" mode + update comments in the cron file	7 years ago
DL6ER	c9042ffedd	Print echos only when manual flushing is requested	7 years ago
DL6ER	4e2c6a7b8e	Fix logrotation: manual flushing should be done twice, but automated rotation at midnight should only be done *once*!	7 years ago
WaLLy3K	7453bf2ee6	Fix wildcard help text ... * -wild is not a valid option since we're already using -wild	7 years ago
WaLLy3K	7d17c652f3	Merge branch 'development' into development	7 years ago
Adam Warner	90119c75d5	more merge conflicts!	7 years ago
WaLLy3K	30035ce1c2	Merge branch 'development' into tweak/help-output	7 years ago
WaLLy3K	3bd677c102	Show help for "pihole -v -h" ... * Indent output text * Minor help text change	7 years ago
WaLLy3K	0e4473685b	Show help for "pihole -a -i --help"	7 years ago
WaLLy3K	b721ed49ab	Update Help Output (#1467) ... * File consistency * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Standardise core help text * Added help text for disable command * Added help text for logging command * Clean up * Fixed certain new lines and spaces * Sync with development branch * Formatting consistency * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Fixed certain newlines and spaces * Admin help text * Added help text for interface command * Sync with development branch * Formatting consistency * Tabs to 2 spaces * Fixed some wording * Fixed certain spaces * Formatting consistency * Minor wording changes * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Fixed certain newlines and spaces * Blacklist help text * Formatting consistency * Tabs to 2 spaces * Corrected indenting * Cronometer help text * Formatting consistency * Fixed certain newlines and spaces * Corrected indenting * Checkout warning alteration * Add checkout help text * Corrected help output	7 years ago
Dan Schaper	25601b9fcc	Document `sed` substitution for user readability ... Comment the oneliner with explanations of what each step does.	7 years ago
Adam Hill	55f78e3b64	Update list.sh ... I believe this has feature parity with `sed /foo/ Id` but also supports busybox, and my alpine docker ;)	7 years ago
Hans Geiblinger	b166410cbf	Solve piholeLogFlush.sh having to be issued 2 x to clear logs (#1460) ... Simplified the command -v syntax, and added a sleep 3 timer to the first execution of the log rotation. The second execution was being issued while the first was still running, thus it would fail and you would have to issue the "Flush Logs" command a second time.	7 years ago
Dan Schaper	5bb91759b4	Merge pull request #1459 from WaLLy3K/patch-2 ... Provide remote hashes for version.sh	7 years ago
Dan Schaper	80c4b7c9bb	Merge pull request #1455 from pi-hole/tweak/logecho_gateway ... Debug: Log and echo gateway responses	7 years ago
WaLLy3K	ea0a9ceb37	Provide remote hashes for version.sh ... * Provide remote hashes for comparison * Use double braces for all conditions (for consistency) * Suppress potential "cd" error output * Provide "not applicable" output upon any hash request for FTL	7 years ago
Dan Schaper	501b26decd	Log and echo gateway responses	7 years ago
WaLLy3K	c6596f2c54	Modified syntax to be valid for Shellcheck	7 years ago
WaLLy3K	2863308090	Minimise string duplication & other minor changes ... Instead of duplicating output strings, rewrite core/web/ftlOutput() into one neat versionOutput().	7 years ago
WaLLy3K	7fef1fdc83	Fixed indentation	7 years ago
WaLLy3K	fe0a35cc7a	Update -h to work as --hash ... Also provide error output as per https://github.com/pi-hole/pi-hole/pull/1447#issuecomment-300600093	7 years ago
WaLLy3K	03201e2f20	Display FTL version & version.sh rewrite ... While testing to make sure `pihole -v` would output `pihole-FTL version`, I noticed some options didn't work how I expected them to. For example, if I use `pihole -v -p`, I would expect to see the version output of Pi-hole Core. Instead, I'm informed that it's an invalid option. I've had the following things in mind while rewriting this: * I'm operating under the assumption that FTL is only installed if the Admin Console is (Line 113 exit 0) * I have modified the help text to only output with `pihole -v --help` * I have modified all output to be more similar to the output style of `grep` and `curl` (Ditching ":::") Testing output: ``` w3k@MCT:~$ pihole -v Pi-hole version is v3.0.1-14-ga928cd3 (Latest: v3.0.1) Admin Console version is v3.0-9-g3760482 (Latest: v3.0.1) FTL version is v2.6.2 (Latest: v2.6.2) w3k@MCT:~$ pihole -v -c Current Pi-hole version is v3.0.1-14-ga928cd3 Current Admin Console version is v3.0-9-g3760482 Current FTL version is v2.6.2 w3k@MCT:~$ pihole -v -l Latest Pi-hole version is v3.0.1 Latest Admin Console version is v3.0.1 Latest FTL version is v2.6.2 w3k@MCT:~$ pihole -v -p --hash Current Pi-hole hash is a928cd3 w3k@MCT:~$ pihole -v -a --hash Current Admin Console hash is 3760482 w3k@MCT:~$ pihole -v --help Usage: pihole -v [REPO | OPTION] [OPTION] Show Pi-hole, Web Admin & FTL versions <Shows all Repositories and Options> w3k@MCT:~$ pihole -v -foo Invalid Option! ```	7 years ago
Adam Warner	9beb9fd941	Merge pull request #1384 from pi-hole/checkoutImprovements ... Stash changes when switching branches	7 years ago
DL6ER	9cc392fa02	Update Marks PR after the Promo code has been merged	7 years ago
Adam Warner	9c136a5579	functionise Hashing	7 years ago
DL6ER	30dcf6ff47	Include pihole-FTL.log in debug report	7 years ago
DL6ER	db1e5f10ea	Make changes according to comment in #1384	7 years ago
DL6ER	320c06e0a4	Flush twice to move data out-of-sight of FTL	7 years ago
Adam Warner	2e398c5da4	stash changes on branch switch, else it fails if any changes have been made.	7 years ago
Mcat12	a96b4d28e1	Merge pull request #1365 from pi-hole/adlistImprovements ... Adlist improvements	7 years ago
Mcat12	57e8b7f924	Merge pull request #1355 from pmo3/development ... Mask password input when changing password	7 years ago
Flo	7e0aa822b6	Match the Pi-hole brand (#1358) ... * Update README.md * Update index.php * Update basic-install.sh * Update piholeCheckout.sh * Update update.sh * Update CONTRIBUTING.md * Update the Pi-hole brand tip in CONTRIBUTING.md Use a better formulation. * Update README.md 2	7 years ago
Adam Warner	3cf9942465	spacing fixed	7 years ago
Adam Warner	153031482f	Add delete mode to adlist command. Might be abetter way to do this	7 years ago
Adam Warner	af2cff5177	remove call to user list	7 years ago
Adam Warner	5435b93df2	remove spaces	7 years ago
Adam Warner	3a3dde6298	add adlist argument redirector	7 years ago
Adam Warner	b4bc90fb85	add in CustomizeAdlists function	7 years ago
Patrick O'Brien	a463250ecf	don't hash an empty password	7 years ago
Patrick O'Brien	94f15f1b3c	Merge remote-tracking branch 'upstream/development' into development	7 years ago
Patrick O'Brien	ee296f36c1	mask password input on command line	7 years ago
Mcat12	fb3e6ee35c	Source setupVars before attempting to use it ... Fixes #1347	7 years ago
Dan Schaper	2740c68a63	Merge pull request #1335 from pi-hole/tweak/debug_templog ... Debugging tweaks for temporary logfiles	7 years ago
Dan Schaper	b1f769b671	Output cleaning, IP stack check headers. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago