ryan a5588b6957 Merge remote-tracking branch 'origin/annotations-created' into annotations-created ...

* origin/annotations-created:
  dooh

2018-03-23 11:44:21 +01:00

..

api

move dashboard error to API (not sql)

2018-03-23 11:36:44 +01:00

bus

(format) run go fmt in pkg

2016-12-14 12:17:38 +09:00

cmd

Make golint happier

2018-03-22 12:40:21 +01:00

components

renderer: avoid redirect render requests

2018-03-14 15:27:18 +01:00

events

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

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

log

Improve logging in the phantomjs renderer (#10697)

2018-02-01 14:04:52 +01:00

login

WIP: Protect against brute force (frequent) login attempts (#10031)

2018-01-26 10:41:41 +01:00

metrics

stats: send amount of stars as stats

2018-01-23 22:51:05 +01:00

middleware

Make golint happier

2018-03-22 12:40:21 +01:00

models

Merge branch 'master' into mssql_datasource

2018-03-13 16:03:02 +01:00

plugins

dashboard: fix import dashboard with alert rule

2018-03-14 14:24:56 +01:00

services

Merge remote-tracking branch 'origin/annotations-created' into annotations-created

2018-03-23 11:44:21 +01:00

setting

session: update defaults for ConnMaxLifetime

2018-03-20 19:31:01 +01:00

social

only use jwt token if it contains an email address

2018-03-06 14:21:36 -05:00

tracing

jaeger: capitalize tracer name

2017-09-27 16:38:00 +02:00

tsdb

mssql: add integration test to verify stored procedure usage

2018-03-19 19:56:34 +01:00

util

Shouldn't be able to overwrite a dashboard if you don't have permissions (#10900)

2018-02-19 11:12:56 +01:00