Torkel Ödegaard ec0b09450c Merge branch 'export-dashboard' ...

Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go
	public/app/core/components/grafana_app.ts
	public/app/core/core.ts
	public/app/features/dashboard/dashboardCtrl.js

2016-06-16 08:06:43 +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

Add enhanced elasticbeanstalk metrics

2016-05-27 11:47:53 +09:00

dtos

Merge branch 'master' into export-dashboard

2016-05-25 12:32:56 +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

Merge branch 'export-dashboard'

2016-06-16 08:06:43 +02:00

apikey.go

More work on email and notification infra #1456

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

app_routes.go

feat(instrumentation): added gauge and http endpoint

2016-06-03 16:15:36 +02:00

common.go

feat(logging): error logging improvements

2016-06-11 12:16:33 +02:00

dashboard_snapshot.go

fix(snapshots): sets default value for snapshot name

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

dashboard.go

feat(logging): progress on new logging #4590

2016-06-07 09:29:47 +02:00

dataproxy_test.go

Fix dataproxy_test.go tests

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

dataproxy.go

feat(instrumentation): finial polish

2016-06-03 17:15:17 +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(import): import directly from grafana.net id/url now works

2016-05-27 16:11:05 +02:00

index.go

Merge branch 'export-dashboard'

2016-06-16 08:06:43 +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

Merge branch 'new-logger'

2016-06-08 08:09:59 +02: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(import): more import work

2016-05-14 10:00:43 +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(instrumentation): added some more timers

2016-06-03 17:00:39 +02: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

Set active org through admin api (#5179)

2016-05-26 06:51:23 +02:00