Daniel Lee
817b8d3946
Merge pull request #11511 from grafana/side-menu-icon-fix
...
fixed sidemenu icon issue created by earlier pr
2018-04-06 17:53:50 +02:00
Daniel Lee
3fd9c787cf
Merge pull request #11497 from grafana/dash-class-to-ts
...
migrated dash_class to ts
2018-04-06 17:48:18 +02:00
Patrick O'Carroll
c7cd754a94
migrating to ts
2018-04-06 15:02:32 +02:00
Daniel Lee
51148709bb
Merge pull request #11496 from grafana/segment-srv-to-ts
...
migrated segment_srv to ts
2018-04-06 11:18:51 +02:00
Patrick O'Carroll
6d6ecbd458
fixed sidemenu icon issue created by earlier pr
2018-04-06 10:54:06 +02:00
Patrick O'Carroll
0203e7afd5
Merge branch 'dashboard-acl-ux2' of github.com:grafana/grafana into dashboard-acl-ux2
2018-04-06 09:50:36 +02:00
Patrick O'Carroll
b363e160d9
added icons for viewer and editor, fixed add permission team avatar
2018-04-06 09:43:59 +02:00
Daniel Lee
4ac290215e
Merge branch 'fix-11053' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-fix-11053
2018-04-05 22:30:13 +02:00
Jonas Hahnfeld
dfccabab75
singlestat: Fix optimization in setTableColumnToSensibleDefault
...
tableColumnOptions is an associative array that has no property length.
Use tableData.columns as in the default case which works just fine.
2018-04-05 20:59:11 +02:00
Jonas Hahnfeld
e3dbef755a
influxdb: Check before assuming first column to be 'time'
...
When running queries like 'SHOW [...] CARDINALITY' introduced with
InfluxDB 1.4 there is only a single column 'count'. However, the data
source always assumed 'time' which threw an error because the code
couldn't find a non-time column to display.
This change actually checks this assumption and thereby fixes displaying
the result in a Singlestat in Table mode (closes #11476 ).
2018-04-05 20:53:22 +02:00
Marcus Efraimsson
f619dd579e
provisioning: fix tests for save provisioned dashboard modal
2018-04-05 20:51:47 +02:00
Marcus Efraimsson
6bbeb723ca
Merge branch 'master' into readonly_dashboards
2018-04-05 20:30:27 +02:00
Marcus Efraimsson
bcdb3ec84d
provisioning: ux fixes when saving provisioned dashboards
...
Wider modal.
Tried to improve provisioning description text.
Code editor for json.
Button that allows to save the json to a file.
2018-04-05 20:28:04 +02:00
Marcus Efraimsson
4cc80efee6
graphite: use a query when testing data source
...
Using a query (POST /render) request instead of GET /metrics/find to better
mimic an actual request for rendering a panel in a dashboard. The POST /render
request will add at least a custom http header which can be problematic when
using direct access mode since it will trigger a CORS prerequest check. By
doing this kind of query when testing the data source possible CORS issues
can be detected there instead of later when trying to use the data source
in a dashboard.
2018-04-05 18:11:35 +02:00
Patrick O'Carroll
35bc4e4632
migrated metric_segment to ts
2018-04-05 17:10:32 +02:00
Alexander Zobnin
9f07ae72ee
scrollbar: fix search scroller in mobile view
2018-04-05 16:47:20 +03:00
Alexander Zobnin
d6233714d2
Merge remote-tracking branch 'upstream/master' into fix-11053
2018-04-05 16:30:46 +03:00
Marcus Efraimsson
166778b32a
Merge pull request #11439 from grafana/ldap-block
...
docker: add users and groups to ldap block
2018-04-05 15:30:11 +02:00
Alexander Zobnin
fa43782299
scrollbar: fix graph legend height
2018-04-05 16:28:12 +03:00
Marcus Efraimsson
94d1a9fd83
Merge pull request #11430 from grafana/11332_esc_timepicker
...
Enable closing timepicker using escape key
2018-04-05 15:11:34 +02:00
Daniel Lee
fcfc33ee57
changelog: adds note for #11165
2018-04-05 15:02:54 +02:00
Patrick O'Carroll
714d555e36
migrated dash_class to ts
2018-04-05 14:33:27 +02:00
Patrick O'Carroll
7083e8a0a9
migrated segment_srv to ts
2018-04-05 14:09:32 +02:00
Daniel Lee
32b833e488
Merge pull request #11271 from grafana/11073_dashboard_folder_indent
...
added indent to dashboards inside folder in search dropdown…
2018-04-05 11:12:17 +02:00
Patrick O'Carroll
b321a21cb5
removed indent for manage dashboards
2018-04-05 11:00:15 +02:00
Alexander Zobnin
b4ef55f5d0
scrollbar: fix potential memory leaks in event handlers
2018-04-05 11:51:32 +03:00
ryan
66d020eb7e
skip migration if it is a big number
2018-04-05 09:51:08 +02:00
ryan
392c47f39b
Merge remote-tracking branch 'grafana/master' into annotations-created
...
* grafana/master: (51 commits)
Use curly brackets around hyperlink help text #11478 (#11479 )
migrated playlist-routes to ts
migrated last all.js to ts
Notes for closing #7119
changelog: adds note for #11128
variables: adds test for variable sorting
Add case-insensitive sort for variables.
graphite: fixes #11434
settings: fixes test
changed from margin to padding
changed variable for tabbed close btn hover, and changed text-strong variable for lighttheme, removed commented out variable
mssql: typos in help sections
Webpack Grafana plugin template project to links (#11457 )
rm panel.type constrain from threshold_mapper.ts (#11448 )
No need for node_modules/bin in npm run-script (#11449 )
changelog: adds note about closing #11555
add article
fix some typos
migrated graph_tooltip to ts
started migration to ts
...
2018-04-05 09:48:00 +02:00
Daniel Lee
088720cf2b
Merge pull request #11417 from grafana/ie11_alerting_style_fix
...
removed padding for icons and added margin
2018-04-04 23:24:41 +02:00
Daniel Lee
2d1f2f3636
Merge pull request #11480 from grafana/graph_tooltip_to_ts
...
Graph tooltip to ts
2018-04-04 23:03:31 +02:00
Daniel Lee
28849bbd57
Merge pull request #11481 from grafana/all-js-to-ts
...
migrated last all.js to ts
2018-04-04 22:09:10 +02:00
Daniel Lee
dc4cb0d565
Merge pull request #11483 from grafana/playlist-routes-to-ts
...
migrated playlist-routes to ts
2018-04-04 22:02:02 +02:00
Jarno Tuovinen
90aab44558
Use curly brackets around hyperlink help text #11478 ( #11479 )
2018-04-04 20:07:22 +02:00
Alexander Zobnin
b69316752a
scrollbar: fix dashboard width updating for different modes
2018-04-04 19:51:12 +03:00
Daniel Lee
eef3120aed
Merge branch 'fix-11053' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-fix-11053
2018-04-04 18:32:18 +02:00
Alexander Zobnin
175937a679
scrollbar: remove perfect-scrollbar and add baron to package list
2018-04-04 19:26:29 +03:00
Alexander Zobnin
4df4249aea
scrollbar: fix dashboard width bug
2018-04-04 19:22:07 +03:00
Alexander Zobnin
6b598f34cd
scrollbar: fix 'legendScrollbar.destroy is not a function' error
2018-04-04 19:00:28 +03:00
Patrick O'Carroll
0273365df3
created closeDropdown function, renamed appevent, added second appevent for open timepicker
2018-04-04 16:20:01 +02:00
Marcus Efraimsson
8f94cecf0f
permissions: return user and team avatar in folder permissions api
2018-04-04 15:51:19 +02:00
Marcus Efraimsson
ebad863f95
permission: generate team avatar url with default
2018-04-04 15:50:45 +02:00
Patrick O'Carroll
84dce3282a
migrated playlist-routes to ts
2018-04-04 15:26:23 +02:00
Daniel Lee
eea2369987
Merge branch 'fix-11053' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-fix-11053
2018-04-04 14:25:54 +02:00
Patrick O'Carroll
13f6d3be87
migrated last all.js to ts
2018-04-04 14:16:39 +02:00
Alexander Zobnin
a265c77cf9
scrollbar: fix Firefox scroll position restore
2018-04-04 14:51:46 +03:00
Marcus Efraimsson
9841c81952
Notes for closing #7119
...
[skip ci]
2018-04-04 13:40:08 +02:00
Daniel Lee
4b1c1acab4
changelog: adds note for #11128
2018-04-03 22:40:48 +02:00
Daniel Lee
70eb281840
variables: adds test for variable sorting
...
ref #11280
2018-04-03 22:34:16 +02:00
Chris Ross
4a93766143
Add case-insensitive sort for variables.
2018-04-03 22:24:21 +02:00
Daniel Lee
a6c7635528
graphite: fixes #11434
2018-04-03 19:39:50 +02:00
