fixed karama tests
added phantomjs karma test to run in travis
Add logarithmic scale function
Merge pull request #212 from andrewmichaelsmith/log_func

Add logarithmic scale function
Adds support to have filters inside filters, (nested templated segments), Closes #128
Fix a "kibana" leftover in comments
Merge pull request #213 from jaimegago/master

Fix a "kibana" leftover in comments
make html-unsafe for text/html panels
make html-unsafe for text/html panels
Merge branch 'master' of github.com:bruce-lyft/grafana
added unit tests for filterSrv
more work on filterSrv unit tests
fixed build issues with last commit (spec file syntax error)
Added more query function in InfluxDB
Moved function definition out of template.
Merge pull request #218 from mavimo/feature/influx-query-functions

[InfluxDB] Added more query functions
aliasByNode support for second node param, Closes #167
Fixes #223, float arguments to functions like scale should now work as expected
Closes #209, sub folder with project name and version suffix in release zip files
Fixes #225, grid min not sent to graphite png renderer when set to 0