ryan
39f37ff8aa
Merge remote-tracking branch 'grafana/master' into annotations-created
...
* grafana/master:
docs: updated debian distro in install docs to stretch, closes #11527
css: quick fix after IE11 changes
fixed sidemenu icon issue created by earlier pr
changelog: adds note for #11165
migrated dash_class to ts
migrated segment_srv to ts
removed indent for manage dashboards
created closeDropdown function, renamed appevent, added second appevent for open timepicker
added if to onAppevent, renamed appevent, add appevent to applyCustom and setRelativeFilter
docker: add users and groups to ldap block
timepicker now closes without exiting edit/view mode, close order: modal, timepicker, view
bounnd the esc key to exit timepicker
added indent to dashboards inside folder in search dropdown, and added indent to dashboard icon in search item
2018-04-09 12:31:44 +02:00
Torkel Ödegaard
d60c7b2013
docs: updated debian distro in install docs to stretch, closes #11527
2018-04-09 08:18:58 +02:00
Daniel Lee
ce787b88bf
css: quick fix after IE11 changes
...
Temporary fix so that the add panel panel works properly. This will
break a3f15ced68
2018-04-06 21:29:42 +02:00
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
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
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
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
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
Patrick O'Carroll
0273365df3
created closeDropdown function, renamed appevent, added second appevent for open timepicker
2018-04-04 16:20:01 +02:00
Patrick O'Carroll
84dce3282a
migrated playlist-routes to ts
2018-04-04 15:26:23 +02:00
Patrick O'Carroll
13f6d3be87
migrated last all.js to ts
2018-04-04 14:16:39 +02: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
Daniel Lee
533f3a9e8c
settings: fixes test
...
For some reason, the url parse does not fail anymore for curly
braces. Add a colon in the first segment to make sure the url
parse fails.
2018-04-03 19:09:49 +02:00
Daniel Lee
1f3602c7dd
Merge pull request #11428 from bergquist/11281_fix
...
Avoid panic when GF_DATABASE_URL contains illegal chars
2018-04-03 16:59:25 +02:00
Daniel Lee
a6a08038d4
Merge pull request #11416 from grafana/ie11_graphpanel_edit
...
Graphpanel Edit fix for IE11
2018-04-03 15:44:54 +02:00
Patrick O'Carroll
658c6a8ff4
changed from margin to padding
2018-04-03 15:43:25 +02:00
Daniel Lee
1a6c632264
Merge pull request #11396 from grafana/ie11_search_and_popup
...
fixed alignment in search + fixed issue ie popup
2018-04-03 15:06:08 +02:00
Daniel Lee
cdc0b04840
Merge pull request #11393 from grafana/ie_sidemenu
...
sidemenu fix for internet explorer 11,
2018-04-03 15:00:25 +02:00
Daniel Lee
6bc5896b3a
Merge pull request #11381 from grafana/ie11_login
...
styled login page for ie11
2018-04-03 14:35:12 +02:00
Daniel Lee
ebbbf170f1
Merge pull request #11463 from grafana/tabbed-close-btn-hover
...
Fix for tabbed-view btn in light theme
2018-04-03 10:31:14 +02:00
Patrick O'Carroll
feb222f633
changed variable for tabbed close btn hover, and changed text-strong variable for lighttheme, removed commented out variable
2018-04-03 09:53:14 +02:00
Daniel Lee
8b2441e098
mssql: typos in help sections
...
Fixes #11455
2018-04-03 09:51:29 +02:00
Patrick O'Carroll
98e1404fed
added if to onAppevent, renamed appevent, add appevent to applyCustom and setRelativeFilter
2018-04-03 09:39:46 +02:00
Alexey Velikiy
6320bdf393
Webpack Grafana plugin template project to links ( #11457 )
2018-04-03 06:21:36 +02:00
Alexey Velikiy
00f67ea7c7
rm panel.type constrain from threshold_mapper.ts ( #11448 )
2018-04-02 08:13:22 +02:00
Alexey Velikiy
13deb891f3
No need for node_modules/bin in npm run-script ( #11449 )
...
how run-script works: https://docs.npmjs.com/cli/run-script
2018-04-02 08:09:10 +02:00
Carl Bergquist
880293eea1
Merge pull request #11445 from svenklemm/docs-dashboard
...
docs: fix some typos in dashboard docs
2018-03-30 20:41:31 +02:00
bergquist
4538ffc0e8
changelog: adds note about closing #11555
2018-03-30 20:30:57 +02:00
Carl Bergquist
375cc8de8f
Merge pull request #11399 from roidelapluie/promba
...
Fix #10555 #6888 Backslash in Prometheus variables
2018-03-30 20:26:08 +02:00
Sven Klemm
2bdcebb5b1
add article
2018-03-30 16:47:51 +02:00
Sven Klemm
cb156ee30b
fix some typos
2018-03-30 16:42:48 +02:00
Daniel Lee
de6cd7ed0b
docker: add users and groups to ldap block
2018-03-30 10:09:36 +02:00
Patrick O'Carroll
9ef5f2700d
timepicker now closes without exiting edit/view mode, close order: modal, timepicker, view
2018-03-29 15:02:00 +02:00
