3f9a19dcd5
Merge branch 'master' into 12556-oauth-pass-thru
2019-03-14 13:18:00 -04:00
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
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
697a87b7b2
Add check so that header is not sent for anonymous users
2019-03-14 16:33:21 +01:00
bbdc1c0e64
Add custom header with grafana user and a config switch for it
2019-03-14 16:33:19 +01:00
fcc18d8121
Change import path for social in the tests
2019-03-13 14:55:22 -04:00
8d8119aa98
Change import path for social since it has moved
2019-03-13 14:34:55 -04:00
8d19ca005f
Merge branch 'master' into 12556-oauth-pass-thru
2019-03-13 14:25:43 -04:00
7e62394d01
Add function in ds_proxy to handle oauthPassThru headers
2019-03-13 13:45:32 -04:00
4324a7f51a
Remove auth module from ds_proxy oauth test
2019-03-13 13:28:49 -04:00
3b15e110a5
Get most recent oauth token from db, rather than lookup by auth_module
2019-03-13 13:22:22 -04:00
71159fb606
Merge remote-tracking branch 'origin/master' into bar-gauge-poc
2019-03-13 08:26:06 +01:00
647cb6ddae
Merge branch 'master' of https://github.com/joshuawoodward/grafana into joshuawoodward-master
2019-03-11 13:10:45 +01:00
0cd5a6772d
feat(api): support list/revoke auth token in admin/current user api
2019-03-08 15:15:38 +01:00
946e542412
Make password hint configurable from settings/defaults.ini
2019-03-07 14:00:04 -08:00
cf500f3157
restore to current folder when restoring old dashboard version
2019-03-06 14:38:40 +01:00
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
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
5638c67be8
org admins should only be able to access org admin pages
2019-03-04 15:51:18 +01:00
a29b99b96b
only editor/admin should have access to alert list/notifications pages
2019-03-04 15:48:07 +01:00
b4df0e73cd
Merge pull request #15706 from grafana/15656-playlists-with-tags-rebased
...
wip: Fix playlists "by tags"
2019-03-04 09:00:28 +00:00
41024c29bb
Return 404 on user not found ( #15606 )
...
Return 404 on user not found
closes #10506
2019-03-02 20:34:48 +01:00
8d5ccc7831
fix: Return url when query dashboards by tag
2019-02-28 10:44:39 +01:00
60fef31748
moves social package to /login
...
ref #14679
2019-02-25 15:30:40 +01:00
8a3a3cccc3
moves metric package to /infra
...
ref #14679
2019-02-24 21:12:51 +01:00
769ad21e16
Moved variable to config struct after PR comments
2019-02-22 14:39:22 +01:00
9c9691f7af
Added feature toggle editors_can_own
2019-02-22 14:39:22 +01:00
dafcfd70a7
Fixed bug with getting teams for user
2019-02-22 14:07:18 +01:00
5f56a07a23
Merge branch 'master' into bar-gauge-poc
2019-02-19 15:43:08 +01:00
df170aee16
Updated explore icon and style tweaks
...
Lowered icon size and improved paddings, tried to align placement between dashboard and explore
2019-02-18 18:26:24 +01:00
3dae915b23
Bar gauge icon updated
2019-02-16 15:47:35 +01:00
3b0ae4bd0a
Merge pull request #15368 from grafana/15217-panels-without-queries
...
POC: Panels without queries can skip DataPanel
2019-02-13 08:06:25 +01:00
a1453607a9
Changed noQueries to a dataFormats array that will allow a panel to define supported formats and prefered (first in array)
2019-02-12 16:05:29 +01:00
e163aadfe4
use authtoken for session quota restrictions
...
closes #15360
2019-02-12 15:10:55 +01:00
075fb8e91c
chore: Rename isDataPanel to noQueries
2019-02-12 12:28:53 +01:00
c4b2dcefbe
feat: Introduce IsDataPanel attribute to plugin.json
2019-02-12 12:28:53 +01:00
a1cd550df4
revert ds_proxy timeout and implement dataproxy timeout correctly
2019-02-11 13:42:05 +01:00
c71904e326
Merge pull request #15239 from grafana/auth_token_middleware_refactor
...
Auth token package and middleware refactoring
2019-02-07 14:24:23 +01:00
78ea7ae783
Merge pull request #15212 from grafana/dashboard-react-page
...
Dashboard react page
2019-02-07 14:23:44 +01:00
8678620730
move UserToken and UserTokenService to models package
2019-02-06 16:55:12 +01:00
a60124a88c
change UserToken from interface to struct
2019-02-06 16:30:50 +01:00
4de9e3598b
Address review comments
2019-02-06 06:41:39 +10:00
871c84d195
changes needed for api/middleware due to configuration settings
2019-02-05 21:14:23 +01:00
1d1b617cee
remove unused code
2019-02-05 21:08:55 +01:00
3d5ca99d53
Merge branch 'dashboard-react-page' of github.com:grafana/grafana into dashboard-react-page
2019-02-05 09:24:14 +01:00
a7a964ec19
Added PATCH verb end point for annotation op
...
Added new PATCH verb annotation endpoint
Removed unwanted fmt
Added test cases for PATCH verb annotation endpoint
Fixed formatting issue
Check arr len before proceeding
Updated doc to include PATCH verb annotation endpt
2019-02-05 09:43:17 +10:00
d53e64a32c
move auth token middleware/hooks to middleware package
...
fix/adds auth token middleware tests
2019-02-05 00:21:05 +01:00
70974c01f2
Added playlist controls to new react DashNav
2019-02-04 21:08:30 +01:00
fb3c510178
Merge branch 'master' into delete_session_on_logout
2019-02-04 20:23:05 +01:00
cfd8eb5167
now /api/login/ping returns Response
2019-02-04 17:37:07 +01:00
