Dan Cech b387c1291d Merge branch 'master' into gnet-oauth ...

Conflicts:
	pkg/api/login_oauth.go

2016-09-21 09:39:35 -04:00

..

api

Merge branch 'master' into gnet-oauth

2016-09-21 09:39:35 -04:00

bus

clarify which handler is not found

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

cmd

fix(cli): remove unused logging

2016-09-20 10:10:27 +02:00

components

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

2016-09-07 10:14:36 +02:00

events

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

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

log

feat(alerting): progress on email notifications

2016-07-26 12:29:52 +02:00

login

support connect ldap server with starttls (#5969)

2016-09-10 09:40:56 +02:00

metrics

feat(alerting): removed severity

2016-09-13 15:09:55 +02:00

middleware

feat(metrics): measure proxy requests

2016-09-12 13:29:31 +02:00

models

support setting default org role when adding user via grafana.net auth

2016-09-20 12:36:36 -04:00

plugins

feat(table): added sanitize html option to column styles for table panel, fixes #4596

2016-07-11 09:38:06 +02:00

services

support setting default org role when adding user via grafana.net auth

2016-09-20 12:36:36 -04:00

setting

support logging in with grafana.net credentials

2016-09-19 16:48:07 -04:00

social

support setting default org role when adding user via grafana.net auth

2016-09-20 12:36:36 -04:00

tsdb

tech(tsdb): remove skip ssl setting. should be based on datasource settings

2016-09-12 13:37:00 +02:00

util

test(util): add unit test for string util

2016-06-03 15:06:54 +02:00