Torkel Ödegaard 28eae1e7ff Merge branch 'master' into export-dashboard ...

Conflicts:
	packaging/publish/publish.sh
	public/app/features/dashboard/dynamicDashboardSrv.js
	public/test/specs/dynamicDashboardSrv-specs.js

2016-05-12 10:50:37 +02:00

..

api

Merge branch 'master' into export-dashboard

2016-05-10 16:46:58 +02:00

bus

clarify which handler is not found

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

cmd

style(cli): add some color to error messages

2016-04-23 14:39:42 +02:00

components

[RenderToPng fix] (#4901)

2016-05-04 09:07:45 +02: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

new config option for source of %s in group_search_filter, useful for nested LDAP groups

2016-03-23 08:21:25 -04:00

metrics

stats(): updated stats

2016-04-10 18:36:54 -04:00

middleware

minor spelling corrections

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

models

fix(plugins): only add app nav link if it has any pages/dashboards with role matching current user, fixes #4784

2016-04-25 14:00:49 +02:00

plugins

Fix typo in error message from update checker

2016-05-10 16:06:51 +00:00

services

allow updates to secureJsonData.

2016-04-28 18:39:23 +08:00

setting

feat(update checks): started work on update checks

2016-04-11 12:21:48 -04: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