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-02 02:53:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
1093 commits 8 branches 109 tags 27 MiB
Commit graph

1093 commits

This branch
This branch
All branches
Author SHA1 Message Date
Promofaux
4f41bdf246 Or typing... 2016-09-30 22:59:47 +01:00
Promofaux
34c3b96deb I never said I was an expert at merging 2016-09-30 22:58:14 +01:00
Promofaux
66d1543341 Merge branch 'development' into db 2016-09-30 22:53:39 +01:00
Adam Warner
722def9362 Merge pull request #734 from pi-hole/phpVerCheckFix 
Fix the php version check command (Thanks @diginc!)
 2016-09-30 22:48:39 +01:00
Promofaux
6a8bef83b3 Fix the php version check command (Thanks @diginc!) 2016-09-30 22:40:43 +01:00
Promofaux
30f24dc988 Change shebang to ensure python2 is called 2016-09-30 21:15:44 +01:00
Promofaux
f345fa6b2e Add python(2) to dependencies. May need to change fedora family 2016-09-29 23:15:58 +01:00
Promofaux
6fb0756abd change db flush to 1 minute past midnight to stop results from 23:59 appearing in stats. Once we start storing more than one day, this can be revised. 2016-09-29 22:40:18 +01:00
Promofaux
6e13941650 Add php-pdo for RHel/Centos 2016-09-29 21:35:37 +01:00
Promofaux
74a398ce34 Much needed update to chronometer. Now Curls the api.php?summaryRaw to ensure results are the same as web 2016-09-29 20:02:31 +01:00
Adam Warner
cd30a7533e add php-sqlite3/php5-sqlite dependency 2016-09-29 09:17:20 +01:00
Promofaux
04277e20ad reference that script 2016-09-28 21:16:04 +01:00
Promofaux
612e22135f add back in needed script 2016-09-28 21:14:53 +01:00
Promofaux
a074e3312c The missing bits are important. 2016-09-28 21:11:25 +01:00
Promofaux
646ee07979 Dropped a ' '. I'll blame @dschaper ;) 2016-09-28 21:08:08 +01:00
Promofaux
1fbf182f1b add minutely cron job to import log from log file to db 2016-09-28 21:04:14 +01:00
Promofaux
08f86001a2 remove no longer needed cron job 2016-09-28 21:01:18 +01:00
Promofaux
68896623dc add sqlite3 dependency 2016-09-28 20:59:55 +01:00
Promofaux
503c2b9781 remove no longer needed script 2016-09-28 20:58:27 +01:00
Promofaux
fcc0a045cc handle importing in pihole command. pihole -i 2016-09-28 20:57:51 +01:00
Promofaux
40750c0196 Add final conn.commit() 2016-09-28 20:46:16 +01:00
Promofaux
8e1b5338c6 Whoops, actually drop gravity table on each run 2016-09-28 20:43:16 +01:00
Promofaux
0e746bde44 Provide the correct number of bindings 2016-09-28 20:35:28 +01:00
Promofaux
43dca276f4 parameters, not string concats 2016-09-28 20:31:12 +01:00
Promofaux
083dbd1533 Try .py, not .sh. 1D10T 2016-09-28 20:26:03 +01:00
Promofaux
f8e612055f copy in python parsers 2016-09-28 20:22:19 +01:00
Promofaux
41812cde22 add gravity domains to db 2016-09-28 20:20:52 +01:00
Promofaux
ff3bb11c27 add gravity_parse.py to read gravity.list domains into db (for quicker lookups) 2016-09-28 20:18:34 +01:00
Promofaux
f0343c6b77 change output path 2016-09-28 20:18:04 +01:00
Promofaux
cd2b954bec add dnsmasq_parse.py from https://github.com/averagesecurityguy/blue before modification 2016-09-28 18:14:51 +01:00
Jacob Salmela
78c8723629 Merge pull request #708 from pi-hole/github-templates 
Update Github templates
 2016-09-27 22:12:36 -05:00
Jacob Salmela
6f6450bcff simplify a bit more 
Removed a few checkboxes.  I really don't want to deter people from
submitting issue because of a wall of text, but some of this
information we really can use to be more helpful.
 2016-09-27 08:23:52 -05:00
Jacob Salmela
1f34203167 Merge pull request #722 from pi-hole/BugFix718 
Fix #718
 2016-09-27 08:08:42 -05:00
Jacob Salmela
fed20648c6 Merge pull request #727 from pi-hole/BugFix725 
Fix 725 and 653
 2016-09-27 08:07:34 -05:00
Adam Warner
3fc3c5cae4 Add iproute2 to fix #653 2016-09-27 11:15:46 +01:00
Adam Warner
daa5366b57 Check if php5 is available in apt-cache, if so install it, else just install php 2016-09-27 11:11:47 +01:00
Adam Warner
ac49e639bd Fix #718 2016-09-26 11:58:07 +01:00
Adam Warner
f01b20c2af Merge pull request #711 from pi-hole/EggPatch-1 
Egg patch 1
 2016-09-22 10:50:56 +01:00
Dan Schaper
a0d47be088 Merge conflict resolution 2016-09-21 17:20:25 -07:00
Dan Schaper
521374e238 Update .pullapprove.yml 2016-09-21 16:53:50 -07:00
Jacob Salmela
34806ee2c2 1-10 codebase familiarity 
Also tried to simplify the language a bit so as not to deter people
from submitting issues.  We may need to simplify it more
 2016-09-21 08:39:32 -05:00
Jacob Salmela
4a0d5138a1 move CONTRIBUTING.MD to .github 2016-09-20 15:30:27 -05:00
Jacob Salmela
e6a3758899 new template based on udemy-dl 2016-09-20 15:29:20 -05:00
Jacob Salmela
fcb7d9111e new template based on udemy-dl 2016-09-20 15:14:15 -05:00
Jacob Salmela
d907731027 new template based on udemy-dl 2016-09-20 15:10:34 -05:00
Dan Schaper
ac8d295bb9 Merge pull request #668 from bcambl/dns-hostname-fixes 
Dns hostname fixes
 2016-09-20 10:16:15 -07:00
Jacob Salmela
a963beb96e Merge pull request #703 from pi-hole/PromoFaux-patch-1 
Add additional instruction.
 2016-09-20 08:34:04 -05:00
bcambl
21d4199a38 Merge branch 'development' into dns-hostname-fixes 2016-09-19 17:33:32 -06:00
Adam Warner
655c422c3c Add additional instruction. 
Include "(Press space to select)" on ChooseInterface
 2016-09-19 22:17:58 +01:00
Adam Warner
b6f8bd408f Merge pull request #702 from pi-hole/PromoFaux-patch-1 
Change reset_on_push to false
 2016-09-19 21:12:33 +01:00