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

..

api

Fix "Link to Prometheus" button for proxied Prometheus sources.

2015-10-01 18:23:29 +02:00

bus

clarify which handler is not found

2015-06-26 12:32:24 -07:00

cmd

Fixed 404 error for robots.txt

2015-09-16 11:02:50 +10:00

components

Graph: fixed PNG rendering of panels with legend table to the right, #2185

2015-06-19 14:13:25 -04:00

events

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

2015-08-28 15:14:24 +02:00

log

Add config option to strip (most) colors from console logs

2015-10-01 13:16:23 -07:00

login

fix(ldap): fixed ldap org roles sync, did only add one new role per login, now all roles are added, fixes #2766

2015-09-21 09:19:50 +02:00

metrics

feat(usage stats): added data source count stats

2015-09-29 13:47:56 +02:00

middleware

fix(quota): fixed failing quota unit tests

2015-09-18 08:36:58 +02:00

models

Fix "Link to Prometheus" button for proxied Prometheus sources.

2015-10-01 18:23:29 +02:00

plugins

Fixed failing go unit test

2015-03-29 13:33:34 +02:00

services

feat(usage stats): added data source count stats

2015-09-29 13:47:56 +02:00

setting

Add config option to strip (most) colors from console logs

2015-10-01 13:16:23 -07:00

social

GitHub users without a public email should be authenticated using their primary private email address

2015-05-28 16:47:20 +01:00

util

feat(invite): progress on invite feature, #2353

2015-08-10 13:47:06 +02:00