Torkel Ödegaard 03551a5961 Merge remote-tracking branch 'origin/development'

2016-05-18 14:23:21 +02:00

..

app

Merge remote-tracking branch 'origin/development'

2016-05-18 14:23:21 +02:00

dashboards

Set custom type for templating variables (#4941)

2016-05-07 07:58:01 +02:00

emails

feat(signup): progress on new sign up and email verification flow, #2353

2015-08-28 13:45:16 +02:00

fonts

old grafana wordmark was still showing on login and sidebar (#4972)

2016-05-11 09:08:25 +02:00

img

ux(): added specific fallback logos for plugin depending on type, polished layout selector style

2016-03-17 10:15:16 +01:00

sass

fix(): fixed sass issue

2016-05-16 18:48:13 +02:00

test

(prometheus) pass dashboard time range to template query (#5007)

2016-05-18 07:56:23 +02:00

vendor

Revert "Revert "Gauges""

2016-04-22 14:55:35 +02:00

views

tech(): updated es6-shim, removed es5-shim, no longer needed as we upraded phantomjs to 2.x, also removed es6-promise, dont think we need it

2016-03-22 18:32:08 +01:00

robots.txt

add support for robots.txt file

2015-06-15 19:02:38 -04:00