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
..
core/utils	fix(timepicker): fixed displaying of customk time ranges, #2861	2015-10-01 16:36:38 +02:00
cloudwatch-datasource-specs.js	feat(timepicker): lots of big changes, moving to datemath from kbn.parseDateMath, moving to moment dates instead of native javascript dates	2015-09-17 11:21:38 +02:00
dashboardSrv-specs.js	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
dashboardViewStateSrv-specs.js	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
dynamicDashboardSrv-specs.js	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
graph-ctrl-specs.js	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
graph-specs.js	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
graph-tooltip-specs.js	fix(graph): minor fix for hover tooltip when combined with a single series using stepped lines, fixes #2754	2015-09-19 15:20:53 +02:00
helpers.js	feat(timepicker): lots of big changes, moving to datemath from kbn.parseDateMath, moving to moment dates instead of native javascript dates	2015-09-17 11:21:38 +02:00
influxdb-datasource-specs.js	feat(timepicker): more work on getting new time formats to work in all data sources	2015-09-17 12:40:04 +02:00
influxQueryBuilder-specs.js	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
influxSeries08-specs.js	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
kairosdb-datasource-specs.js	feat(timepickerv2): fixed lots of minor issues and updated kairosdb and opentsdb data sources to work with the new date formats	2015-09-18 15:06:08 +02:00
kbn-format-specs.js	feat(timepicker): lots of big changes, moving to datemath from kbn.parseDateMath, moving to moment dates instead of native javascript dates	2015-09-17 11:21:38 +02:00
lexer-specs.js	fix(graphite): minor fix to query editor when using summarize function with no metric segments, only series ref, fixes #2788	2015-09-22 13:32:28 +02:00
opentsdbDatasource-specs.js	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
panelSrv-specs.js	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
parser-specs.js	fix(graphite): minor fix to query editor when using summarize function with no metric segments, only series ref, fixes #2788	2015-09-22 13:32:28 +02:00
row-ctrl-specs.js	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
seriesOverridesCtrl-specs.js	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
shareModalCtrl-specs.js	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
singlestat-specs.js	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
templateSrv-specs.js	fix(elasticsearch): quote variable value in lucene variable mulit format, fixes #2828	2015-09-28 11:28:08 +02:00
templateValuesSrv-specs.js	fix(elasticsearch): quote variable value in lucene variable mulit format, fixes #2828	2015-09-28 11:28:08 +02:00
timeSeries-specs.js	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
timeSrv-specs.js	feat(timepicker2): fixed timesrv specs	2015-09-17 09:57:59 +02:00
unsavedChangesSrv-specs.js	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00
value_select_dropdown_specs.js	feat() started work on more feature rich time picker	2015-09-15 13:23:36 +02:00