Daniel Lee
fda7e686f3
Merge pull request #15205 from seanlaff/12556-oauth-pass-thru
...
Add oauth pass-thru option for datasources
2019-03-25 21:52:20 +01:00
Sean Lafferty
b696492891
Rename dispatched commands to make them easy to grok
2019-03-20 14:32:41 -04:00
Leonard Gram
a615b78f8a
permissions: removes global access to bus from MakeUserAdmin.
2019-03-19 14:01:20 +01:00
Leonard Gram
adf0390b2c
teams: local access to bus, moving away from dep on global.
2019-03-19 14:01:20 +01:00
Leonard Gram
6589a4e55f
teams: better names for api permissions.
2019-03-19 14:01:20 +01:00
Leonard Gram
9f8e43916d
permissions: refactor.
2019-03-19 14:01:19 +01:00
Leonard Gram
3f57a81c47
teams: cleanup.
2019-03-19 14:01:16 +01:00
Leonard Gram
fc0461134f
dashboards: simplified code.
2019-03-19 14:01:15 +01:00
Hugo Häggmark
b60e71c28b
teams: moved logic for searchteams to backend
2019-03-19 14:01:15 +01:00
Hugo Häggmark
782b5b6a3a
teams: viewers and editors can view teams
2019-03-19 14:01:14 +01:00
Leonard Gram
c420af16b1
teams: editor/viewer team admin cant remove the last admin.
2019-03-19 14:01:14 +01:00
Leonard Gram
c823ad5de7
team: uses PermissionType instead of int64 for permissions.
2019-03-19 14:01:13 +01:00
Leonard Gram
21d3d27452
teams: editors can't remove the last admin from a team.
2019-03-19 14:01:13 +01:00
Leonard Gram
b783fa7039
team: renames teams.CanUpdate teamguardian.CanAdmin
2019-03-19 14:01:12 +01:00
Hugo Häggmark
a90b3e331e
config: updated feature toggle name
2019-03-19 13:59:39 +01:00
Leonard Gram
0b209de5d1
dashboard: only admin permission added to dashboard in folder.
2019-03-19 13:57:30 +01:00
Leonard Gram
d593ffe3c1
dashboards: better error handling
2019-03-19 13:57:30 +01:00
Leonard Gram
89d4db8eb6
teams: team listing shows only your teams (editors).
2019-03-19 13:57:29 +01:00
Leonard Gram
1f949e58e1
teams: teams guard on all teams update methods.
2019-03-19 13:57:29 +01:00
Leonard Gram
23231e6d51
teams: added delete team guard
2019-03-19 13:57:29 +01:00
Leonard Gram
8e7a8282c1
teams: removed feature toggle as it is already in middleware
2019-03-19 13:57:28 +01:00
Leonard Gram
d668550aa2
teams: added feature toggle and refactor tests
2019-03-19 13:57:28 +01:00
Leonard Gram
0d61f89577
teams: cleanup.
2019-03-19 13:57:28 +01:00
Hugo Häggmark
5adde259d3
teams: team update test
2019-03-19 13:57:26 +01:00
Hugo Häggmark
074ebf0f48
teams: only write error message if error
2019-03-19 13:57:25 +01:00
Leonard Gram
2a88052c14
teams: can update team members permission.
2019-03-19 13:57:23 +01:00
Leonard Gram
af4994ba16
teams: editor added as admin for created teams.
2019-03-19 13:57:22 +01:00
Leonard Gram
22e098b830
teams: editors can work with teams.
2019-03-19 13:57:22 +01:00
Hugo Häggmark
efbd93f824
teams: show teams and plugins for editors that can own
2019-03-19 13:57:22 +01:00
Hugo Häggmark
124fb743e8
teams: make test cases pass again
2019-03-19 13:57:21 +01:00
Leonard Gram
da3dcd1918
folder: uses service to make user admin of created folder.
2019-03-19 13:57:21 +01:00
Leonard Gram
c8c004095c
permissions: broken out func for making creator admin.
2019-03-19 13:57:21 +01:00
Sean Lafferty
3f9a19dcd5
Merge branch 'master' into 12556-oauth-pass-thru
2019-03-14 13:18:00 -04:00
Andrej Ocenas
8221c4273f
Merge pull request #15998 from grafana/add-grafana-user-proxy-header
...
Add custom header with grafana user when using proxy
2019-03-14 17:29:06 +01:00
Carl Bergquist
23852b59c9
Merge pull request #15839 from grafana/15836_revoke_auth_tokens
...
Support list and revoke of user auth tokens in HTTP API
2019-03-14 17:12:49 +01:00
Andrej Ocenas
697a87b7b2
Add check so that header is not sent for anonymous users
2019-03-14 16:33:21 +01:00
Andrej Ocenas
bbdc1c0e64
Add custom header with grafana user and a config switch for it
2019-03-14 16:33:19 +01:00
Sean Lafferty
fcc18d8121
Change import path for social in the tests
2019-03-13 14:55:22 -04:00
Sean Lafferty
8d8119aa98
Change import path for social since it has moved
2019-03-13 14:34:55 -04:00
Sean Lafferty
8d19ca005f
Merge branch 'master' into 12556-oauth-pass-thru
2019-03-13 14:25:43 -04:00
Sean Lafferty
7e62394d01
Add function in ds_proxy to handle oauthPassThru headers
2019-03-13 13:45:32 -04:00
Sean Lafferty
4324a7f51a
Remove auth module from ds_proxy oauth test
2019-03-13 13:28:49 -04:00
Sean Lafferty
3b15e110a5
Get most recent oauth token from db, rather than lookup by auth_module
2019-03-13 13:22:22 -04:00
Torkel Ödegaard
71159fb606
Merge remote-tracking branch 'origin/master' into bar-gauge-poc
2019-03-13 08:26:06 +01:00
Torkel Ödegaard
647cb6ddae
Merge branch 'master' of https://github.com/joshuawoodward/grafana into joshuawoodward-master
2019-03-11 13:10:45 +01:00
Marcus Efraimsson
0cd5a6772d
feat(api): support list/revoke auth token in admin/current user api
2019-03-08 15:15:38 +01:00
Woodward, Joshua
946e542412
Make password hint configurable from settings/defaults.ini
2019-03-07 14:00:04 -08:00
Marcus Efraimsson
cf500f3157
restore to current folder when restoring old dashboard version
2019-03-06 14:38:40 +01:00
Hugo Häggmark
d3642a3e91
Moved Server Admin and children to separate menu item on Side Menu ( #15592 )
...
* Moved Server Admin and children to separate menu item on Side Menu
* Removed style guide after PR comments
2019-03-05 13:02:41 +01:00
Johannes Schill
a81d5486b0
Viewers with viewers_can_edit should be able to access /explore ( #15787 )
...
* fix: Viewers with viewers_can_edit should be able to access /explore #15773
* refactoring initial PR a bit to simplify function and reduce duplication
2019-03-05 12:41:01 +01:00
