pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
894 Commits 16 Branches 105 Tags
vDev
Commit Graph

894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Warner 0951a9c6b5 Merge branch 'master' into devel vDev 2016-10-18 16:02:09 +01:00
Adam Warner 695c66f0ee Merge pull request #170 from pi-hole/revert-154-devel 
Revert "set default time zone for date"
 2016-10-18 15:53:12 +01:00
Adam Warner b9f186befb Revert "set default time zone for date" 2016-10-18 15:52:58 +01:00
Adam Warner 854c0e0301 Merge pull request #165 from pi-hole/devel 
[Release] 1.4.3
v1.4.3 		2016-10-17 23:56:44 +01:00
Mcat12 12b099ca02 Merge pull request #160 from pi-hole/old-php-support 
Add fallback hash_equals and use old array syntax
 2016-10-17 18:13:02 -04:00
Adam Warner f71834a26d Merge pull request #168 from pi-hole/addHostnamesToForwardDests 
add Hostname check to Forward Destination array.
 2016-10-17 21:35:09 +01:00
Promofaux 9b67c1b986 add Hostname check to Forward Destination array. Closes Feature request in #551 2016-10-17 21:33:34 +01:00
Adam Warner 9a0eedfb1e Merge pull request #167 from pi-hole/gravCountFix 
change data.php IPv6 check to reflect new variable name in setupVars.…
 2016-10-17 18:57:06 +01:00
Promofaux 16422460bf change data.php IPv6 check to reflect new variable name in setupVars.conf 2016-10-17 18:55:58 +01:00
Adam Warner 5be14ad6e2 Merge pull request #156 from akoebbe/performance-improvements 
Performance improvements
 2016-10-17 18:54:03 +01:00
Adam Warner 4d67004078 Merge pull request #164 from pi-hole/updateNotification 
Add update link to versions in the footer. Don't pop out the pi-hole menu.
 2016-10-16 15:49:13 +01:00
Adam Warner a5561c7b66 Add update link to versions in the footer. Don't pop out the pi-hole menu. It's annoying 2016-10-15 01:53:32 +01:00
Mcat12 871bef985d Add fallback hash_equals and use old array syntax 2016-10-13 16:25:05 -04:00
Mcat12 3158e221db Merge pull request #158 from bcambl/fix_php_array 
Replace [] with array() for php 5.3 support
 2016-10-13 15:58:41 -04:00
Mcat12 eeb367f261 Merge pull request #154 from das7pad/devel 
Set default time zone for date
 2016-10-13 15:56:34 -04:00
bcambl 82de713142 Replace [] with array() for php 5.3 support 
Short array syntax introduced in PHP 5.4
 2016-10-09 11:37:49 -06:00
Andrew Koebbe cfb3f5070a Improved performance by not reading the log file in to memory 
Fixed the ForwardDestinations not setting the first value for a domain as 1
Fixed a bug where when no ads blocked the alignTimeArrays would error on the min and max calls
 2016-10-09 11:22:00 -05:00
Jakob Ackermann 91683a62ee keep recent format of date 
just output a 'T' insted of the Timezone
 2016-10-09 17:46:37 +02:00
Jakob Ackermann 0197ca79fd use the date command for the other dates as well 
trim against leading space from %k (range of ' 0' to '23') and
strtolower for AM/PM that %p outputs as uppercase, while 'a' (-> am/pm)
was used before
 2016-10-09 05:54:32 +02:00
Jakob Ackermann fb995872d1 run date command right before log event 2016-10-09 04:04:40 +02:00
Jakob Ackermann 9cd0f4b4fa use output of command date as datestring 
this will imply the system time zone. command date and the given format
are supported by the majority of linux distros
 2016-10-09 03:06:09 +02:00
Jakob Ackermann 4028a3f833 Merge remote-tracking branch 'refs/remotes/pi-hole/master' into devel 2016-10-09 03:04:45 +02:00
Jakob Ackermann b73d6e0329 set default time zone for date 
this prevents basic error messages from php(-cgi) for not setting the
timezone and then using UTC as default
 2016-10-04 17:57:34 +02:00
Adam Warner f112893fee Merge pull request #152 from pi-hole/devel 
HOTFIX RELEASE 1.4.2
v1.4.2 		2016-10-01 16:24:07 +01:00
Adam Warner 3f1acb5b9a Merge branch 'master' into devel 2016-10-01 16:23:51 +01:00
Adam Warner 436a4971e4 Merge pull request #151 from diginc/patch-1 
Fixes #150 - parsing issue for double space in between Month and Day
 2016-10-01 16:22:25 +01:00
Adam Hill b372c2e3d2 Fixes #150 
During the beginning of the month with the log having two spaces between Month & Day we get 9 values back instead of 8.  Stripping double spaces fixes.  E.G. `Oct  1` comapred to `Sep 26`
 2016-10-01 10:18:52 -05:00
Adam Warner 2f4bdc6d82 Merge pull request #148 from pi-hole/devel 
Next Version (1.4.1 or 1.5, whatever)
v1.4.1 		2016-09-24 18:54:27 +01:00
Adam Warner 68fa76fb9a Merge pull request #135 from rappo/patch-1 
Updated URL and fixed the text styling of GitHub
 2016-09-22 10:03:17 +01:00
Adam Warner f9371a7f0a Merge pull request #141 from pi-hole/phperrorfix 
Fix "PHP Notice:  Undefined offset:" errors
 2016-09-19 20:47:29 +01:00
Promofaux 55df44edf3 change $ipv6 value to read from /etc/pihole/setupVars.conf instead of /etc/pihole/.useIPV6 2016-09-16 23:59:59 +01:00
Promofaux f53a77301f in findAds: ensure count($exploded) == 8 2016-09-16 23:42:13 +01:00
Promofaux b35b0dd7a6 Actually set status to "" before checking it! 2016-09-16 23:23:54 +01:00
Adam Warner 863c791f50 Merge pull request #139 from JdenHartog/patch-1 
apple-touch-icon now is png
 2016-09-14 16:37:58 +01:00
J den Hartog ca9dcac5f1 apple-touch-icon now is png 
A Webpage Icon should be png like specified here:
https://developer.apple.com/library/content/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html
So I changed it to point the favicon.png icon.

Now on my phone 5S running iOS 9.3.5 the new pi-hole icon is used both when I choose to *Add Bookmark* but also when I *Add to Home Screen* from Safari.
 2016-09-14 16:08:04 +02:00
David Rappo d23b64c45d Updated URL and fixed the text styling of GitHub 
The url now points to the proper pi-hole/pi-hole repo and fixed the styling of GitHub (not "Github").
 2016-09-06 16:41:13 -07:00
Adam Warner 75bbd448f9 Merge pull request #134 from pi-hole/hidepi.holefromads 
More accurate stats
 2016-09-06 14:34:48 +01:00
Adam Warner f319ec6cfa Suppress pi.hole and hostname pulled from /etc/hostname from the stats, as they're not really ads. 2016-09-06 09:08:12 +01:00
Mcat12 107a0d8f1c Merge pull request #129 from Fourdee/Temp-readout-fix 
Temp readout fix for Pine A64
 2016-09-04 14:26:27 -04:00
Daniel (Fourdee) f43a337711 Temp readout fix for Pine A64 
And possibily other devices:
 2016-08-27 16:36:54 +01:00
Mcat12 fa5f2fcaf0 Merge pull request #113 from pi-hole/devel 
Devel Next release
v1.4 		2016-08-19 20:33:46 -04:00
Mcat12 8277a2a406 Merge pull request #125 from pi-hole/new-icon 
New icon
 2016-08-19 20:25:06 -04:00
Dan Schaper d47019d85f Merge branch 'devel' into new-icon 2016-08-19 17:18:31 -07:00
Mcat12 6ae14d1a2a Merge pull request #124 from pi-hole/checkDomain 
Check if a domain name is valid
 2016-08-19 20:15:39 -04:00
Mcat12 8182a0da57 Show failure message if domain was invalid 2016-08-19 20:02:08 -04:00
Mcat12 261e20f33c Remove circle filter on one of the logos 2016-08-19 19:03:49 -04:00
Mcat12 05112cdd9b Switch to new icon 2016-08-19 18:46:58 -04:00
Dan Schaper 81e55595f8 Merge branch 'devel' into checkDomain 2016-08-19 01:22:39 -07:00
Dan Schaper 23f958eed6 Merge pull request #119 from tsenovIvan/devel 
Make "Top Dom/Advert/Clients" tables 'responsive'
 2016-08-19 00:17:51 -07:00
Ivan Cenov bb7f10d8ba Merge remote-tracking branch 'upstream/devel' into devel 
Sync AdminLTE to local devel
 2016-08-19 09:49:46 +03:00