Torkel Ödegaard 2fbe8cde8a Merge branch 'master' of github.com:grafana/grafana into dash-edit-mode

2016-10-29 11:50:57 +02:00

..

api

Merge branch 'master' of github.com:grafana/grafana into dash-edit-mode

2016-10-29 11:50:57 +02:00

bus

Make alerting notifcations sync (#6158)

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

cmd

fix(cli): improve error handling

2016-10-21 16:03:02 +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

fixed scoping issue with certPool variable (#6261)

2016-10-13 13:38:55 +02:00

metrics

fix(internal metrics): removed local dev code

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

middleware

Added a state parameter for all OAuth requests

2016-10-08 01:22:32 -05:00

models

Alerting: Keep last state on no data (#6354)

2016-10-22 10:56:04 +02:00

plugins

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

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

services

Fixed alerting bug for mysql (#6375)

2016-10-25 14:52:20 +02:00

setting

added hosted domain suppport to google oauth login (#6372)

2016-10-28 12:00:47 +02:00

social

added hosted domain suppport to google oauth login (#6372)

2016-10-28 12:00:47 +02:00

tsdb

Merge branch 'master' into alerting_opentsdb

2016-10-19 13:15:22 +02:00

util

test(util): add unit test for string util

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