Torkel Ödegaard ee0e4d2b69 Merge branch 'master' into external-plugins ... Conflicts: public/app/plugins/panels/table/editor.ts public/views/index.html		2015-12-02 18:30:48 +01: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(external_plugin): lots of refactoring for side menu link extensions and view data, #3185	2015-11-20 09:43:10 +01:00
invite.go	feat(invite): can now add org user with sername again, #2353	2015-08-10 14:03:08 +02:00
models.go	Return correct updated+created timestamps to frontend	2015-11-21 05:03:00 -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