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

..

dtos

Adding snapshot storage and route, #1623

2015-03-21 10:56:26 -04:00

admin_settings.go

Worked on playlist update for Grafana 2.0, added dashboard search to playliststart view, #1460

2015-02-13 08:47:44 +01:00

admin_users.go

Added server metrics

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

api.go

more work on dashboard snapshots

2015-03-21 08:53:16 -04:00

apikey.go

New implementation for API Keys that only stores hashed api keys, and the client key is base64 decoded json web token with the unhashed key, Closes #1440

2015-02-26 17:23:28 +01:00

dashboard_snapshot.go

Adding snapshot storage and route, #1623

2015-03-21 10:56:26 -04:00

dashboard.go

Added server metrics

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

dataproxy_test.go

Fixed dataproxy test

2015-02-28 12:34:51 +01:00

dataproxy.go

Templating: Dashboard will now wait to load until all template variables that have refresh on load set or are initialized via url to be fully loaded and so all variables are in valid state before panels start issuing metric requests. Closes #1255

2015-03-14 15:29:41 -04:00

datasources.go

Added basic auth to data source edit/create, add support for basic auth in data source proxy code, Closes #1510

2015-03-02 09:58:35 +01:00

frontendsettings.go

Fixed anonymous access mode, Closes #1586

2015-03-11 17:34:11 +01:00

index.go

Added server metrics

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

login_oauth.go

Added server metrics

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

login.go

Added server metrics

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

metrics.go

Changed go package path

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

org_users.go

Big Backend Refatoring: Renamed Account -> Org

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

org.go

Added server metrics

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

render.go

fixes #1619 Secure PhantomJS Png rendering

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

search.go

Big Backend Refatoring: Renamed Account -> Org

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

signup.go

Added server metrics

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

stars.go

Changed go package path

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

user.go

Moved dashboard theme option from the dashboard to a persisted user setting, #1458

2015-02-28 14:30:08 +01:00