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
..
partials	Merge branch 'master' into external-plugins	2015-12-14 17:28:57 +01:00
all.js	add ui elements for plugins.	2015-12-04 19:21:33 +08:00
datasourceEditCtrl.js	fix(elasticsearch): refactoring of #3321	2015-12-03 18:30:36 +01:00
datasourcesCtrl.js	Renamed src directory to public	2015-03-29 12:57:28 +02:00
newOrgCtrl.js	refactoring: moving components -> core	2015-10-30 14:19:02 +01:00
orgApiKeysCtrl.js	Refactoring some api handlers to use the new Response return object	2015-05-18 21:23:40 +02:00
orgDetailsCtrl.js	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
orgUsersCtrl.js	feat(invite): more progress on completing invite form and actually creating a real user, #2353	2015-07-20 17:46:48 +02:00
plugin_directive.js	tune pluginConfig directive	2015-12-05 00:34:48 +08:00
plugin_srv.js	add ui elements for plugins.	2015-12-04 19:21:33 +08:00
pluginEditCtrl.js	add ui elements for plugins.	2015-12-04 19:21:33 +08:00
pluginsCtrl.js	add ui elements for plugins.	2015-12-04 19:21:33 +08:00
userInviteCtrl.js	feat(invite): handling of existing org user case when inviting, #2353	2015-07-21 12:18:11 +02:00