Torkel Ödegaard 0f6579801d Merge branch 'master' into websocket ... Conflicts: public/app/core/core.ts		2016-03-16 15:19:32 +01:00
..
components	ux(): added card layout selector and list view mode, #4364	2016-03-15 15:28:37 +01:00
controllers	Viewers restricted to edit panel	2016-02-12 07:34:56 -08:00
directives	feat(live): work on websocket data source, #3455	2016-03-14 13:20:55 +01:00
filters	feat(panel plugin): improving panel plugin model	2016-01-24 16:39:25 -05:00
live	feat(grafana_live): more work pushing data to websocket, #4355	2016-03-14 22:26:43 +01:00
routes	fix(): fixed changed partials paths	2016-03-11 13:02:21 +01:00
services	ux(): update all confirm modals to new design	2016-03-04 20:57:10 +01:00
utils	fix typo	2016-03-16 09:06:44 -03:00
config.js	feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185	2015-11-20 09:43:10 +01:00
core_module.ts	tech(systemjs): more stuff is starting to work	2015-12-17 16:30:53 +01:00
core.ts	Merge branch 'master' into websocket	2016-03-16 15:19:32 +01:00
jquery_extended.js	refactoring: move moving stuff around	2015-10-30 15:04:27 +01:00
lodash_extended.js	refactoring: move moving stuff around	2015-10-30 15:04:27 +01:00
mod_defs.d.ts	minor progress	2015-12-16 17:01:34 +01:00
partials.js	refactoring: move moving stuff around	2015-10-30 15:04:27 +01:00
settings.js	Merge branch 'master' into external-plugins	2015-12-02 18:30:48 +01:00
store.js	Fixed some broken HTML.	2015-11-24 07:29:52 +01:00
table_model.ts	angular2 test	2015-12-16 12:21:13 +01:00
time_series2.ts	fix(graph): legend height calculation now takes into account series hidden from legend, fixes #4245	2016-03-04 11:16:31 +01:00
time_series.js	tech(systemjs): most things work	2015-12-18 10:28:00 +01:00