Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-04 20:13:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
5851 commits 8 branches 109 tags 27 MiB
Commit graph

5851 commits

This branch
This branch
All branches
Author SHA1 Message Date
DL6ER
33b6fe72da Extended help text 2016-11-19 21:57:42 +01:00
DL6ER
733919be4a Implement possibility to remove password using "pihole -web -p" 2016-11-19 21:50:15 +01:00
Dan Schaper
4333e5487b Merge pull request #932 from pi-hole/feature/debug_timeout 
feature/debug_timeout
 2016-11-19 12:25:38 -08:00
Dan Schaper
22ead933b6 Merge pull request #936 from pi-hole/Mcat12-patch-1 
Fix typo
 2016-11-19 11:08:20 -08:00
Dan Schaper
d53a3af191 Merge pull request #899 from diginc/configureFirewall_unittest 
Configure firewall unittest
 2016-11-19 11:07:38 -08:00
Mcat12
08e7b7e0ad Fix typo 2016-11-19 14:00:56 -05:00
Dan Schaper
68cb0782c0 Add countdown timer 2016-11-18 13:27:06 -08:00
Adam Warner
0e5a8e0033 Merge pull request #934 from DL6ER/gravity.sh-done 
Added missing "done." output to gravity.sh
 2016-11-18 20:10:50 +00:00
DL6ER
4945f33254 Added "-n" to first echo call 2016-11-18 17:39:34 +01:00
DL6ER
3fa05293fc Fixed file permissions 2016-11-18 17:37:13 +01:00
DL6ER
27e5f2798d Added missing "done." output 2016-11-18 17:33:46 +01:00
DL6ER
291ca0874a Fixed two more typos 2016-11-18 12:16:26 +01:00
DL6ER
96f2aa1803 fixed typo 2016-11-17 23:36:53 +01:00
DL6ER
c6857501aa Removed check for availability of nohup 2016-11-17 23:31:11 +01:00
DL6ER
3aba1607b2 Removed debug echos 2016-11-17 23:04:46 +01:00
DL6ER
f667298b64 Added possiblity for delayed reactivation of blocking 2016-11-17 22:58:00 +01:00
Dan Schaper
0f4c8d4923 Set default timeout to 60 seconds 2016-11-17 11:00:11 -08:00
Dan Schaper
6d2c5b2312 Add debug timeoute 2016-11-17 10:58:58 -08:00
Dan Schaper
a95ce11ca6 Add debug timeoute 2016-11-17 10:39:51 -08:00
Dan Schaper
808503d526 Add piholeDebug to tests 2016-11-17 10:28:51 -08:00
Adam Warner
d4b6fb9214 Merge pull request #929 from pi-hole/cleanup/PR_template 
Small change in template
 2016-11-17 12:43:54 +00:00
Dan Schaper
9bce5a09f3 Small change in template 
Just a space, and italicize
 2016-11-16 21:42:54 -08:00
Mcat12
bd61f38169 Merge pull request #926 from zbholman/patch-2 
Added removal of pihole user to the uninstall.sh
 2016-11-16 17:31:56 -05:00
zbholman
cac9c63325 Added removal of pihole user to the uninstall.sh 
Not sure if I should have created a variable for the username or if the echo is necessary. And this is my first time doing a pull request, hopefully it works out lol.
 2016-11-16 17:06:30 -05:00
Adam Warner
e6d555ac31 Merge pull request #925 from pi-hole/feature/style_guide 
Add GSG/Shell link
 2016-11-16 22:03:18 +00:00
Dan Schaper
fd0dd9f54c Add GSG/Shell link 2016-11-16 13:55:29 -08:00
DL6ER
88c161769d Capitalized variable names. 2016-11-16 22:33:28 +01:00
DL6ER
01bf1ae92d Compute double hashes to avoid rainbow table vulnerability 2016-11-16 22:13:47 +01:00
DL6ER
9193c71cff Minor change 2016-11-16 21:36:19 +01:00
DL6ER
db278d81e4 Added webpage.sh 2016-11-16 21:34:43 +01:00
Dan Schaper
bdad454a0d Merge pull request #920 from pi-hole/PromoFaux-patch-1 
Update piholeDebug.sh
 2016-11-16 11:22:04 -08:00
Adam Warner
ac8064c754 Merge pull request #918 from nlamirault/patch-2 
Add Pi-Hole exporter for Prometheus
 2016-11-16 18:53:00 +00:00
Dan Schaper
736e963cef Merge pull request #919 from haydenknowles/development 
moved newline to correct place
 2016-11-15 18:40:00 -08:00
Adam Warner
b191cd73a7 Update piholeDebug.sh 
wording
 2016-11-15 13:28:18 +00:00
Hayden Knowles
86d3ca48ae moved newline to correct place 2016-11-15 22:40:57 +13:00
Nicolas Lamirault
fd7e4f2268 Add Pi-Hole Prometheus exporter project 2016-11-15 09:27:16 +01:00
Dan Schaper
e9475a9739 Merge pull request #887 from brontide/dependancy_cleanup 
Dependancy cleanup
 2016-11-07 21:45:23 -08:00
Dan Schaper
d4270e02e9 Merge pull request #902 from elpatron68/master 
Added Link to blink1_pi-hole.py
 2016-11-07 21:44:28 -08:00
Mcat12
b9a263ecb2 Merge pull request #907 from pi-hole/bugfix/chronometer-interface 
replace hardcoded interface with var
 2016-11-07 21:35:09 -05:00
Dan Schaper
4929d415a6 Merge pull request #906 from pi-hole/Fix/send-frs-into-orbit 
Direct users to Discourse for FRs
 2016-11-07 17:32:28 -08:00
Dan Schaper
b9e1f518aa Merge pull request #909 from bcambl/fix_ifcfg_append 
Fedora: write interface config instead of append
 2016-11-07 17:23:50 -08:00
bcambl
0caa44e979 write ifcfg instead of appending 2016-11-07 12:54:31 -06:00
Jacob Salmela
ca56ca5bd8 promo-tweak 
Better logic introduced by @PromoFaux
 2016-11-06 11:16:48 -06:00
Jacob Salmela
a0f0dff88e replace hardcoded interface with var 
setupVars.conf is already sourced, so we just need to replace the
hardcoded value with the variable name.
 2016-11-06 08:18:57 -06:00
Jacob Salmela
e5cc38a210 Direct users to Discourse for FRs 
It's a better platform for it because users can vote and we can have
easier discussions for it.
 2016-11-06 08:08:58 -06:00
Adam Warner
6cb5bb7200 Merge pull request #903 from pi-hole/feature/PRGuide 
PR against Development guide
 2016-11-04 21:17:20 +00:00
Dan Schaper
563696e291 PR against Development guide 
PA will tag PR to Master with -1 approval in the next release. That will deny any PR's against Master from users and changing branches after the PR is started does not appear to modify the PA actions.
 2016-11-04 14:01:01 -07:00
Markus Busche
c755b3c49e Added Link to blink1_pi-hole.py 2016-11-04 21:56:14 +01:00
diginc
b9f3493dbc move PH_TRUE to Dockerfiles to DRY 2016-11-03 22:34:04 -05:00
Dan Schaper
8c08e9e473 Merge pull request #891 from pi-hole/bugfix/chronometer-domain-count 
Bugfix/chronometer domain count
 2016-11-03 13:55:29 -07:00