Torkel Ödegaard 0f6579801d Merge branch 'master' into websocket ...

Conflicts:
	public/app/core/core.ts

2016-03-16 15:19:32 +01:00

..

api

Merge branch 'master' into websocket

2016-03-16 15:19:32 +01:00

bus

clarify which handler is not found

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

cmd

Merge branch 'master' into cli_colors

2016-03-16 14:17:35 +01:00

components

feat(plugins): dashboard import for data sources is working! #4298

2016-03-12 10:13:49 +01:00

events

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

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

log

allow setting level on logger.

2016-02-18 16:46:47 +11:00

login

minor spelling corrections

2016-02-16 12:12:04 +11:00

metrics

feat(playlist): add usage statisics

2016-01-25 21:39:45 +01:00

middleware

minor spelling corrections

2016-02-16 12:12:04 +11:00

models

feat(plugins): dashboard import for data sources is working! #4298

2016-03-12 10:13:49 +01:00

plugins

Merge pull request #4361 from bergquist/remove_staticRoot

2016-03-15 10:07:08 +01:00

services

fix(datasource): when addding data source withCredentials did not get set, fixes #4389

2016-03-16 15:16:28 +01:00

setting

redact settings containing 'secret' besides 'password'

2016-03-01 13:50:45 -05:00

social

gofmt happiness

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

util

fix(plugins): fixes missed dist loading for plugindir

2016-03-03 11:04:26 +01:00