2 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	8ff48c126a	fix(merge): minor merge fix	2016-01-13 15:51:47 +01:00
woodsaj	c35b51a268	refactor. ... Rename externalPlugin to apiPlugin Rename bundle to app Move js, css, menuItem and staticRoot to be properties os App Add "app" field to panel, datasource and api plugin models. If populated then the plugin is only enabled if the specific app is enabled for the Org. If app is "", then the plugin is enabled for all orgs and can't be disabled.	2015-12-17 23:53:58 +08:00