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

..

jquery.flot.crosshair.js

Migrating to use bower for component dependencies

2015-06-13 20:53:08 +02:00

jquery.flot.fillbelow.js

Migrating to use bower for component dependencies

2015-06-13 20:53:08 +02:00

jquery.flot.fillbetween.js

Migrating to use bower for component dependencies

2015-06-13 20:53:08 +02:00

jquery.flot.gauge.js

Revert "Revert "Gauges""

2016-04-22 14:55:35 +02:00

jquery.flot.js

fix(flot): fixed flot issue introduced in alerting branch

2016-06-28 14:04:29 -07:00

jquery.flot.pie.js

Migrating to use bower for component dependencies

2015-06-13 20:53:08 +02:00

jquery.flot.selection.js

fix(graph): Fix so that zoom works even when no data exists, fixes #5570

2016-07-13 10:02:53 +02:00

jquery.flot.stack.js

Migrating to use bower for component dependencies

2015-06-13 20:53:08 +02:00

jquery.flot.stackpercent.js

Migrating to use bower for component dependencies

2015-06-13 20:53:08 +02:00

jquery.flot.time.js

Migrating to use bower for component dependencies

2015-06-13 20:53:08 +02:00