12 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	ba6573af61	Merge branch 'master' into export-dashboard ... Conflicts: public/app/features/dashboard/submenu/submenu.ts	2016-05-25 12:32:56 +02:00
Torkel Ödegaard	1da149d9e1	feat(annotations): annotations can now use a template variable as data source, closes #5054	2016-05-23 09:28:14 +02:00
Torkel Ödegaard	7cd663bbe8	feat(import): more import work	2016-05-14 10:00:43 +02:00
Torkel Ödegaard	0d85254a19	fix(annotations): Fixed issue with entering annotation edit view, fixes #4857	2016-04-29 23:14:39 +02:00
Torkel Ödegaard	8b4c7c94b8	feat(templating): completed work on templating as data source, closes #816	2016-04-28 19:31:43 +02:00
Torkel Ödegaard	13471ae2c4	feat(templating): templated ds progress	2016-04-16 13:43:16 -04:00
Torkel Ödegaard	15546dd84e	feat(plugins): added better error message when trying to load data source plugin module that is missing datasource constructor	2016-01-09 19:14:59 +01:00
Torkel Ödegaard	cf98a16db0	feat(plugins): made data source custom edit view into a directive instead of html path config in plugin.json	2016-01-09 18:07:42 +01:00
Torkel Ödegaard	c5635f9c89	feat(plugins): changed what datasources should return, they should now return the datasource constructor	2016-01-09 13:21:16 +01:00
Torkel Ödegaard	ca84ef38f8	angular2 test	2015-12-16 12:21:13 +01:00
Torkel Ödegaard	7ee290cc57	tech(systemjs): systemjs and jspm work	2015-12-15 17:56:16 +01:00
Torkel Ödegaard	d8f68eb118	refactoring: moving and renaming things	2015-10-30 16:06:29 +01:00