Torkel Ödegaard 9a7817a271 Merge branch 'master' into footer ... Conflicts: pkg/api/frontendsettings.go		2016-05-23 20:59:23 +02: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
index.go	feat(footer): began work on page footer	2016-05-03 09:00:58 +02:00
invite.go	feat(invite): can now add org user with sername again, #2353	2015-08-10 14:03:08 +02:00
models.go	feat(preferences): theme and home dashbord settings now work work on profile and org settings page	2016-04-02 13:54:06 -07: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
plugins.go	feat(pluginlist): link in plugin list now goes to app/plugin default nav unless enabled	2016-05-03 19:00:42 +02:00
prefs.go	feat(preferences): theme and home dashbord settings now work work on profile and org settings page	2016-04-02 13:54:06 -07:00
stream.go	feat(grafana_live): more work pushing data to websocket, #4355	2016-03-14 22:26:43 +01:00
user.go	feat(signup): progress on new sign up and email verification flow, #2353	2015-08-28 15:14:24 +02:00