Torkel Ödegaard 41e01184aa Merge branch 'master' into develop		2017-09-18 12:32:29 +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	fixes broken tests 💥	2017-09-15 16:11:02 +02:00
null	fix(alerting): fixed evaluation for no_value condition, fixes #7244 (#7247)	2017-01-13 12:32:30 +01:00
renderer	Merge branch 'develop' into panel-title-menu-ux	2017-08-02 09:56:08 +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