woodsaj 0903d5541b Merge branch 'master' of github.com:grafana/grafana into externalPlugin ... Conflicts: pkg/api/api.go pkg/api/api_plugin.go pkg/api/datasources.go pkg/api/frontendsettings.go pkg/api/index.go pkg/plugins/models.go pkg/plugins/plugins.go		2015-12-22 00:23:24 +08: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
app_plugin.go	allow app menu items to be selectivly pinned to the left nav menu	2015-12-18 15:10:52 +08:00
index.go	support separate css files for light/dark themes.	2015-12-03 12:29:57 +08:00
invite.go	feat(invite): can now add org user with sername again, #2353	2015-08-10 14:03:08 +02:00
models.go	Removed created_by and fixed gofmt	2015-12-18 02:30:20 -08: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
user.go	feat(signup): progress on new sign up and email verification flow, #2353	2015-08-28 15:14:24 +02:00