ryan b4fad40c5a Merge remote-tracking branch 'grafana/master' into proxy-slash ...

* grafana/master: (127 commits)
  alerting: move all notification conditions to defaultShouldNotify
  filter NULL values for column value suggestions
  imguploader: Add support for ECS credential provider for S3
  Remove .dropdown-menu-open on body click fixes #13409
  Remove option r from ln command since its not working everywhere
  fix: updated tests
  Fix spelling of your and you're
  Changed setting to be an alerting setting
  Remove non-existing css prop
  fix: Legend to the right, as table, should follow the width prop. Removing css conflicting with baron's width calculation. #13312
  rendering: Added concurrent rendering limits
  devenv: fix uid for bulk alert dashboards
  Explore: moved code to app/features/explore
  target gfdev-prometheus datasource
  devenv: adds script for creating many dashboards with alerts
  Fix goconst issues
  When stacking graphs, always include the y-offset so that tooltips can render proper values for individual points
  provisioning: changed provisioning default update interval from 3 to 10 seconds
  Fix https://github.com/grafana/grafana/issues/13387 metric segment options displays after blur
  docs: improve oauth generic azure ad instructions
  ...

2018-09-26 20:24:08 -07:00

..

avatar

Remove redundancy in variable declarations (golint)

2018-04-27 22:14:36 +02:00

dtos

Fix misspell issues

2018-09-21 11:54:36 +02:00

live

string formating fixes

2018-08-28 22:33:38 +02:00

pluginproxy

remove the test that does not do anything

2018-09-18 11:18:55 -07:00

routing

removes unused return object

2018-06-26 09:22:31 +02:00

static

pkg: fix codespell issues

2018-04-13 20:31:29 +02:00

admin_users.go

Make golint happier

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

admin.go

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

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

alerting_test.go

Refactor team pages to react & design change (#12574)

2018-07-11 11:23:07 -07:00

alerting.go

alerting: only check frequency when not send once

2018-06-04 22:19:27 +02:00

annotations_test.go

Refactor team pages to react & design change (#12574)

2018-07-11 11:23:07 -07:00

annotations.go

renames PartialMatch to MatchAny

2018-09-13 15:15:42 +02:00

api.go

Use datasource cache for backend tsdb/query endpoint (#13266)

2018-09-14 09:30:32 +02:00

apikey.go

Make golint happier

2018-03-22 22:38:44 +01:00

app_routes.go

fix: #12461 introduced issues with route registration ordering, adding plugin static routes before plugins package had been initiated (#12474)

2018-07-01 23:35:50 -07:00

common_test.go

test: fixed usage of wrap in tests.

2018-07-02 17:13:59 +02:00

common.go

refactoring: making api wrap public

2018-07-02 14:13:18 +02:00

dashboard_permission_test.go

test: fixed usage of wrap in tests.

2018-07-02 17:13:59 +02:00

dashboard_permission.go

permission: generate team avatar url with default

2018-04-04 15:50:45 +02:00

dashboard_snapshot_test.go

Refactor team pages to react & design change (#12574)

2018-07-11 11:23:07 -07:00

dashboard_snapshot.go

Fix dashboard snapshot deletion (#12025)

2018-05-24 08:55:16 +02:00

dashboard_test.go

Refactor team pages to react & design change (#12574)

2018-07-11 11:23:07 -07:00

dashboard.go

Fix goconst issues

2018-09-23 21:19:21 +02:00

dataproxy.go

Merge remote-tracking branch 'grafana/master' into proxy-slash

2018-09-26 20:24:08 -07:00

datasources_test.go

Return a 404 when deleting a datasource through the API if it doesn't exist and add a test for it to confirm #12313

2018-06-22 21:15:36 -05:00

datasources.go

return proper payload from api when updating datasource

2018-08-07 17:56:02 +02:00

folder_permission_test.go

test: fixed usage of wrap in tests.

2018-07-02 17:13:59 +02:00

folder_permission.go

permissions: return user and team avatar in folder permissions api

2018-04-04 15:51:19 +02:00

folder_test.go

test: fixed usage of wrap in tests.

2018-07-02 17:13:59 +02:00

folder.go

Fix goconst issues

2018-09-23 21:19:21 +02:00

frontendsettings.go

make default values for alerting configurable

2018-09-06 11:26:14 +02:00

grafana_com_proxy.go

rename Context to ReqContext

2018-03-07 11:54:50 -05:00

http_server.go

disabling internal metrics disables /metric endpoint

2018-09-13 16:09:52 +02:00

index.go

Fix goconst issues

2018-09-23 21:19:21 +02:00

login_oauth.go

go fmt fixes

2018-05-28 20:48:01 +02:00

login.go

sql: added code migration type

2018-08-21 13:53:04 +02:00

metrics.go

Use datasource cache for backend tsdb/query endpoint (#13266)

2018-09-14 09:30:32 +02:00

org_invite.go

return better error message when err is ErrSmtpNotEnabled

2018-05-28 17:49:31 +00:00

org_users.go

Make golint happier

2018-03-22 22:38:44 +01:00

org.go

Make golint happier

2018-03-22 22:38:44 +01:00

password.go

Make golint happier

2018-03-22 22:38:44 +01:00

playlist_play.go

Make golint happier

2018-03-22 22:38:44 +01:00

playlist.go

HTTP API documentation +fix when updating a playlist (#12612)

2018-07-17 07:45:38 -07:00

plugins.go

dashboard: import to folder

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

preferences.go

Make golint happier

2018-03-22 22:38:44 +01:00

quota.go

Make golint happier

2018-03-22 22:38:44 +01:00

render.go

Changed setting to be an alerting setting

2018-09-25 12:17:04 +02:00

search.go

Make golint happier

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

signup.go

Make golint happier

2018-03-22 22:38:44 +01:00

stars.go

Make golint happier

2018-03-22 22:38:44 +01:00

team_members.go

new column for team_member table

2018-09-14 17:27:36 +02:00

team_test.go

Refactor team pages to react & design change (#12574)

2018-07-11 11:23:07 -07:00

team.go

Refactor team pages to react & design change (#12574)

2018-07-11 11:23:07 -07:00

user_test.go

admin: adds paging to global user list

2017-02-13 12:59:36 +01:00

user.go

add api route for retrieving teams of signed in user

2018-08-08 10:26:05 +02:00