Torkel Ödegaard a9aaa5ad73 Merge branch 'master' of github.com:grafana/grafana

2016-01-08 18:01:20 +01:00

..

core

feat(sidemenu): improved user dropdown and sidemenu, will be improved further, #3687

2016-01-08 17:58:46 +01:00

features

Color the annotation bolt (#3590)

2016-01-07 22:28:03 +01:00

headers

refactor(lodash): changed how lodash is referenced from typescript

2015-12-22 13:59:11 +01:00

panels/graph

Merge branch 'master' into external-plugins

2015-12-14 17:28:57 +01:00

partials

Merge branch 'master' of github.com:grafana/grafana

2016-01-08 18:01:20 +01:00

plugins

style(tooltip): removed comment and extrated sort

2016-01-07 18:09:51 +01:00

app.js

tech(systemjs): almost all tests are passing

2015-12-21 16:00:58 +01:00

boot.js

tech(systemjs): more fixes for optmized build

2015-12-21 16:34:18 +01:00

grafana.ts

fix(timepicker): fixed recent breaking of datetime picker when swithing from requirejs to systemjs

2016-01-07 20:52:48 +01:00

system.conf.js

fix(systemjs): systemjs config fix for plugins

2015-12-22 11:46:41 +01:00