woodsaj 0903d5541b Merge branch 'master' of github.com:grafana/grafana into externalPlugin ...

Conflicts:
	pkg/api/api.go
	pkg/api/api_plugin.go
	pkg/api/datasources.go
	pkg/api/frontendsettings.go
	pkg/api/index.go
	pkg/plugins/models.go
	pkg/plugins/plugins.go

2015-12-22 00:23:24 +08:00

..

api

Merge branch 'master' of github.com:grafana/grafana into externalPlugin

2015-12-22 00:23:24 +08: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

fix(windows): exclude syslog feature from windows builds

2015-12-14 16:16:36 +01: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

Merge pull request #3575 from piotr1212/no_username_in_render_logging

2015-12-21 13:31:10 +01:00

models

Merge branch 'master' of github.com:grafana/grafana into externalPlugin

2015-12-22 00:23:24 +08:00

plugins

Merge branch 'master' of github.com:grafana/grafana into externalPlugin

2015-12-22 00:23:24 +08:00

services

Merge branch 'master' of github.com:grafana/grafana into externalPlugin

2015-12-22 00:23:24 +08:00

setting

Merge pull request #3458 from improbable-io/use-memcache-for-session

2015-12-17 15:56:15 +01:00

social

gofmt happiness

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

util

#2834 - follow symlink

2015-10-08 00:22:09 -04:00