Commit Graph

20719 Commits

Author SHA1 Message Date
Torkel Ödegaard
72e269c8f3
Merge pull request #15572 from grafana/gauge-minor-fix
Minor fix/polish to gauge panel and threshold editor
2019-02-21 14:29:28 +01:00
Torkel Ödegaard
b4627ec302 Minor fix/polish to gauge panel and threshold editor 2019-02-21 13:44:05 +01:00
Torkel Ödegaard
745fd68571 fixed issue in dark sass template 2019-02-21 12:39:22 +01:00
Torkel Ödegaard
67e39a5562 Merge branch 'cli/watch-sass-var-new-colors' 2019-02-21 12:33:10 +01:00
Torkel Ödegaard
3868602581 Updated body & page variables to use variables from code theme 2019-02-21 12:32:29 +01:00
Torkel Ödegaard
b21eb36909 Merge branch 'master' of github.com:grafana/grafana 2019-02-21 12:18:34 +01:00
Torkel Ödegaard
aa589d7217
Merge pull request #15564 from grafana/fixed-snapshots
fixed snapshots failing in master
2019-02-21 12:17:30 +01:00
Torkel Ödegaard
8e21717c12 updated building from source docs 2019-02-21 12:17:02 +01:00
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
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
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
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
Daniel Lee
c5a70e9b97 Pass dashboardModel to PanelCtrl class. Fixes #15541 2019-02-19 18:53:07 +01: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
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
Dominik Prokop
88a46e6dd4 Bump Prettier version (#15532)
* Fix prettier version to 1.16.4
2019-02-19 15:41:35 +01:00
ijin08
2372474ca8 updated theme variables to master 2019-02-19 13:57:56 +01:00
ijin08
547696af19 updated theme template files variables to master 2019-02-19 13:40:43 +01:00
Marcus Efraimsson
df2f33b5b1
add new issue templates 2019-02-19 13:31:32 +01:00
Torkel Ödegaard
5b1cf9c94f
Merge pull request #15530 from grafana/graph2-using-reactpanelplugin
graph2 should use ReactPanelPlugin from @grafana/ui
2019-02-19 12:08:02 +01:00
Torkel Ödegaard
3f1c4c3ed9
Merge pull request #15531 from grafana/hugoh/react-switch-works-outside-switch
Surrounded Switch with div to restrict size
2019-02-19 12:06:59 +01:00
Hugo Häggmark
d2893c2d1a Fixes #15506 2019-02-19 11:17:40 +01:00
Torkel Ödegaard
baddf42c8e
Merge pull request #15515 from grafana/13767_fix
fix native annotation filtered by template variable with pipe
2019-02-19 11:14:04 +01:00
Torkel Ödegaard
fb3463ba4f
Merge pull request #15527 from grafana/15485-tab-in-url
fix: Remove tab param from url when leaving edit mode
2019-02-19 11:11:32 +01:00
Johannes Schill
8876d17dc0 chore: graph2 panel plugin should use the new ReactPanelPlugin from @grafana/ui 2019-02-19 11:00:23 +01:00
Leonard Gram
4df78fe7ac
Update CHANGELOG.md 2019-02-19 10:47:57 +01:00
Leonard Gram
a9748f460e
Update CHANGELOG.md 2019-02-19 10:46:51 +01:00
Leonard Gram
99205d5d9a
Update CHANGELOG.md 2019-02-19 10:40:54 +01:00
Johannes Schill
891b2ca1a2 fix: Have the tab param removed from the url when leaving edit mode #15485 2019-02-19 09:43:35 +01:00
Torkel Ödegaard
14d8a94273
Merge pull request #15521 from grafana/hugoh/bug-type-error-in-thresholds
Fixes #15505
2019-02-19 09:07:01 +01:00
Torkel Ödegaard
104e656bd1
Merge pull request #15514 from grafana/fixed-navbar-edit-padding
Fixed navbar backbutton padding
2019-02-19 09:06:32 +01:00
bergquist
7754c37a1f reduce loglevel to debug 2019-02-19 08:22:33 +01:00
Hugo Häggmark
7f04848dea Fixes #15505 2019-02-19 07:48:54 +01:00