Torkel Ödegaard 106fe4854f Merge branch 'prometheus' of github.com:grafana/grafana ... Conflicts: pkg/models/datasource.go public/app/plugins/datasource/prometheus/datasource.js public/app/plugins/datasource/prometheus/partials/query.editor.html public/app/plugins/datasource/prometheus/queryCtrl.js		2015-10-06 16:36:58 +02:00
..
components	feat(timepickerv2): big progress on new design of new timepicker, #2761	2015-09-17 22:44:59 +02:00
controllers	fix(events): fixed handling of onAppEvents when used from rootScope, must supply localscope, can now be used in isolate scope scenarios	2015-09-18 12:15:06 +02:00
core	fix(timepicker): fixed displaying of customk time ranges, #2861	2015-10-01 16:36:38 +02:00
features	fix(dashbard save as): fixed wonky behavior in save as modal, cursor to the end randomly, fixes #2837	2015-09-28 15:26:56 +02:00
headers	refactor: moved timepicker from a simple panel to component, removed simple panel directive	2015-09-12 11:49:27 +02:00
panels	fix(playlist ui): minor polish / fix to playlist ui, fixes #2831, other minor css / markup fixes	2015-09-28 11:53:49 +02:00
partials	fix(playlist ui): minor polish / fix to playlist ui, fixes #2831, other minor css / markup fixes	2015-09-28 11:53:49 +02:00
plugins	Merge branch 'prometheus' of github.com:grafana/grafana	2015-10-06 16:36:58 +02:00
services	fix(events): fixed handling of onAppEvents when used from rootScope, must supply localscope, can now be used in isolate scope scenarios	2015-09-18 12:15:06 +02:00
app.js	feat(timepickerv2): big progress on new design of new timepicker, #2761	2015-09-17 22:44:59 +02:00