Torkel Ödegaard b0fe69822a Merge branch 'master' into alerting ... Conflicts: public/app/core/services/alert_srv.ts public/app/partials/confirm_modal.html		2016-07-18 18:22:35 +02:00
..
base	feat(alerting): thresholds rethink	2016-06-14 16:45:51 +02:00
components	Merge branch 'master' into alerting	2016-07-18 18:22:35 +02:00
layout	remove height: 100% on .main-view	2016-05-23 11:45:54 -04:00
mixins	ux(query-editors): more progress on elastic query editor	2016-04-17 22:04:43 -04:00
pages	Merge branch 'master' into alerting	2016-07-18 18:22:35 +02:00
utils	feat(import): things are starting to work	2016-05-13 11:26:02 +02:00
_grafana.scss	Merge branch 'master' into query-editor-style	2016-04-16 13:46:05 -04:00
_old_responsive.scss	fix(css): added responsive media query for phones that fix header wrap	2016-06-29 14:35:58 -07:00
_variables.dark.scss	Merge branch 'master' into alerting	2016-06-16 16:29:41 +02:00
_variables.light.scss	Merge branch 'master' into alerting	2016-07-11 18:28:07 +02:00
_variables.scss	ux(): button style tweaks, align with grafana.net styles more	2016-03-20 10:31:50 +01:00
.sass-lint.yml	ux(): added sass linter, almost no rules enabled yet	2016-02-20 18:31:09 +01:00
fonts.scss	fix(fonts): move icon fonts back to main css	2016-03-16 14:45:39 +01:00
grafana.dark.scss	ux(): datasource form tweaks	2016-02-16 07:57:58 +01:00
grafana.light.scss	ux(): datasource form tweaks	2016-02-16 07:57:58 +01:00