merge from master

This commit is contained in:
soulgalore 2013-12-27 22:12:42 +01:00
commit 0235355514
3 changed files with 13 additions and 4 deletions

View File

@ -10,6 +10,11 @@ version 2.4-wip
* Added short description on each rule on the summary page (hover to see it) #161
* Bug fix: the rule "Avoid DNS lookups when a page has few requests" was broken, couldn't tell if JS was loaded async or not #328
version 2.3.1
------------------------
* Bug fix: Fixed bug When api.exip.org is down (sitespeed stops to work)
version 2.3
------------------------
* Put the JUnit files into a dir named /junit/ when running the sitespeed.io-junit script. WARNING: this means you need to change in Jenkins where you match the files.

View File

@ -1,7 +1,7 @@
<a href="http://www.sitespeed.io" target="_blank">Sitespeed.io</a> - how speedy is your website? [![Build Status](https://secure.travis-ci.org/sitespeedio/sitespeed.io.png?branch=master)](http://travis-ci.org/sitespeedio/sitespeed.io)
=============
Sitespeed.io is an open source tool that helps you analyze and optimize your website speed and performance, based on performance best practices rules and collecting metrics using the Navigation Timing API.
Sitespeed.io is an open source tool that helps you analyze and optimize your website speed and performance, based on performance best practices rules and collecting metrics using the Navigation Timing API and User Timings.
Sitespeed.io will create six different result pages:
* Site summary page
* Detailed site summary page
@ -10,13 +10,12 @@ Sitespeed.io will create six different result pages:
* Most used assets report
* Screenshots
![The site summary page](https://raw.github.com/sitespeedio/sitespeed.io/master/doc/summary-1.8.jpg)
![The site summary page](https://raw.github.com/sitespeedio/sitespeed.io/master/doc/summary-2.0.jpg)
Install/run on Mac OS X
=============
```bash
$ brew tap sitespeedio/sitespeedio
$ brew install sitespeed.io
$ brew install sitespeedio/sitespeedio/sitespeed.io
$ sitespeed.io -h
```

View File

@ -395,6 +395,11 @@ if [ -z "$MY_IP" ]
then
MY_IP='unknown'
fi
## Ugly quick fix when the API is down
if [[ "$MY_IP" == *html* ]]
then
MY_IP='unknown'
fi
## Run included or local BT version
if hash browsertime 2>/dev/null; then