Torkel Ödegaard 201f50b121 Merge branch 'master' into external-plugins ... Conflicts: pkg/api/login.go public/app/core/routes/all.js public/app/core/table_model.ts public/app/panels/table/table_model.ts public/app/plugins/panels/table/editor.ts public/app/plugins/panels/table/table_model.ts		2015-12-14 17:28:57 +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	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	add with_credentials to datasource model	2015-12-09 14:44:28 +09: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
plugin_bundle.go	add pluginBundle backend api methods and SQL storage	2015-12-03 23:43:55 +08:00
user.go	feat(signup): progress on new sign up and email verification flow, #2353	2015-08-28 15:14:24 +02:00