Torkel Ödegaard
5599bdf1bc
Merge branch 'master' of github.com:grafana/grafana
2016-03-09 10:26:11 +01:00
Torkel Ödegaard
de41536046
fix(share): fixed checkboxes in share modal, fixes #4301
2016-03-09 10:26:00 +01:00
Torkel Ödegaard
30d321998c
Merge pull request #4295 from utkarshcmu/nav-fix
...
Minor nav fix
2016-03-09 09:27:38 +01:00
Torkel Ödegaard
091726b374
feat(plugins): commented out dashboard import list
2016-03-08 20:27:40 +01:00
Torkel Ödegaard
dfaa6d8eb9
feat(plugins): a lot of work on #4298
2016-03-08 18:17:47 +01:00
utkarshcmu
92c6025390
Minor nav fix
2016-03-08 07:39:41 -08:00
Torkel Ödegaard
7b1d827460
Merge branch 'master' into dashboard-thing
...
Conflicts:
public/app/features/datasources/partials/edit.html
2016-03-08 15:48:01 +01:00
Torkel Ödegaard
74ebc2d3b0
Merge branch 'master' of github.com:grafana/grafana
2016-03-08 15:32:15 +01:00
Torkel Ödegaard
db98632078
feat(plugins): progress on plugins page
2016-03-08 12:31:37 +01:00
Torkel Ödegaard
2475ca8f9a
fix(templaing): refactoring PR #4283
2016-03-08 09:32:54 +01:00
woodsaj
dc4743a392
ensure current template variable is set.
...
- When distributing a dashboard it is often not practical to have
"current" template variable option set. This commit ensures that
for dashboards with no current, it is assigned when the dashboard
loads (assuming refresh on load is set.)
2016-03-08 15:41:24 +08:00
woodsaj
0cb57f52de
refactor how template vars are updated. fixes #4283
...
Use promises to order the updates of variable options so that
parents are always updated before children.
This ensures that we only need to query the datasource once per
variable as variables that depend on other variables will only be
processed once their parent has been.
This commit also ensures that variable options are refreshed if
"refresh_on_load" is true even when query params are used to
set the variable seltion.
2016-03-08 15:03:34 +08:00
Torkel Ödegaard
4cd4ce504d
feat(plugins): worked on markdown support for plugin page, #4275
2016-03-07 18:03:45 +01:00
Torkel Ödegaard
135679096b
feat(plugins): progress on plugin details page, # 4275
2016-03-07 14:31:17 +01:00
bergquist
e16f45e494
fix(playlist): fixes failed refactoring
2016-03-07 11:10:10 +01:00
bergquist
435d0f22f5
fix(dashlist): better handling of invalid dashboard ids
2016-03-07 11:04:02 +01:00
Torkel Ödegaard
00c70307ad
fix(panel): fixed to panel height for text panel and unknown panel
2016-03-06 19:23:22 +01:00
Carl Bergquist
883435336c
Merge pull request #4265 from utkarshcmu/hide-pass
...
Hiding password text
2016-03-06 14:56:44 +01:00
Torkel Ödegaard
2c8e35a933
fix(panel): fixed issues with png rendering, also fixed #4260
2016-03-06 12:51:36 +01:00
Torkel Ödegaard
7df18678a4
fix(ux): fixed hidden overflow text in api key modal, fixes #4263
2016-03-06 12:37:06 +01:00
Torkel Ödegaard
260c731f6b
fix(panel): fixes for panel height and alignment management and scrollable legends, closes #4266
2016-03-06 12:34:47 +01:00
utkarshcmu
00b1908f3c
Hiding password text
2016-03-05 23:47:50 -08:00
bergquist
dd7e215e78
feat(dashslist): make sure dashbords exists in recently viewd dashboards
...
closes #4249
2016-03-05 12:27:37 +01:00
Torkel Ödegaard
fcd75422d5
ux(): update all confirm modals to new design
2016-03-04 20:57:10 +01:00
Torkel Ödegaard
e7ef79e0d3
refactor(): minor tweak to markdown to remove watchers
2016-03-03 09:04:06 +01:00
Torkel Ödegaard
ae69244ac7
updated keyboard shortcuts modal
2016-03-02 21:36:34 +01:00
Torkel Ödegaard
8232552152
ux(): updated api key modal
2016-03-02 21:34:04 +01:00
Torkel Ödegaard
8bc1af9d1a
ux(): work on new modal design #4191
2016-03-02 21:27:08 +01:00
Torkel Ödegaard
fd1a0edf7f
ux(): worked on new modal design #4191
2016-03-02 20:56:04 +01:00
Torkel Ödegaard
950455bd93
ux(): combined page header and tab views
2016-03-02 16:56:16 +01:00
Torkel Ödegaard
eb4a46b40f
Merge pull request #4220 from mtanda/issue_1419
...
Align auto refresh interval
2016-03-02 11:26:34 +01:00
Torkel Ödegaard
7e12460303
Merge branch 'master' of github.com:grafana/grafana
2016-03-02 08:55:25 +01:00
Torkel Ödegaard
1ed4f64e60
templating(): minor update to regex escape chars, #2918
2016-03-02 08:44:20 +01:00
Mitsuhiro Tanda
fa0b06ac60
fix align bug
2016-03-02 16:06:54 +09:00
Mitsuhiro Tanda
ef22a87fcf
remove align option
2016-03-02 16:02:08 +09:00
Torkel Ödegaard
bfce379471
Merge pull request #4222 from raintank/pluginSettingEditHooks
...
Add support for pre/post update hooks in the PluginEditCtrl.
2016-03-02 07:56:23 +01:00
Torkel Ödegaard
4872f6d2dc
fix(jshint): removed unused var
2016-03-02 07:54:10 +01:00
Torkel Ödegaard
3c30870dc2
fix(templating): fixed issue with custom all value, fixes #4219
2016-03-02 07:52:48 +01:00
Anthony Woods
4317e4c4a2
Add support for pre/post update hooks in the PluginEditCtrl.
...
This allows users to intercept the update procedure from their own
controller to modify the pluginSettings before they are saved and
perform additional tasks like syncing state via a third party API.
2016-03-02 14:21:25 +08:00
Mitsuhiro Tanda
7da57e0aa5
align refresh interval
2016-03-02 14:26:15 +09:00
Torkel Ödegaard
0da4168836
fix(prometheus): fixed templating issue with prometheus for when using variable with non regex operator, #2918
2016-03-01 21:35:55 +01:00
Torkel Ödegaard
df67d57bca
ux(): minor work on info popover
2016-03-01 21:01:41 +01:00
Torkel Ödegaard
82e7f1a212
Merge pull request #4201 from raintank/removeForcedHeader
...
remove forced page header from app pages.
2016-03-01 20:14:55 +01:00
Torkel Ödegaard
2cf1193b56
Merge branch 'variable-value-formatting-rethink'
2016-03-01 19:13:11 +01:00
Torkel Ödegaard
57315f1e27
feat(templating): updates to template variable forms
2016-03-01 19:12:54 +01:00
Torkel Ödegaard
d1bac6cde0
feat(templating): prometheus now works with new template variable formating/escaping, #2918
2016-03-01 16:11:05 +01:00
bergquist
00dc078311
feat(playlist): render playlists if playlist id is invalid
...
close #4209
2016-03-01 13:50:55 +01:00
Torkel Ödegaard
fa73b1ce80
feat(templating): changed how the All templating value works
2016-03-01 13:47:02 +01:00
bergquist
606c75162f
feat(dashlist): add support for scripted dashboards
...
- dashlist will only show dashboards from same org
- notfound dashboards will not be added
closes #4207
2016-03-01 12:05:35 +01:00
bergquist
c6768a93c8
fix(dashlist): avoid null ref errors
2016-03-01 11:07:56 +01:00
