Torkel Ödegaard 50d82155ed Merge branch 'master' of https://github.com/williamjoy/grafana into williamjoy-master		2017-09-27 09:37:26 +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
dashdiffs	Optimize some wrong usage and spelling	2017-09-07 17:50:11 +08:00
dynmap	lib(): added simplejson lib	2016-03-11 23:28:33 +01:00
imguploader	Merge branch 'master' of https://github.com/williamjoy/grafana into williamjoy-master	2017-09-27 09:37:26 +02:00
null	fix(alerting): fixed evaluation for no_value condition, fixes #7244 (#7247)	2017-01-13 12:32:30 +01:00
renderer	fix: png rendering api & timeout parameter now works as it should AND default render timeout increased from 30 to 60 seconds, fixes #8710	2017-07-31 16:04:04 +02:00
securejsondata	Config Array Syntax (#8204)	2017-04-25 09:14:29 +02:00
simplejson	feat(plugins): dashboard import for data sources is working! #4298	2016-03-12 10:13:49 +01:00