Torkel Ödegaard ee0e4d2b69 Merge branch 'master' into external-plugins ...

Conflicts:
	public/app/plugins/panels/table/editor.ts
	public/views/index.html

2015-12-02 18:30:48 +01:00

..

api

Merge branch 'master' into external-plugins

2015-12-02 18:30:48 +01:00

bus

clarify which handler is not found

2015-06-26 12:32:24 -07:00

cmd

feat(external plugins): worked on supporting external plugins better

2015-11-19 18:44:07 +01:00

components

Graph: fixed PNG rendering of panels with legend table to the right, #2185

2015-06-19 14:13:25 -04:00

events

feat(signup): progress on new sign up and email verification flow, #2353

2015-08-28 15:14:24 +02:00

log

Add config option to strip (most) colors from console logs

2015-10-01 13:16:23 -07:00

login

feat(external_plugin): lots of refactoring for side menu link extensions and view data, #3185

2015-11-20 09:43:10 +01:00

metrics

refactoring: minor refactoring and handling of known data source plugins

2015-10-26 16:37:45 +01:00

middleware

fix(logging): fixed so that router_logging = true actually logs all http requests, fixes #2902

2015-10-10 17:55:15 -04:00

models

Tired of gofmt

2015-11-20 04:52:50 -08:00

plugins

feat(plugins): made panels work as plugins

2015-11-21 13:46:43 +01:00

services

Used dialect for postgres

2015-11-07 05:21:22 -08:00

setting

feat(plugins): made plugins that live outside public work

2015-11-19 16:50:17 +01:00

social

gofmt happiness

2015-11-07 11:32:06 -06:00

util

feat(invite): progress on invite feature, #2353

2015-08-10 13:47:06 +02:00