bergquist ffda5efc66 Merge branch 'master' into alerting_reminder ...

* master:
  changelog: add notes about closing #11076
  snapshot: copy correct props when creating a snapshot
  set current org when adding/removing user to org
  changelog: add notes about closing #10707
  Include the vendor directory when copying source in to Docker (#12305)
  changelog: adds note about closing #12199
  adds inTransactionCtx that calls inTransactionWithRetryCtx
  merge create user handlers
  transactions: start sessions and transactions at the same place
  cloudwatch: handle invalid time range
  make sure to use real ip when validating white listed ip's
  changelog: adds note about closing #12286

2018-06-18 11:26:31 +02:00

..

api

bus: dont mix ctx/classic handlers

2018-06-15 12:46:20 +02:00

bus

bus: noop should still execute fn

2018-06-15 12:46:20 +02:00

cmd

Merge branch 'master' into feature/add_es_alerting

2018-05-28 18:10:34 +02:00

components

Backend image rendering as plugin (#11966)

2018-05-24 15:26:27 +02:00

events

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

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

extensions

Enable Grafana extensions at build time. (#11752)

2018-04-27 13:41:58 +02:00

log

pkg/log: fix ineffassign issues

2018-04-23 19:31:23 +02:00

login

fix typo in getLdapAttrN (#11898)

2018-05-09 20:26:17 +02:00

metrics

add usage stats for datasource access mode

2018-05-25 16:06:35 +02:00

middleware

make sure to use real ip when validating white listed ip's

2018-06-15 15:29:43 +02:00

models

adds tests for journaling sql operations

2018-06-16 11:27:04 +02:00

plugins

dashboard: import to folder

2018-06-05 19:23:09 +03:00

registry

Sqlstore refactor (#11908)

2018-05-18 11:10:10 +02:00

services

Merge branch 'master' into alerting_reminder

2018-06-18 11:26:31 +02:00

setting

Merge pull request #12077 from roidelapluie/logout

2018-05-28 08:06:00 +02:00

social

Initial Baby Step to refactoring settings from global vars to instance (#11777)

2018-04-30 16:21:04 +02:00

tracing

refactor: tracing service refactoring (#11907)

2018-05-10 16:51:55 +02:00

tsdb

cloudwatch: handle invalid time range

2018-06-15 15:48:25 +02:00

util

provisioning: only update dashboard if hash of json changed

2018-05-31 21:05:52 +02:00