99 Commits (c458e4a93b904758d97132fa23cdc09e855195db)

Author	SHA1	Message	Date
DL6ER	c9d4995900	Update to comply with current development code ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	279e809aaf	Use `poweroff` instead of `halt` ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	0d037e96fb	Merge branch 'development' into gedetil-development ... Signed-off-by: DL6ER <dl6er@dl6er.de> Conflicts: advanced/Scripts/webpage.sh	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
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	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
Jacob Salmela	fb66fb12c5	put "no password will be set" on a newline.	7 years ago
Jacob Salmela	042dcf795c	fixes #1430	7 years ago
Adam Warner	22abbffbb7	Merge branch 'development' of https://github.com/gedetil/pi-hole into gedetil-development ... Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # advanced/Scripts/webpage.sh	7 years ago
DL6ER	e9d81fc883	Backend additions for aufit log feature (#1399)	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
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
DL6ER	9cc392fa02	Update Marks PR after the Promo code has been merged	7 years ago
Adam Warner	9c136a5579	functionise Hashing	7 years ago
gedetil	ff6df76e36	Update webpage.sh ... Implement "Halt system" button, next to "Restart system" button, on admin/settings page. Useful for doing clean shutdown before powering off. (This affects 4 files, 3 for the web content, 1 for backend script.) Gilbert Detillieux <gedetil> 2017-04-11	7 years ago
Mcat12	a96b4d28e1	Merge pull request #1365 from pi-hole/adlistImprovements ... Adlist improvements	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	ee296f36c1	mask password input on command line	7 years ago
DL6ER	47a6786e8f	Use proper test syntax	7 years ago
DL6ER	a69fcbb91e	Bugfix for when deleting host-record	7 years ago
DL6ER	baefec86f2	Add CLI teleporter feature	7 years ago
DL6ER	dd971b6ee5	Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins)	7 years ago
DL6ER	7ba47f504c	Add special "except-interface" line in case of listening on all interfaces	7 years ago
DL6ER	0be1717ff4	Fix config error	7 years ago
DL6ER	189a4e0078	Add option to skip restarting of dnsmasq	7 years ago
DL6ER	3adf8785d8	Move "all" down in help text to not suggest that it is the default	7 years ago
DL6ER	b74862bfc5	Actually apply new setting by restarting dnsmasq	7 years ago
DL6ER	01273124ea	Change to -i, interface	7 years ago
DL6ER	721ada7e16	Fix typo	7 years ago
DL6ER	bd9dc91396	Add response for users manually setting this up via CLI	7 years ago
DL6ER	de6c43a8d3	Setup interface listening behavior of dnsmasq	7 years ago
DL6ER	ce6c465942	Merge pull request #1266 from pi-hole/new/host-record ... Add host-record option	7 years ago
Jacob Salmela	7a1a2dec67	update license to EUPL on core files	7 years ago
DL6ER	7ed1bbad49	Add host-record option	7 years ago
DL6ER	dad18dc5de	Changed keywords	7 years ago
DL6ER	5c95c4074b	Remove static leases from DHCP static leases file	7 years ago
DL6ER	4301b9a12a	Add static DHCP leases to new file	7 years ago
DL6ER	6a89c6bf3b	Silence rm warning if no DHCP server is used	7 years ago
DL6ER	8bb9dd460b	Be able to disable the DHCP domain name	7 years ago
DL6ER	1ed2a8637f	Removed debug echo's	7 years ago