Torkel Ödegaard c60d737928 Merge branch 'v3.0.x' ...

Conflicts:
	package.json

2016-05-23 09:29:14 +02:00

..

avatar

fix(postgres): fixed issue with postgres caused by wrong prefrences table types, dropped table and created it with correct column types, fixes #4558

2016-04-05 11:24:21 -04:00

cloudwatch

(cloudwatch) fix wrong cache key of credentials (#5124)

2016-05-21 09:02:04 +02:00

dtos

feat(pluginlist): link in plugin list now goes to app/plugin default nav unless enabled

2016-05-03 19:00:42 +02:00

live

feat(grafana_live): more work pushing data to websocket, #4355

2016-03-14 22:26:43 +01:00

pluginproxy

fix(logging): change log level to trace for plugin proxy logging call, fixes #5126

2016-05-23 07:55:55 +02: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

fix(): made plugin settings api call accessable for viewer roles

2016-04-13 13:03:41 -04: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

fix(snapshots): sets default value for snapshot name

2016-04-21 09:59:48 +02:00

dashboard.go

feat(preferences): theme and home dashbord settings now work work on profile and org settings page

2016-04-02 13:54:06 -07:00

dataproxy_test.go

Fix dataproxy_test.go tests

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

dataproxy.go

fix(influxdb): minor fix for duplicated db param to proxied influxdb call, fixes #4703

2016-04-25 09:26:47 +02:00

datasources.go

refactor(): minor refactoring of #4455

2016-03-23 15:09:48 +01:00

frontendsettings.go

feat(angular): disable debug in production for angular compiler

2016-05-17 15:00:48 +02:00

gnetproxy.go

feat(): plugin list panel

2016-04-08 16:42:33 -04:00

index.go

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

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(pluginlist): link in plugin list now goes to app/plugin default nav unless enabled

2016-05-03 19:00:42 +02:00

preferences.go

feat(preferences): theme and home dashbord settings now work work on profile and org settings page

2016-04-02 13:54:06 -07:00

quota.go

fix getting default quota as map[string]int64

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

render.go

[RenderToPng fix] (#4901)

2016-05-04 09:07:45 +02:00

search.go

feat(websockets): inital work on websockets, #4355

2016-03-14 11:59:51 +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

fix(org switch): fixed issue with switching orgs, fixes #4614

2016-04-09 13:27:06 -04:00