ichekrygin 8f0d51171d Resolve rebase w/ upstream conflicts. ...

Remove: `Alert on Exec Error` (no longer needed)
Add: `ruleUrl` to VictorOps message body.

2016-11-16 16:13:33 -08:00

..

api

fix(404): fixed 404 page

2016-11-16 17:09:00 +01:00

bus

Make alerting notifcations sync (#6158)

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

cmd

tech(cli): add default settings for transport

2016-11-01 08:58:44 +01: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

Add VictorOps alert notification capability

2016-11-16 14:02:34 -08:00

middleware

fix(error handling): fixed server side error handling page

2016-11-16 17:41:44 +01:00

models

feat(stats): add alerts to global admin stats

2016-11-11 14:04:38 +01:00

plugins

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

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

services

Resolve rebase w/ upstream conflicts.

2016-11-16 16:13:33 -08: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

fix(influxdb): add support for regex measurments

2016-11-14 08:48:19 +01:00

util

test(util): add unit test for string util

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