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

* master: (95 commits)
  registry: adds more comments
  registry: adds comments to interfaces
  changelog: update
  changelog: update
  changelog: add notes about closing #12438
  alerting: only log when screenshot been uploaded
  fixes typos
  changelog: add notes about closing #12444
  Revert "auth proxy: use real ip when validating white listed ip's"
  changelog: adds note for #11892
  changelog: add notes about closing #12430
  fix footer css issue
  Karma to Jest: 3 test files (#12414)
  fix: log close/flush was done too early, before server shutdown log message was called, fixes #12438
  Karma to Jest: value_select_dropdown (#12435)
  support passing api token in Basic auth password (#12416)
  Add disabled styles for checked checkbox (#12422)
  changelog: add notes about closing #11920
  changelog: add notes about closing #11920
  changelog: update
  ...

2018-06-29 15:44:20 +02:00

..

avatar

Remove redundancy in variable declarations (golint)

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

dtos

Merge branch 'master' into alerting_reminder

2018-06-15 12:45:35 +02:00

live

refactor(http): refactoring http server

2016-12-21 14:36:32 +01:00

pluginproxy

Merge pull request #11643 from mrsiano/generic_oauth

2018-06-21 14:21:59 +02: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

alerting: remove zero units from duration

2018-06-05 08:42:39 +02:00

alerting.go

alerting: only check frequency when not send once

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

annotations_test.go

Light improve of massive delete annotation api (#12390)

2018-06-25 04:58:49 -07:00

annotations.go

ensure that if the dasboardID is negative, it will not bypass the checking of the right (#12398)

2018-06-26 05:12:20 -07:00

api.go

routing: allows routes to be added to existing groups

2018-06-25 16:50:27 +02:00

apikey.go

Make golint happier

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

app_routes.go

Make golint happier

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

common_test.go

Fix dashboard snapshot deletion (#12025)

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

common.go

Revert "Opportunities to unindent code (unindent)"

2018-05-02 14:06:46 +02:00

dashboard_permission_test.go

Merge branch 'master' into dashboard-acl-ux2

2018-03-29 11:32:24 +02:00

dashboard_permission.go

permission: generate team avatar url with default

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

dashboard_snapshot_test.go

Fix dashboard snapshot deletion (#12025)

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

dashboard_snapshot.go

Fix dashboard snapshot deletion (#12025)

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

dashboard_test.go

provisioning: simplify db query

2018-04-10 12:30:37 +02:00

dashboard.go

provisioning: dont override permissions

2018-04-10 12:35:06 +02:00

dataproxy.go

Make golint happier

2018-03-22 22:38:44 +01: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 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

folder_permission_test.go

Make golint happier

2018-03-22 22:38:44 +01: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

Make golint happier

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

folder.go

Make golint happier

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

frontendsettings.go

remove internal influx ifql datasource

2018-06-14 20:42:33 +01:00

grafana_com_proxy.go

rename Context to ReqContext

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

http_server.go

routing: allows routes to be added to existing groups

2018-06-25 16:50:27 +02:00

index.go

Merge pull request #12169 from alexanderzobnin/feat-10796

2018-06-13 13:10:52 +02:00

login_oauth.go

go fmt fixes

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

login.go

Fix #9847 Add a generic signout_redirect_url to enable oauth logout

2018-05-27 14:52:50 +02:00

metrics.go

pkg: fix codespell issues

2018-04-13 20:31:29 +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

Support deleting empty playlist

2018-04-15 21:37:34 +02: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

enhance error message if phantomjs executable is not found

2018-06-25 16:06:52 +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

Make golint happier

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

team_test.go

teams: add team count when searching for team

2017-12-15 11:08:06 +01:00

team.go

Make golint happier

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

user_test.go

admin: adds paging to global user list

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

user.go

Make golint happier

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