public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,884 Commits 655 Branches 650 Tags
29fcc463336f7f0e00e94de6fe1cc6350c4eb0da
Commit Graph
38884 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marcel Anacker 64c16eb912 Alerting: Fixing mobile notifications in Microsoft Teams 2018-04-04 16:28:12 +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
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
Alexander Zobnin efaf267deb scrollbar: fix legend rendering issues 2018-04-02 20:47:09 +03:00
Alexander Zobnin 77d2ee9add Initially move to baron scrollbar 2018-04-02 14:59:49 +03: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
Patrick O'Carroll 7b9b34c6e1 migrated graph_tooltip to ts 2018-03-29 11:51:34 +02:00
Daniel Lee 32264c61c4 Merge branch 'master' into dashboard-acl-ux2 2018-03-29 11:32:24 +02:00
Patrick O'Carroll 65f7c5f08f started migration to ts 2018-03-29 10:40:45 +02:00
Julien Pivotto 1f1719c498 Fix #10555 #6888 Better escape for Prometheus variables 
Prior this commit, C:\bar was escaped C:\\\bar. Should be C:\\\\bar.

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2018-03-29 09:49:15 +02:00
Patrick O'Carroll 8195c085fa bounnd the esc key to exit timepicker 2018-03-29 09:15:15 +02:00