Torkel Ödegaard fc8f0721cd Merge branch 'master' of github.com:grafana/grafana ... Conflicts: pkg/services/alerting/eval_context.go		2016-09-06 20:40:49 +02:00
..
admin	fix(): admin stats and postgres	2016-04-11 18:16:35 -04:00
alerting	Merge branch 'master' of github.com:grafana/grafana	2016-09-06 20:40:49 +02:00
annotations	feat(profiling): refactorign profiling code, #5286	2016-06-08 06:51:10 +02:00
dashboard	feat(alerting): Save As removes alerts from panels, closes #5965	2016-09-06 09:14:11 +02:00
dashlinks	ux(): form tweaks	2016-02-25 09:28:58 +01:00
org	Bugfix: org select btn was not working on profile (#5317)	2016-06-09 00:43:38 +02:00
panel	feat(alerting): progress on email notifications	2016-07-26 12:29:52 +02:00
panellinks	ux(): worked more on new tabs view	2016-02-24 10:32:22 +01:00
playlist	fix(playlist): fixes failed refactoring	2016-03-07 11:10:10 +01:00
plugins	feat(alerting): making progress on alerting list, #5784	2016-08-16 09:52:45 +02:00
snapshot	ux(): update all confirm modals to new design	2016-03-04 20:57:10 +01:00
styleguide	feat(styleguide): removed unused/empty tabs	2016-06-17 14:18:24 +02:00
templating	adds check for making datasource template variables children of other template variables (#5717)	2016-08-05 10:03:46 +02:00
all.js	feat(preferences): theme and home dashbord settings now work work on profile and org settings page	2016-04-02 13:54:06 -07:00