Commit Graph

14250 Commits

Author SHA1 Message Date
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
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
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
Patrick O'Carroll
8b076d921f fixes for avatar on adding permission and size for gicon 2018-04-03 15:20:39 +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
Alexander Zobnin
3fcd262711 scrollbar: fix side menu on mobile devices 2018-04-03 14:48:48 +03: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
3fc2e53081 Merge branch 'fix-11053' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-fix-11053 2018-04-03 09:52:31 +02:00
Daniel Lee
8b2441e098 mssql: typos in help sections
Fixes #11455
2018-04-03 09:51:29 +02:00
Daniel Lee
51b078fb65 docs: spelling 2018-04-03 09:47:53 +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
Alexander Zobnin
7b75b251b1 scrollbar: fix Firefox issue (white stripe on the right of scrollbar) 2018-04-02 21:15:10 +03:00