Torkel Ödegaard 6375418d8c Merge branch 'alerting' into grafana-annotations

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

..

api

Merge branch 'alerting' into grafana-annotations

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

bus

clarify which handler is not found

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

cmd

tech(metrics): move all request counters into one middleware

2016-09-09 13:28:19 +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

Godeps

updated dependencies

2016-08-01 14:15:41 +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

Merge branch 'alerting' into grafana-annotations

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

middleware

feat(metrics): measure proxy requests

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

models

tech: remove unused files

2016-09-08 11:41:56 +02: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

Merge branch 'alerting' into grafana-annotations

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

setting

fix(setting): broken code

2016-09-12 14:57:37 +02:00

social

fix(oauth): remove github refs from generic auth

2016-09-07 10:55:46 +02: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