Torkel Ödegaard 9605ab4475 Merge branch 'master' into develop

2017-10-26 15:59:50 +02:00

..

acl.go

acl fixes

2017-06-22 17:10:43 -04:00

alerting.go

feat(alerting): shows when no_data triggered alerts

2017-01-17 09:49:25 +01:00

annotations.go

annotations: add endpoint for writing graphite-like events (#9495)

2017-10-12 10:12:15 +02:00

apikey.go

New implementation for API Keys that only stores hashed api keys, and the client key is base64 decoded json web token with the unhashed key, Closes #1440

2015-02-26 17:23:28 +01:00

dashboard.go

dashfolders: use canadmin permission in settings menu

2017-06-23 00:36:17 +02:00

datasource.go

datasources: change to optimisic concurrency

2017-10-23 07:55:16 +02:00

index.go

newgrid: various fixes

2017-10-11 21:36:03 +02:00

invite.go

feat(invite): can now add org user with sername again, #2353

2015-08-10 14:03:08 +02:00

models.go

Merge branch 'master' into develop

2017-10-26 15:59:50 +02:00

org.go

feat(organization): added update org address to http api and to org details settings view, closes #2672

2015-09-08 14:22:44 +02:00

playlist.go

fix(playlist): fixed sorting issue with playlist playback, fixes #5467

2016-09-22 10:06:03 +02:00

plugins.go

plugins: added state property to plugins

2017-04-07 12:00:03 +02:00

prefs.go

feat(preferences): theme and home dashbord settings now work work on profile and org settings page

2016-04-02 13:54:06 -07:00

stream.go

feat(grafana_live): more work pushing data to websocket, #4355

2016-03-14 22:26:43 +01:00

user.go

fix: update user permissions validation was not working properly, fixes #8977

2017-08-03 08:56:34 +02:00