Torkel Ödegaard ece8a925a6 Merge branch 'master' of github.com:grafana/grafana ...

Conflicts:
	examples/nginx-app/package.json
	examples/nginx-app/plugin.json

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

..

avatar

feat(avatar): added server side proxy and cache of gravatar requests

2016-02-21 00:06:28 +01:00

cloudwatch

(cloudwatch) add metrics/dimensions of AWS/Events and AWS/Logs

2016-03-11 12:11:01 +09:00

dtos

Merge branch 'master' of github.com:grafana/grafana

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

pluginproxy

feat(plugins): fixed failing api test

2016-02-26 20:27:29 +01:00

static

feat(macaron): upgrades macaron version

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

admin_users.go

fixed gofmt tests

2015-11-16 07:28:38 -08:00

admin.go

Fixed api bugs, stats endpoint working

2016-01-24 21:18:17 -08:00

api_test.go

Refactoring, worked on middleware unit tests, and began thinking about api unit tests, #1921

2015-05-01 16:23:36 +02:00

api.go

Merge branch 'master' of github.com:grafana/grafana

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

apikey.go

More work on email and notification infra #1456

2015-06-05 11:08:19 +02:00

app_routes.go

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

common.go

fix(build): fixed dependency and build issue

2016-01-13 15:38:54 +01:00

dashboard_snapshot.go

Fixed angularjs variable names

2016-01-19 23:23:44 -08:00

dashboard.go

Fix typo in function name

2016-02-29 10:52:57 -08:00

dataproxy_test.go

Fix dataproxy_test.go tests

2015-09-10 13:27:49 +00:00

dataproxy.go

fix(dataproxy): remove partially used cache

2016-02-23 13:05:47 +01:00

datasources.go

Implemented GetDataSourceIdByName API

2016-03-10 01:31:10 -08:00

frontendsettings.go

feat(plugins): made it possible to have relative plugin template urls

2016-02-09 18:17:32 +01:00

index.go

feat(navigation): hide new and import for viewers

2016-03-10 16:38:16 +01:00

login_oauth.go

enhance quota support.

2015-09-11 23:17:10 +08:00

login.go

Do not set remember me cookie when days are set to zero

2016-03-07 17:26:31 +01:00

metrics.go

Changed go package path

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

org_invite.go

fix(invite): fixes to org invite stuff, #2630

2015-09-01 12:35:06 +02:00

org_users.go

Worked on user administration page, a grafana server admin can now add and edit organization roles for any user, #2014

2015-05-19 11:47:14 +02:00

org.go

fix(api): org name taken error now returns HTTP status code 409, closes

2016-02-12 10:01:52 +01:00

password.go

Lots of work on user password reset, #1456

2015-06-08 13:39:02 +02:00

playlist_play.go

remove unused imports

2016-02-15 10:34:47 +01:00

playlist.go

feat(playlist): render playlists if playlist id is invalid

2016-03-01 13:50:55 +01:00

plugins.go

feat(plugins): progress on dashboard installs , #4298

2016-03-11 09:57:20 +01:00

quota.go

fix getting default quota as map[string]int64

2015-09-15 20:31:58 +08:00

render.go

feat(renderer): add timeout for the renderer api

2016-03-10 16:02:10 +01:00

search.go

feat(dashslist): make sure dashbords exists in recently viewd dashboards

2016-03-05 12:27:37 +01:00

signup.go

minor spelling corrections

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

stars.go

Api handler refactoring using the wrap and response func/type, fixed small issue in influxdb 0.9 response handling

2015-05-20 14:59:38 +02:00

user.go

Api handler refactoring using the wrap and response func/type, fixed small issue in influxdb 0.9 response handling

2015-05-20 14:59:38 +02:00