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

..

components

feat(links): updated links to grafana.net

2016-07-11 19:07:16 +02:00

controllers

Merge branch 'v3.1.x'

2016-07-06 10:10:25 +02:00

directives

Merge branch 'export-dashboard'

2016-06-16 08:06:43 +02: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

Merge branch 'alerting' into alerting_notifications

2016-06-16 16:49:16 +02:00

services

Merge branch 'master' into alerting

2016-07-18 18:22:35 +02:00

utils

Hex units (#5530)

2016-07-07 08:54:51 +02:00

app_events.ts

refactor(): trying to move app events away from rootScope

2016-03-23 17:39:10 +01: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 'export-dashboard'

2016-06-16 08:06:43 +02: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

profiler.ts

fix(panel rendering): Fixed png panel rendering timing issue, #5606

2016-07-18 16:13:50 +02: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

fix(table): table column sorting fix

2016-04-28 15:48:49 +02:00

time_series2.ts

[Bug Fix] #5136 (#5142)

2016-05-23 20:58:21 +02:00

time_series.js

tech(systemjs): most things work

2015-12-18 10:28:00 +01:00