bc5fae5367
dashfolders: merge conflict
2018-01-25 14:54:50 +01:00
dbfaf5dac8
refactor: minor refactoring of PR #10560
2018-01-23 13:03:44 +01:00
a24aa3ae28
Merge branch 'generic-oauth-jwt' of https://github.com/DanCech/grafana
2018-01-23 12:44:27 +01:00
184e7046df
Merge pull request #10059 from FunkyM/local-image-store
...
Add support for internal image store
2018-01-22 11:03:00 +01:00
94a54248c1
dashfolders: show folders use can save to in picker
...
Instead of returning all folders a user has some sort of access to,
this change creates a new end point that returns folders the user
has write access to. This new endpoint is used in the folder picker
2018-01-20 01:58:28 +01:00
04e17c145f
support for decoding JWT id tokens
2018-01-18 18:25:58 -05:00
2d192f6cc8
Merge branch 'dashboard_permissions' of github.com:grafana/grafana into dashboard_permissions
2018-01-18 18:24:17 +01:00
cfa775e012
ds: updated ds nav
2018-01-18 18:17:58 +01:00
f64637c2c5
dashfolders: stop user locking themselves out of a folder
2018-01-18 14:30:04 +01:00
5eb36e65f2
use context over golang.org/x/net/context
2018-01-16 12:32:58 +01:00
a5830c6dbc
Merge remote-tracking branch 'upstream/master' into dashboard_permissions
2018-01-16 12:02:13 +01:00
dff66559e4
Use URLEncoding instead of StdEncoding to be sure state value will be corectly decoded ( #10512 )
2018-01-15 08:49:30 +01:00
c82e23d96e
imguploader: Add support for new internal image store ( #6922 )
2018-01-12 21:40:12 +01:00
545d7b9477
dashfolders: convert folder settings to React
2018-01-11 15:42:45 +01:00
c27a74bb6b
dashfolders: check permissions for new dashboard
...
ref #10275 . Use the parent folder permissions if new dashboard and
it does not have an id yet.
2018-01-09 14:44:36 +01:00
ae69c96518
dashfolders: allow any signed in user to get list of teams
2018-01-09 14:44:36 +01:00
b7f023bc26
fix gofmt warning
2018-01-09 14:44:36 +01:00
3ae1bf0c16
dashfolders: permissions for saving annotations
...
ref #10275 Use folder permissions instead of hard coded
permissions on the annotations routes.
2018-01-09 14:44:36 +01:00
61ed0b0381
dashfolders: remove role requirements on dashboard routes
...
and rely on the permission system instead.
2018-01-09 14:44:36 +01:00
a4972f44ad
fix missing profile icon ( #10469 )
2018-01-09 13:58:03 +01:00
c42a232644
Merge branch 'react-mobx'
2018-01-04 09:12:57 +01:00
029317ed18
tech: alert list react migration progress
2017-12-31 14:16:19 +01:00
8a5fe5b0df
renderer: avoid calling Handle twice
2017-12-28 14:37:10 +01:00
af34f9977e
Add avatar to team and team members page ( #10305 )
...
* teams: add db migration for email column in teams table
* teams: /teams should render index page with a 200 OK
* teams: additional backend functionality for team and team members
Possibility to save/update email for teams.
Possibility to retrive avatar url when searching for teams.
Possibility to retrive avatar url when searching for team members.
* teams: display team avatar and team member avatars
Possibility to save and update email for a team
* teams: create team on separate page instead of modal dialog
2017-12-20 21:20:12 +01:00
36fe8f5873
menu: fixed create default url
2017-12-15 15:17:05 +01:00
a8a5f8181b
fix: viewers can edit now works correctly
2017-12-15 14:19:49 +01:00
2797e8e2d0
profile: use name or fallback for profile page
2017-12-15 13:06:11 +01:00
fdf4bad1b7
fix: sidemenu profile main text is now username instead of name
2017-12-15 13:03:07 +01:00
c395237710
Merge branch Grafana v5 'develop' branch
2017-12-15 12:06:09 +01:00
8905c8e5fb
Merge branch 'team_member_count' of https://github.com/bergquist/grafana into develop
2017-12-15 11:53:47 +01:00
256f7176a2
teams: add team count when searching for team
...
closes #10207
2017-12-15 11:08:06 +01:00
581257416e
Merge remote-tracking branch 'origin/develop-icons' into develop
2017-12-14 19:56:19 +01:00
cf7a49977f
proxyds: delete cookies except those listed in keepCookies
2017-12-14 11:46:44 +01:00
f1aa7dcd52
proxyds: failing test for keepCookies
...
If the cookies are specified in the keepCookies property then they
should not be deleted from proxied requests for data sources
2017-12-14 11:46:44 +01:00
e136b7c286
dashfolders: /dashboards should render index page with a 200 OK
2017-12-14 11:30:57 +01:00
f1b1dbc6dd
dashboard: fix test after merge conflict
2017-12-14 09:34:00 +01:00
e2bbb85daa
new icons created and added to nav
2017-12-13 17:48:44 -05:00
a7645b710d
Merge remote-tracking branch 'origin/master' into develop
2017-12-13 19:18:10 +01:00
35106537f2
Replace Read Only Editor role with ViewersCanEdit setting ( #10166 )
...
* removes readonly editor role
* adds viewersCanEdit setting
This enable you to allow viewers to edit/inspect
dashboards in grafana in their own browser without
allowing them to save dashboards
* remove read only editor option from all dropdowns
* migrates all read only viewers to viewers
* docs: replace readOnlyEditor with viewersCanEdit
2017-12-13 18:53:42 +01:00
7f0440fded
minor tweaks
2017-12-13 18:00:16 +01:00
ccbd18006e
ux: org user management changes
2017-12-13 13:16:44 +01:00
22aa1f7e42
ux: change members to users
2017-12-13 11:21:33 +01:00
05cc1f85c3
Merge branch 'refactor-user-group-to-team' of https://github.com/alexanderzobnin/grafana into user-group-to-team
2017-12-12 17:07:00 +01:00
89db9cc976
fix: fixed dashboard api tests
2017-12-12 16:15:24 +01:00
8a61e0967e
Merge branch 'master' into develop
2017-12-12 13:22:13 +01:00
cafed8ce8f
Merge branch 'master' into develop
2017-12-12 13:19:07 +01:00
ff1b71bc20
allow overriding dashboards from api
2017-12-12 13:18:00 +01:00
c68e7c7283
avatar: avoid concurrent map writes
2017-12-12 11:25:47 +01:00
26281dd9d8
refactor: format files by gofmt
2017-12-11 19:46:05 +03:00
5d70a36ad8
Merge pull request #10150 from jomenxiao/jomenxiao/render_setting_lang
...
[render image]add encoding param
2017-12-11 10:36:38 +01:00
Daniel Lee
Torkel Ödegaard
Carl Bergquist
Dan Cech
bergquist
m-pavel
Martin Szulecki
Alexander Zobnin
Marcus Efraimsson
Robin Gustafsson
Trent White