carl bergquist c48da9b5cf fix(tests): fix broken unittest due to merge conflict

2015-12-15 14:03:15 +01:00

..

admin

merge with master, conflicts fixed

2015-12-03 20:34:05 -06:00

annotations

feat(elasticsearch): Annotation queries now use the daily index patterns defined in data source options, for old annotations that have an index property that will be used, so will not break existing dashboard/annotation configs, closes #3061

2015-10-29 14:05:05 +01:00

dashboard

fix(tests): fix broken unittest due to merge conflict

2015-12-15 14:03:15 +01:00

dashlinks

Fixed some broken HTML.

2015-11-24 07:29:52 +01:00

org

Merge branch 'master' into external-plugins

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

panel

Merge branch 'external-plugins'

2015-12-15 10:10:48 +01:00

panellinks

refactoring: more moving stuff around

2015-10-30 14:44:40 +01:00

profile

removed redundant labels

2015-12-07 16:26:18 -06:00

templating

Clarify template option auto interval in tooltip

2015-12-11 16:47:05 +01:00

all.js

tech(typescript): its looking good

2015-09-10 11:26:40 +02:00