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

Conflicts:
	pkg/components/imguploader/s3uploader.go

2016-09-07 10:14:36 +02:00

..

apikeygen

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

dynmap

lib(): added simplejson lib

2016-03-11 23:28:33 +01:00

imguploader

Merge branch 'master' of github.com:grafana/grafana

2016-09-07 10:14:36 +02:00

renderer

feat(alerting): working on alert notification and image rendering

2016-07-30 13:36:21 +02:00

simplejson

feat(plugins): dashboard import for data sources is working! #4298

2016-03-12 10:13:49 +01:00