Torkel Ödegaard
392407136d
Merge branch 'export-dashboard' of github.com:grafana/grafana into export-dashboard
2016-05-25 12:33:30 +02:00
Torkel Ödegaard
ba6573af61
Merge branch 'master' into export-dashboard
...
Conflicts:
public/app/features/dashboard/submenu/submenu.ts
2016-05-25 12:32:56 +02:00
Matt Toback
8d988f9582
Export dashboard bulletfactory ( #5160 )
...
* create descriptions and styles for share dropdown
* Updating actual modal layout for Sharing
* Updated the modals to follow the new styles, fixed the wrapping issue on the main menu. Standardized buttons.
2016-05-25 12:30:27 +02:00
Torkel Ödegaard
f923edc424
Merge branch 'v3.0.x'
2016-05-25 12:29:35 +02:00
Torkel Ödegaard
2712d9ae8b
Update latest.json
2016-05-25 12:23:32 +02:00
Torkel Ödegaard
3312a042dd
docs(): updated download links
2016-05-25 11:50:00 +02:00
Torkel Ödegaard
5040570ea9
docs(): updated changelog
2016-05-25 11:07:29 +02:00
Torkel Ödegaard
f5c5d1b1da
Merge branch 'master' of github.com:grafana/grafana
2016-05-25 11:04:27 +02:00
Torkel Ödegaard
2cd6c2e7e0
Merge branch 'v3.0.x'
2016-05-25 11:04:12 +02:00
Torkel Ödegaard
0daadc954c
fix(templating): fixed issue with detecting data source variable in other template variable definition, fixes #5165
2016-05-25 10:46:55 +02:00
bergquist
ec98b7d672
docs(changelog): add note about fix for 5167
2016-05-25 10:01:49 +02:00
bergquist
8c2b6b532d
fix(preferences): fixes broken default home dashboard
...
closes #5167
2016-05-25 09:56:45 +02:00
Torkel Ödegaard
71d62012e1
fix(panel): fixed issue with fullscreen panel view and switching to another dashboard, fixes #5163
2016-05-25 09:46:15 +02:00
Torkel Ödegaard
41deea90ee
feat(dashboard): template variable changes updates url, closes #5002
2016-05-24 16:34:17 +02:00
Torkel Ödegaard
a81806d3d0
feat(dashboard): sync time range with url, closes #458
2016-05-24 16:32:28 +02:00
Torkel Ödegaard
5607a114f9
updated changelog
2016-05-24 09:53:28 +02:00
Torkel Ödegaard
e81614b9e9
Merge branch 'v3.0.x'
2016-05-24 09:50:41 +02:00
Torkel Ödegaard
6f094ef215
fix(templating): fixed issue with nested template variables and multi select, the child variable selection state is now updated like single select variables, so if none matches the first option is selected, fixes #4861
2016-05-24 09:50:23 +02:00
Torkel Ödegaard
366baea099
docs(): updated changelog
2016-05-24 08:14:40 +02:00
Torkel Ödegaard
dc9dcd045d
Merge branch 'master' of github.com:grafana/grafana
2016-05-24 08:11:52 +02:00
Torkel Ödegaard
10c47ee27c
feat(footer): some minor changes to footer to make it look good in light theme, closes #4889
2016-05-24 08:11:28 +02:00
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
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
