Torkel Ödegaard 0f6579801d Merge branch 'master' into websocket ...

Conflicts:
	public/app/core/core.ts

2016-03-16 15:19:32 +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

ux(): began work on updating data source list to cards view

2016-03-15 20:29:35 +01: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

ux(): fixes to cards and sorting plugin list, #4364

2016-03-15 15:52:29 +01:00

stream.go

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

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

user.go

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

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