Torkel Ödegaard 49a0ea53c7 Merge branch 'develop' of github.com:grafana/grafana into dashboard_snapshot_poc ...

Conflicts:
	src/app/features/dashboard/partials/shareDashboard.html

2015-03-22 22:04:13 -04:00

..

api

Merge branch 'develop' of github.com:grafana/grafana into dashboard_snapshot_poc

2015-03-22 22:04:13 -04:00

bus

Worked on event system, needs a little more work

2015-02-04 15:37:26 +01:00

cmd

Added server metrics

2015-03-22 15:14:00 -04:00

components

fixes #1619 Secure PhantomJS Png rendering

2015-03-21 07:14:13 +08:00

events

Big Backend Refatoring: Renamed Account -> Org

2015-02-23 20:07:49 +01:00

log

Progress on deb and rpm packaging, renamed config files, added file logging, #1476

2015-03-03 10:18:37 +01:00

metrics

Updated conf description, metrics interval

2015-03-22 16:30:28 -04:00

middleware

Added server metrics

2015-03-22 15:14:00 -04:00

models

Merge branch 'develop' of github.com:grafana/grafana into dashboard_snapshot_poc

2015-03-22 22:04:13 -04:00

plugins

Fixed plugins go test

2015-02-28 11:38:44 +01:00

services

Merge branch 'develop' of github.com:grafana/grafana into dashboard_snapshot_poc

2015-03-22 22:04:13 -04:00

setting

Added server metrics

2015-03-22 15:14:00 -04:00

social

Changed go package path

2015-02-05 10:37:13 +01:00

util

Began work on deb and rpm packaging, #1476

2015-03-02 15:50:03 +01:00