Torkel Ödegaard
502171fff1
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-11 09:18:03 +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
Dan Cech
588ce6606c
fix function re-ordering broken in #9436
2017-12-10 21:20:38 -05:00
noakup
e6bdccbb05
hyphenhyphen
2017-12-10 18:38:48 +02:00
Dan Cech
525ae4fdf5
support metric trees of varying depth, never send '.select metric' to graphite
2017-12-10 10:48:12 -05:00
Dan Cech
8dcfa18761
simplify function parameter addition
2017-12-10 10:45:41 -05:00
Torkel Ödegaard
511fa7dec1
ux: dashboard settings progress
2017-12-10 12:41:11 +01:00
Torkel Ödegaard
00c723f04a
ux: minor changes
2017-12-10 12:21:04 +01:00
Torkel Ödegaard
e1440dcc44
ux: navbar progress
2017-12-09 22:45:33 +01:00
Dan Cech
3a1700cbee
improve handling of query references
2017-12-09 16:27:05 -05:00
Torkel Ödegaard
1e5983b46c
Merge branch 'develop' into develop-settings
2017-12-09 21:50:26 +01:00
Torkel Ödegaard
47ecbbab8d
build: fix for tslint
2017-12-09 21:47:59 +01:00
Torkel Ödegaard
7f73fae6ae
ux: form styles polish, improvement but can be better
2017-12-09 21:46:30 +01:00
Dan Cech
4fcf79a3a6
demonstrate parseTarget issue
2017-12-09 11:17:34 -05:00
Torkel Ödegaard
55609382f1
fix: fixed panel size rerendering issues
2017-12-09 13:53:03 +01:00
Torkel Ödegaard
fbe9f759ad
ux: work on dashboard settings views
2017-12-08 18:15:24 +01:00
Marcus Efraimsson
47014ddb65
dashfolders: Do not allow loading a folder as a dashboard
2017-12-08 17:50:37 +01:00
Marcus Efraimsson
70b0165835
fix: Remove console.log
2017-12-08 17:49:33 +01:00
Marcus Efraimsson
1985027549
dashfolders: Folder picker should set correct default values. Fixes #10135
2017-12-08 17:46:52 +01:00
Alexander Zobnin
e4675ca5c1
refactor: user groups to teams, replace rest mentions
2017-12-08 19:01:10 +03:00
Alexander Zobnin
5d3bfee2f1
refactor: user groups to teams, rename backend files
2017-12-08 18:51:59 +03:00
Alexander Zobnin
9e62a777c7
refactor: user groups to teams, rename frontend files
2017-12-08 18:47:55 +03:00
Alexander Zobnin
d8612380e9
refactor: rename User Groups to Teams
2017-12-08 18:25:45 +03:00
bergquist
0506cfdc1d
changelog: adds ntoe about closing #10111
2017-12-08 16:09:32 +01:00
Carl Bergquist
2408d8f09a
Merge pull request #10112 from adiletmaratov/master
...
Solves problem with Github authentication restriction by organization
2017-12-08 16:05:27 +01:00
Torkel Ödegaard
7a2e886e70
Merge branch 'develop' into develop-settings
2017-12-08 16:02:42 +01:00
Torkel Ödegaard
10a77b0353
ux: forms style font size change
2017-12-08 15:59:51 +01:00
Torkel Ödegaard
1b6be031e5
ux: dashboard settings progress
2017-12-08 15:53:26 +01:00
Sven Klemm
ce809de1ed
postgres: change $__timeGroup macro to include "AS time" column alias ( #10119 )
...
* change $__timeGroup macro to include column alias
* update docs and help text for $__timeGroup macro
2017-12-08 15:14:10 +01:00
Torkel Ödegaard
db663c380b
new timepicker is working
2017-12-08 14:38:33 +01:00
Torkel Ödegaard
9369a87e93
Merge branch 'develop' into develop-settings
2017-12-08 14:32:15 +01:00
Marcus Efraimsson
b03b360414
dashfolders: Create nav model for folder page client side #10083
2017-12-08 14:08:16 +01:00
Torkel Ödegaard
63b717f607
ux: minor change to new folder page
2017-12-08 13:54:11 +01:00
Patrick O'Carroll
9cae579c75
fix for search dropdown on small screen + icon overlapping fix ( #10091 )
...
* fix for search dropdown on small screen + icon overlapping fix
* fixing search filter for small screen
* hid tags and filter box
* iphone input zoom fix
* moved input styling to old-responsive
2017-12-08 13:37:37 +01:00
Torkel Ödegaard
77b537f45f
ux: added react scrollbar component and added it to add panel panel
2017-12-08 13:30:16 +01:00
Torkel Ödegaard
2bc23d2063
tech: updated ngreact and with custom PR applied
2017-12-08 12:26:19 +01:00
Torkel Ödegaard
e03abde778
refactoring: #10130
2017-12-08 12:17:09 +01:00
Torkel Ödegaard
974d4d9739
Revert "Don't animate panels on initial render ( #10130 )"
...
This reverts commit e0c173c5af
2017-12-08 11:53:51 +01:00
Torkel Ödegaard
b59d06cab6
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-12-08 11:49:28 +01:00
Alexander Zobnin
e0c173c5af
Don't animate panels on initial render ( #10130 )
...
* grid: dont animate panels on initial render
* grid: dont animate panels on initial render
2017-12-08 11:49:14 +01:00
Torkel Ödegaard
9f87d8d344
Merge branch 'develop-graph-legend' into develop
2017-12-08 11:47:50 +01:00
Torkel Ödegaard
35a7109a6a
refactoring: fixing bug when all values are null
2017-12-08 11:45:44 +01:00
bergquist
0c5ef1453d
fixes broken test
2017-12-08 11:33:15 +01:00
Marcus Efraimsson
f78f86d0ab
dashfolders: Hide search input area when showing CTA. #10083
2017-12-08 11:23:57 +01:00
Torkel Ödegaard
4aad4a069c
ux: graph legend refactoring
2017-12-08 10:54:53 +01:00
bergquist
5f5cdad97a
improve error handling for datasources as cfg
2017-12-08 10:50:11 +01:00
bergquist
c766802325
improve sample datasource.yaml
2017-12-08 10:28:38 +01:00
bergquist
80a852b00a
make gitignore more generic
2017-12-08 09:35:46 +01:00
Alexander Zobnin
cd3cf5d19b
grid css transforms: minor refactor ( #10128 )
2017-12-08 08:43:47 +01:00
