Torkel Ödegaard
46a75099d8
Merge pull request #16116 from SGI495/master
...
Don't include non-existing image in MS Teams alert
2019-03-22 09:34:56 +01:00
Magnus Berglund
e6623de6b2
Rewrote creation of images tag
2019-03-20 18:59:13 +01:00
Magnus Berglund
0511095303
Added missing commas
2019-03-20 18:42:48 +01:00
Magnus Berglund
0de77598d7
Don't include non-existing image in MS Teams alert
...
If an image section is included in the JSON payload for MS Teams alerts
when no image URL exists, rendering of the alert in the client fails.
This change makes sure that an image section is only included in the
JSON payload if an image URL exists.
Closes #16082
2019-03-20 18:23:36 +01:00
Hugo Häggmark
53c74fa2f5
teams: refactor so that you can only delete teams if you are team admin
2019-03-19 14:01:21 +01: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
9f33f00343
teams: refactor.
2019-03-19 14:01:19 +01:00
Leonard Gram
9f8e43916d
permissions: refactor.
2019-03-19 14:01:19 +01:00
Leonard Gram
b796027bc6
teams: refactor.
2019-03-19 14:01:19 +01:00
Leonard Gram
d1481cac50
teams: refactored db code.
2019-03-19 14:01:18 +01:00
Hugo Häggmark
6a63725df0
teams: comment explaining input validation
...
Co-Authored-By: xlson <leo@xlson.com>
2019-03-19 14:01:17 +01:00
Leonard Gram
ccfd6789ca
teams: cleanup.
2019-03-19 14:01:16 +01:00
Leonard Gram
c420af16b1
teams: editor/viewer team admin cant remove the last admin.
2019-03-19 14:01:14 +01:00
Hugo Häggmark
246e128048
teams: changed permission to permission type instead of int
2019-03-19 14:01:14 +01:00
Hugo Häggmark
c826f39a8b
teams: defaulting invalid permission level to member permission level
2019-03-19 14:01:13 +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
Leonard Gram
a6a3d698da
teams: cleanup.
2019-03-19 13:57:30 +01:00
Leonard Gram
0b209de5d1
dashboard: only admin permission added to dashboard in folder.
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
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
Leonard Gram
3be1d71f1f
teams: test refactorings.
2019-03-19 13:57:27 +01:00
Leonard Gram
319879cfa8
teams: bugfix, user pointer.
2019-03-19 13:57:27 +01:00
Leonard Gram
90e9fda90c
teams: start of team update guardian for editors
2019-03-19 13:57:26 +01:00
Hugo Häggmark
5adde259d3
teams: team update test
2019-03-19 13:57:26 +01:00
Hugo Häggmark
3c46b786d2
teams: change back to permissionlevel for Member to 0
2019-03-19 13:57:26 +01:00
Hugo Häggmark
3c74ac3044
teams: update only the selected user
2019-03-19 13:57:25 +01:00
Leonard Gram
aedc478208
teams: test for update team member.
2019-03-19 13:57:24 +01:00
Leonard Gram
2a88052c14
teams: can update team members permission.
2019-03-19 13:57:23 +01:00
Hugo Häggmark
7888457aae
teams: basic ui for permission in team members view
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
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
Leonard Gram
e174f7c20b
folders: admin for created folders
2019-03-19 13:57:20 +01:00
Leonard Gram
e294252e92
dashboards: user automatically becomes admin for created dashboards
2019-03-19 13:57:20 +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
Carl Bergquist
291ffcb75b
Merge pull request #15457 from bergquist/distributed_cache
...
Distributed cache
2019-03-14 16:16:39 +01:00
zhulongcheng
755f60358b
Add more info to victorOps alert notifications
2019-03-14 15:47:11 +08:00
Torkel Ödegaard
5fab1e89d3
Merge pull request #15897 from grafana/revert-15608-fix-datasource-update
...
Revert "Fix Datasource Update to no User/Password"
2019-03-11 10:58:28 +01:00
bergquist
66e71b66dd
renames key to cache_key
...
apparently key is a reserved keyword in mysql.
and the error messages doesnt mention that.
can I please have 6h back?
2019-03-11 10:49:55 +01:00
Carl Bergquist
f3753712e0
Revert "Fix Datasource Update to no User/Password"
2019-03-11 07:22:54 +01:00
genofire
6d578dd372
fix imageurl in notification test
...
skip unnecessary http -> https redirect, which could make problems on some notifiers
2019-03-11 00:23:07 +01:00
Torkel Ödegaard
570187384b
Merge pull request #13825 from athurg/optimize_dingding_alert_message
...
Optimize dingding alert message
2019-03-08 15:33:24 +01:00
Marcus Efraimsson
8029e48588
support get user tokens/revoke all user tokens in UserTokenService
2019-03-08 15:15:17 +01:00
Marcus Efraimsson
e3b3062107
add nil/length check when delete old login attempts
2019-03-08 13:31:46 +01:00
bergquist
d99af23946
add garbage collector for database cache
2019-03-08 09:09:27 +01:00
