Torkel Ödegaard
05cc1f85c3
Merge branch 'refactor-user-group-to-team' of https://github.com/alexanderzobnin/grafana into user-group-to-team
2017-12-12 17:07:00 +01:00
Torkel Ödegaard
89db9cc976
fix: fixed dashboard api tests
2017-12-12 16:15:24 +01:00
Torkel Ödegaard
8a61e0967e
Merge branch 'master' into develop
2017-12-12 13:22:13 +01:00
Torkel Ödegaard
cafed8ce8f
Merge branch 'master' into develop
2017-12-12 13:19:07 +01:00
bergquist
ff1b71bc20
allow overriding dashboards from api
2017-12-12 13:18:00 +01:00
bergquist
c68e7c7283
avatar: avoid concurrent map writes
2017-12-12 11:25:47 +01:00
Alexander Zobnin
26281dd9d8
refactor: format files by gofmt
2017-12-11 19:46:05 +03:00
Carl Bergquist
5d70a36ad8
Merge pull request #10150 from jomenxiao/jomenxiao/render_setting_lang
...
[render image]add encoding param
2017-12-11 10:36:38 +01:00
jomenxiao
ad2a69bff4
add encoding param
2017-12-11 16:01:17 +08:00
bergquist
f7ed24475c
wait for all sub routines to finish
...
simple solution for waiting for all go sub routines to
finish before closing Grafana. We would use errGroup
here as well but I dont like spreading context's all
over the place.
closes #10131
2017-12-11 08:53:06 +01:00
Alexander Zobnin
5d3bfee2f1
refactor: user groups to teams, rename backend files
2017-12-08 18:51:59 +03:00
Alexander Zobnin
d8612380e9
refactor: rename User Groups to Teams
2017-12-08 18:25:45 +03:00
Marcus Efraimsson
b03b360414
dashfolders: Create nav model for folder page client side #10083
2017-12-08 14:08:16 +01:00
Marcus Efraimsson
017b337f00
dashfolders: create folder page
...
Fixes #10085
2017-12-07 19:32:38 +01:00
Marcus Efraimsson
2ea663df78
dashfolders: New Dashboard Folder page
...
Fixes #10083 . Permissions page is just a placeholder
for now.
2017-12-07 17:30:54 +01:00
bergquist
5aab6b5c20
removes last pieces of dashboard.json
2017-12-07 16:26:07 +01:00
bergquist
f5eac2e91d
dashboards as cfg: expose dashboard service as interface
2017-12-07 15:27:01 +01:00
bergquist
16f072b320
dashboards as cfg: move saving logic for dashboards into its own service
2017-12-07 15:27:01 +01:00
bergquist
9cebb23e01
dashboards as cfg: revert minor changes
2017-12-07 15:27:01 +01:00
Torkel Ödegaard
beb9f8ee74
Merge remote-tracking branch 'origin/master' into develop
2017-12-07 14:14:50 +01:00
Torkel Ödegaard
90bcec8178
nav: updated nav item id for manage dashboards
2017-12-05 12:25:59 +01:00
Torkel Ödegaard
90da964a14
refactoring PR #10068
2017-12-05 12:19:01 +01:00
Alexander Zobnin
4d7ff4de15
move import menu item to the original place
2017-12-04 18:00:22 +03:00
Alexander Zobnin
44ea0ff71d
Move import dashboard from modal to the page
2017-12-04 15:55:37 +03:00
bergquist
d6d64c53cd
typo 💥
2017-12-01 16:23:55 +01:00
Torkel Ödegaard
68580f06a3
page header now on 99% of pages
2017-12-01 13:49:15 +01:00
Torkel Ödegaard
6bff416430
navigation: more progress on new page header
2017-12-01 12:51:46 +01:00
Torkel Ödegaard
75bb894485
ux: new page-header design, most pages beside admin done
2017-12-01 11:32:00 +01:00
Torkel Ödegaard
e53b55479a
ux: made plugins page work
2017-12-01 10:47:21 +01:00
Torkel Ödegaard
6f5a9bf768
ux: new page header progress
2017-11-30 17:28:24 +01:00
Torkel Ödegaard
b2add1977a
ux: progress on new page header
2017-11-30 16:35:27 +01:00
Torkel Ödegaard
74ceb76ec0
ux: work on page header
2017-11-30 15:37:03 +01:00
Torkel Ödegaard
645f49eda4
ux: updating header design for pages
2017-11-30 11:31:38 +01:00
jomenxiao
3f95180c98
fix render http[get] params error
2017-11-28 22:20:22 +08:00
Torkel Ödegaard
9fc22e5a66
Merge branch 'master' of github.com:grafana/grafana into develop
2017-11-21 16:05:18 +01:00
bergquist
3a772c7f7f
allows head requests for /api/health endpoint
...
closes #9955
2017-11-21 15:03:04 +01:00
Torkel Ödegaard
0d12b37dfd
fix: alert list panel now works correctly after adding manual annotation on dashboard, fixes #9951
2017-11-21 11:28:17 +01:00
Torkel Ödegaard
fc1d8416a7
working on dashboard search
2017-11-20 12:47:03 +01:00
Torkel Ödegaard
0e44fe082b
Merge branch 'master' into develop
2017-11-17 15:49:17 +01:00
Torkel Ödegaard
303e3de488
fix: fix for avatar images when gzip is turned on, fixes #5952
2017-11-17 13:13:58 +01:00
bergquist
0f69e06fcf
removes invalid comment
2017-11-16 16:55:02 +01:00
Marcus Efraimsson
909601d6ab
api: fix so that datasources functions returns Response
2017-11-16 16:29:05 +01:00
Marcus Efraimsson
89b27b35ba
fix: Use Response as return type
2017-11-16 16:19:01 +01:00
Marcus Efraimsson
540d540ea9
fix: return id from api when creating new annotation/graphite annotation, fixes #9798
...
When creating a region annotation the response will include both
id (region start id) and endId (region end id), if not only id.
2017-11-16 16:19:01 +01:00
bergquist
36676e23c1
datasource as cfg: adds readonly datasources
2017-11-15 14:30:32 +01:00
Daniel Lee
0d85c63fff
middleware: recovery handles panics in all handlers
...
Also, changes the order of the middleware so that recovery is after the
gzip middleware. Otherwise, a 200 OK is returned instead of a 500 error.
2017-11-15 13:57:33 +01:00
Torkel Ödegaard
97cc454ded
ux: minor changes
2017-11-01 14:23:46 +01:00
Torkel Ödegaard
84b10df887
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-10-31 16:14:40 +01:00
Daniel Lee
752453f204
dashboards: fix link to bulk edit
2017-10-29 20:20:51 +01:00
Torkel Ödegaard
cae852a1a2
updated icons
2017-10-27 08:33:04 +02:00
