Torkel Ödegaard c711fb67c8 Merge branch 'master' into websocket 10 gadi atpakaļ
..
apikey.go c75aa23092 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 11 gadi atpakaļ
index.go acfc119409 ux(): added New and Import under divider to dashboard subnav 10 gadi atpakaļ
invite.go e53c1e39d3 feat(invite): can now add org user with sername again, #2353 10 gadi atpakaļ
models.go e4c0c39fbf ux(): began work on updating data source list to cards view 10 gadi atpakaļ
org.go fad1d4cf98 feat(organization): added update org address to http api and to org details settings view, closes #2672 10 gadi atpakaļ
plugins.go 10df9dc8c3 feat(plugins): finished app navigation enhancements, closes #4434 10 gadi atpakaļ
stream.go 2e1f26096f feat(grafana_live): more work pushing data to websocket, #4355 10 gadi atpakaļ
user.go de0f04ec3c feat(signup): progress on new sign up and email verification flow, #2353 10 gadi atpakaļ