Commit Graph
38884 Commits
Author SHA1 Message Date
Torkel Ödegaard ffe5157193 Merge branch 'cli/watch-sass-var' of github.com:grafana/grafana into cli/watch-sass-var 2019-02-21 12:11:21 +01:00
Torkel Ödegaard 31511ee3cc fixed snapshots failing in master 2019-02-21 12:10:01 +01:00
Dominik Prokop f5a520bf39 Synced variable template files 2019-02-21 11:59:47 +01:00
Dominik Prokop 0df56f9356 Merge branch 'master' into cli/watch-sass-var 2019-02-21 11:56:54 +01:00
Marcus Efraimsson c586bc519f Merge pull request #15553 from grafana/14507_fix
fix; mysql query using __interval_ms variable throws error
2019-02-21 11:40:54 +01:00
Torkel Ödegaard 9a7866a040 Merge pull request #15560 from grafana/scrollbar-fixes
Fixed scrollbar issue introduced in theme changes
2019-02-21 11:32:19 +01:00
corpglory-dev 8bc4139bbd Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-02-21 12:47:05 +03:00
Peter Holmberg 58f194b483 Merge branch 'master' into bar-gauge-poc 2019-02-21 10:38:26 +01:00
Marcus Efraimsson d8e655bbcf fix: mysql query using __interval_ms variable throws error
fixes #14507
2019-02-21 10:25:52 +01:00
Dominik Prokop 9b03815141 Merge branch 'master' into cli/watch-sass-var 2019-02-21 09:50:24 +01:00
Torkel Ödegaard d85ea5d2be Merge pull request #15559 from grafana/fix/prettier-function-editor
Fixed issue caused by graphite function editor PR #15510
2019-02-21 09:46:50 +01:00
Torkel Ödegaard 7d105439f9 Fixed scrollbar issue introduced in theme changes 2019-02-21 09:41:53 +01:00
Dominik Prokop f28cc871e1 Fix build 2019-02-21 09:09:24 +01:00
Peter Holmberg 8c5c953521 minor touch ups 2019-02-20 17:07:36 +01:00
Alexandre de Verteuil 1bbf7cc294 Fix heading levels in generic-oauth.md 2019-02-20 11:00:29 -05:00
ijin08 a9c5fe5be1 updated colors in light, dark and theme files, in template file basic colors uses variables from dark/light files, also changed to -basic in some files 2019-02-20 16:11:36 +01:00
corpglory-dev 5da9794a8e ValueOptions -> PiechartValueEditor 2019-02-20 17:30:12 +03:00
corpglory-dev 0f102001b6 Make it build 2019-02-20 17:27:42 +03:00
corpglory-dev 7f5459149a fixes 2019-02-20 17:15:00 +03:00
Peter Holmberg 2fc136e615 added orientation option 2019-02-20 15:07:30 +01:00
corpglory-dev 67fe351f72 export PiechartDataPoint from @grafana/ui 2019-02-20 16:52:29 +03:00
corpglory-dev b263b3edd6 change valueOptions 2019-02-20 16:32:35 +03:00
corpglory-dev 7bb996203f get label and color from series 2019-02-20 16:30:55 +03:00
corpglory-dev e867a8f402 prettier fix 2019-02-20 16:08:13 +03:00
corpglory-dev 4edd22589c Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-02-20 14:54:26 +03:00
corpglory-dev 3ab00dfb9a PieChartDataPoint -> PiechartDataPoint 2019-02-20 14:54:08 +03:00
corpglory-dev 76aa208d2a Rename PieChartPanelEditor to PiechartPanelEditor 2019-02-20 14:52:46 +03:00
Torkel Ödegaard 44af31585f Merge branch 'master' into cli/watch-sass-var 2019-02-20 11:15:30 +01:00
Torkel Ödegaard 20a03db144 Merge pull request #15510 from grafana/fix/graphite-func-editor
Display graphite function name editor in a tooltip
2019-02-20 10:48:08 +01:00
Torkel Ödegaard cdac119397 Merge pull request #15542 from grafana/15541-dashboard-model
Pass dashboardModel to PanelCtrl class. Fixes #15541
2019-02-20 09:11:00 +01:00
Daniel Lee 8e90899c02 docs: adds Azure Monitor docs
A copy of the docs from the plugin with some additions and
new images.
2019-02-19 23:33:26 +01:00
Dominik Prokop 5f4f559d19 Fix blue in dark theme 2019-02-19 21:23:04 +01:00
Dominik Prokop 56726397e3 Readme update 2019-02-19 21:15:36 +01:00
corpglory-dev 77f848b56d Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-02-19 21:27:22 +03:00
corpglory-dev d1ef95b936 Minor fixes 2019-02-19 21:26:28 +03:00
corpglory-dev 52e53e39a4 Review fixes 2019-02-19 21:14:24 +03:00
corpglory-dev 0633dba302 Fixes after merging #15468 2019-02-19 21:14:05 +03:00
Daniel Lee c5a70e9b97 Pass dashboardModel to PanelCtrl class. Fixes #15541 2019-02-19 18:53:07 +01:00
corpglory-dev a053fb5908 Add piechart to builtInPlugins 2019-02-19 20:24:50 +03:00
corpglory-dev eaf60d3eb8 logo: svg -> png 2019-02-19 19:35:57 +03:00
Dominik Prokop d19616a16b Merge branch 'master' into cli/watch-sass-var 2019-02-19 17:27:25 +01:00
Dominik Prokop 83bb3fb8d4 Remove old overwritten sass vars 2019-02-19 17:05:50 +01:00
Peter Holmberg 4c5c162045 first draft of repeater component 2019-02-19 17:03:28 +01:00
Leonard Gram dc155dfa2f docs: howto for recreating our debian repositories. 2019-02-19 16:52:47 +01:00
Johannes Schill 6f9edf4a22 fix: Filter out values not supported by Explore yet #15281 2019-02-19 16:43:39 +01:00
Peter Holmberg 0de9c03879 Merge branch 'gauge-multi-series' into bar-gauge-poc 2019-02-19 15:53:05 +01:00
Peter Holmberg 5f56a07a23 Merge branch 'master' into bar-gauge-poc 2019-02-19 15:43:08 +01:00
Dominik Prokop 88a46e6dd4 Bump Prettier version (#15532)
* Fix prettier version to 1.16.4
2019-02-19 15:41:35 +01:00
corpglory-dev 98b22a83af Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-02-19 16:06:00 +03:00
ijin08 2372474ca8 updated theme variables to master 2019-02-19 13:57:56 +01:00