bergquist e36f9fa795 Merge branch 'master' into alerting_influxdb

2016-10-07 10:45:05 +02:00

..

api

Make alerting notifcations sync (#6158)

2016-10-03 09:38:03 +02:00

bus

Make alerting notifcations sync (#6158)

2016-10-03 09:38:03 +02:00

cmd

feat(tsdb): add draft implementation for influxdb

2016-10-04 16:25:33 +02:00

components

feat(alerting): add nop uploader

2016-10-05 07:34:48 +02:00

events

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

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

log

tech(log): fixes extra param logging

2016-09-28 13:57:19 +02:00

login

Added allow_sign_up setting to auth.ldap to be able to disable automatic user creation for LDAP logins (#6191)

2016-10-07 08:49:58 +02:00

metrics

fix(internal metrics): removed local dev code

2016-09-22 11:54:47 +02:00

middleware

fix(server side rendering): Fixed issues with server side rendering for alerting & for auth proxy scenarios, fixes #6115, fixes #5906

2016-09-23 12:29:53 +02:00

models

Make alerting notifcations sync (#6158)

2016-10-03 09:38:03 +02:00

plugins

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

2016-09-28 08:09:51 +02:00

services

tech(influxdb): refactor and cleanup

2016-10-06 14:16:26 +02:00

setting

Added allow_sign_up setting to auth.ldap to be able to disable automatic user creation for LDAP logins (#6191)

2016-10-07 08:49:58 +02:00

social

feat(oauth): refactoring PR #6077

2016-09-28 15:10:50 +02:00

tsdb

Merge branch 'master' into alerting_influxdb

2016-10-07 10:45:05 +02:00

util

test(util): add unit test for string util

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