Torkel Ödegaard ece8a925a6 Merge branch 'master' of github.com:grafana/grafana ...

Conflicts:
	examples/nginx-app/package.json
	examples/nginx-app/plugin.json

2016-03-11 12:39:10 +01: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

index.go

ux(): added New and Import under divider to dashboard subnav

2016-02-22 21:51:31 +01:00

invite.go

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

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

models.go

Implemented GetDataSourceIdByName API

2016-03-10 01:31:10 -08: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

plugins.go

feat(plugins): more work on plugin dashboard install, #4298

2016-03-11 12:31:56 +01:00

user.go

feat(signup): progress on new sign up and email verification flow, #2353

2015-08-28 15:14:24 +02:00