Torkel Ödegaard
8f0240a295
Merge branch 'footer'
2016-05-24 07:53:13 +02:00
Torkel Ödegaard
fd08c821f9
Merge branch 'v3.0.x'
...
Conflicts:
package.json
2016-05-24 07:52:27 +02:00
Torkel Ödegaard
c41c771e9a
fix(home dashboard): fixed handling error when default dashboard is not found, fixes #5141
2016-05-24 07:39:58 +02:00
Zdenek Styblik
fff5aa3020
Add missing option Read-Only Editor to auto_assign_org_role description ( #5139 )
...
Commit adds missing option `Read-Only Editor` to `auto_assign_org_role` description.
2016-05-23 21:24:23 +02:00
Torkel Ödegaard
f1ec270e3e
bumped version to 3.0.4
2016-05-23 21:24:02 +02:00
Torkel Ödegaard
a3f2f574c6
fix(singlestat): fixed Gauge positioning issue, fixes #5143
2016-05-23 21:23:31 +02:00
Utkarsh Bhatnagar
ec19a97156
[Bug Fix] #5136 ( #5142 )
2016-05-23 21:00:06 +02:00
Torkel Ödegaard
9a7817a271
Merge branch 'master' into footer
...
Conflicts:
pkg/api/frontendsettings.go
2016-05-23 20:59:23 +02:00
Utkarsh Bhatnagar
8a0d5aa38d
[Bug Fix] #5136 ( #5142 )
2016-05-23 20:58:21 +02:00
Trent White
a52869507e
hide footer on non-dashboard pages
2016-05-23 12:46:13 -04:00
Trent White
76d18e7156
remove height: 100% on .main-view
2016-05-23 11:45:54 -04:00
Torkel Ödegaard
9e6056551d
docs(): updated download links
2016-05-23 14:13:30 +02:00
Torkel Ödegaard
bbea698af3
Update latest.json
2016-05-23 12:30:46 +02:00
Torkel Ödegaard
9eec68985d
docs(): updated download links
2016-05-23 11:49:07 +02:00
Torkel Ödegaard
cd82f579bd
docs(): updated changelog
2016-05-23 11:08:08 +02:00
Torkel Ödegaard
93665f49b1
Merge branch 'v3.0.x'
2016-05-23 11:06:53 +02:00
Torkel Ödegaard
dc77d555f9
fix(elasticsearch): fixed templating issue with elasticsearch, fixes #5135
2016-05-23 10:58:31 +02:00
Torkel Ödegaard
dfe3806d01
fix(elasticsearch): fixed query editor issue with elasticsearch
2016-05-23 10:14:40 +02:00
Torkel Ödegaard
cfc7710205
docs(): changelog updated
2016-05-23 09:31:52 +02:00
Torkel Ödegaard
c60d737928
Merge branch 'v3.0.x'
...
Conflicts:
package.json
2016-05-23 09:29:14 +02:00
Torkel Ödegaard
1da149d9e1
feat(annotations): annotations can now use a template variable as data source, closes #5054
2016-05-23 09:28:14 +02:00
Torkel Ödegaard
43ba563a1c
fix(logging): change log level to trace for plugin proxy logging call, fixes #5126
2016-05-23 07:55:55 +02:00
minki
05cb6048ae
fixed separate typo
2016-05-23 09:32:18 +09:00
minki
70d6b32e14
Fixed type
2016-05-22 05:38:57 +09:00
Trent White
75940c1f5d
turn watch all back on
2016-05-21 13:21:31 -04:00
Mitsuhiro Tanda
1d27a7f93d
(cloudwatch) fix wrong cache key of credentials ( #5124 )
2016-05-21 09:02:04 +02:00
Trent White
cffcc4c7a5
make footer unordered list. add new icons.
2016-05-20 16:44:19 -04:00
Trent White
c727c3c441
resize and color of links
2016-05-20 15:58:14 -04:00
Torkel Ödegaard
fb4dc77f36
docs(): updated changelog with 3.0.3 fixes
2016-05-20 15:26:19 +02:00
Torkel Ödegaard
9eb7b192b8
Merge branch 'master' of github.com:grafana/grafana
2016-05-20 15:16:05 +02:00
Torkel Ödegaard
06d63dda6e
Merge branch 'v3.0.x'
2016-05-20 15:15:30 +02:00
Torkel Ödegaard
e6f251011f
fix(panel span): fixed issue setting panel span while in fullscren and also an issue when changing repeat variable while in fullscreen view, fixes #4957
2016-05-20 15:15:02 +02:00
David J. Felix
441682b598
Fix linking for /dashboard-solo/ proxy prefix ( #5116 )
...
Fixes #5109
2016-05-20 14:01:12 +02:00
Mitsuhiro Tanda
9c672f6ec1
(prometheus) support new legend format (with backward compatibility) ( #5096 )
...
* (prometheus) support new legend format (with backward compatibility)
* (prometheus) use regex replace for legend format
* (prometheus) allow white space
2016-05-20 12:29:10 +02:00
Torkel Ödegaard
35c05463e7
Merge branch 'v3.0.x'
2016-05-20 12:23:50 +02:00
Torkel Ödegaard
f00cbc0aeb
fix(panel height): fixed issue with singlestat height, fixes #4679 , fixes #4894 , fixes #5113
2016-05-20 12:23:26 +02:00
Torkel Ödegaard
ee86d24797
fix(elasticsearch): minor editor layout fix
2016-05-20 10:31:22 +02:00
Torkel Ödegaard
58a9324db0
Merge branch 'v3.0.x'
2016-05-20 10:24:54 +02:00
Torkel Ödegaard
e0e8fd6637
fix(templating): fixed handling of numeric values in tempalting query results, fixes #5097
2016-05-20 10:24:24 +02:00
Torkel Ödegaard
2416ee04c8
fix(templating): fixed detection of nested template variables, fixes #5103
2016-05-20 09:58:07 +02:00
Torkel Ödegaard
91c6ebb06c
Merge branch 'v3.0.x'
2016-05-20 09:06:39 +02:00
Torkel Ödegaard
df0ddc0b50
fix(prometheus): fixed bug in prometheus query editor, fixes #5107
2016-05-20 09:03:52 +02:00
Torkel Ödegaard
2e02abffc0
fix(render): fixed issue with image renderer caused by disabling angular debug info
2016-05-20 08:34:35 +02:00
Torkel Ödegaard
e47957ce6d
Merge branch 'master' of github.com:grafana/grafana
2016-05-20 08:32:40 +02:00
Torkel Ödegaard
c54e688272
Merge branch 'v3.0.x'
2016-05-20 08:31:51 +02:00
Torkel Ödegaard
37821e6d63
fix(share modal): fixed link in share modal when sub app url is /dashboard/, fixes #5109
2016-05-20 08:31:27 +02:00
Richard Hartmann
78360ece8a
ISSUE_TEMPLATE.md: Improve wording and fix typos ( #5101 )
2016-05-19 10:59:38 +02:00
Richard Hartmann
7c46423727
ISSUE_TEMPLATE.md: Fix typo ( #5099 )
2016-05-19 10:34:12 +02:00
bergquist
617d18e587
feat(panel): active tab is now placed in querystring aswell
2016-05-19 08:42:21 +02:00
bergquist
2b06ceda71
feat(panels): adds queryparameter for choose active tab in edit mode
2016-05-19 08:00:48 +02:00
