Torkel Ödegaard 2ea548850e Merge branch 'master' into style-changes-bulletfactory ...

Conflicts:
	pkg/api/index.go
	public/less/sidemenu.less

2016-02-11 21:23:54 +01:00

..

api

Merge branch 'master' into style-changes-bulletfactory

2016-02-11 21:23:54 +01:00

bus

clarify which handler is not found

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

cmd

feat(plugins): better logging and handling of loading plugins, try to create plugins dir if it does not exist, fixes #3974

2016-02-10 11:03:12 +01:00

components

fix(png rendering): removed --ssl-protocol=any phantomjs param

2016-01-13 15:07:03 +01:00

events

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

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

log

prevent needless cpu burning in unused levels. fix #3898

2016-02-01 17:49:37 +13:00

login

fix(login): fix vulnerbility for timing attacks

2016-01-18 08:38:32 +01:00

metrics

feat(playlist): add usage statisics

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

middleware

Merge branch 'new_macaron'

2016-01-13 15:48:49 +01:00

models

feat(app routes): worked on app routes, added unit test, changed Grafana-Context header to start with X to be standard compliant, got cloud saas queries to work via app route feature and header template

2016-02-10 16:43:35 +01:00

plugins

feat(app routes): worked on app routes, added unit test, changed Grafana-Context header to start with X to be standard compliant, got cloud saas queries to work via app route feature and header template

2016-02-10 16:43:35 +01:00

services

feat(app routes): worked on app routes, added unit test, changed Grafana-Context header to start with X to be standard compliant, got cloud saas queries to work via app route feature and header template

2016-02-10 16:43:35 +01:00

setting

feat(macaron): upgrades macaron version

2016-01-13 15:11:23 +01:00

social

gofmt happiness

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

util

Merge pull request #3830 from raintank/apiPlugin

2016-01-29 17:17:37 -05:00