Torkel Ödegaard
|
8847da0d69
|
Merge pull request #16121 from joshuawoodward/patch-1
Update PLUGIN_DEV.md
|
2019-03-21 08:36:52 +01:00 |
|
Torkel Ödegaard
|
6b6029d82d
|
Merge pull request #16117 from grafana/very-alpha-pie-chart
Very alpha pie chart
|
2019-03-21 08:36:25 +01:00 |
|
Torkel Ödegaard
|
85b0df551c
|
Minor refactoring of testdata query order PR #16122
|
2019-03-21 08:01:44 +01:00 |
|
ryan
|
c91e5a2db4
|
cleaner version
|
2019-03-20 14:50:46 -07:00 |
|
ryan
|
80d6475224
|
maintain query order
|
2019-03-20 12:50:58 -07:00 |
|
Joshua Woodward
|
742a76e4c5
|
Update PLUGIN_DEV.md
|
2019-03-20 12:24:54 -07:00 |
|
Torkel Ödegaard
|
e4e553b5a2
|
Merge with master, and updated logo and name
|
2019-03-20 19:17:23 +01:00 |
|
Torkel Ödegaard
|
ac82fc03d9
|
Merge branch 'piechart-react' of https://github.com/CorpGlory/grafana into CorpGlory-piechart-react
|
2019-03-20 19:01:37 +01:00 |
|
Torkel Ödegaard
|
93677f16d3
|
Merge pull request #16095 from ryantxu/flot-pairs
calculate flot pairs
|
2019-03-20 18:52:10 +01:00 |
|
Torkel Ödegaard
|
3884ac855e
|
Merge pull request #16105 from grafana/graphite-fix-0-arg
Graphite: fixed nonNegativeDerivative argument hidden if 0
|
2019-03-20 18:18:47 +01:00 |
|
Torkel Ödegaard
|
bb14be9148
|
Merge pull request #16115 from ryantxu/column-types
update TableData model
|
2019-03-20 18:12:10 +01:00 |
|
ryan
|
a9cc8a8992
|
update table data model
|
2019-03-20 09:45:19 -07:00 |
|
ryan
|
2c8e1cbdb1
|
merge with master
|
2019-03-20 08:16:34 -07:00 |
|
Torkel Ödegaard
|
78d93315a9
|
fix(graphite): nonNegativeDerivative argument hidden if 0, fixes #12488
|
2019-03-20 15:35:34 +01:00 |
|
Oleg Gaidarenko
|
30f0c35006
|
Merge pull request #16104 from markelog/remotecache-small-fix
Correct table names of sql storage for remotecache
|
2019-03-20 14:08:02 +01:00 |
|
Oleg Gaidarenko
|
c5bc723a6e
|
Correct table names of sql storage for remotecache
|
2019-03-20 13:24:56 +01:00 |
|
Torkel Ödegaard
|
e5d84f8c74
|
Merge pull request #15967 from grafana/bump-webpack
Bump npm packages related to the dev process
|
2019-03-20 11:00:45 +01:00 |
|
Torkel Ödegaard
|
665f7acade
|
Merge branch 'master' of github.com:grafana/grafana
|
2019-03-20 10:59:41 +01:00 |
|
Torkel Ödegaard
|
1085055d61
|
Merge PR https://github.com/grafana/grafana/pull/16093
|
2019-03-20 10:59:05 +01:00 |
|
Torkel Ödegaard
|
d11695b8b5
|
Fixed gofmt issue in PR #16093
|
2019-03-20 10:58:20 +01:00 |
|
Torkel Ödegaard
|
ab5848ca14
|
Merge pull request #16096 from grafana/fix/15691-refresh-issue-playlists
Fixing issue with refresh playlists
|
2019-03-20 10:52:16 +01:00 |
|
Torkel Ödegaard
|
fd4ee6b032
|
Merge branch 'patch-1' of https://github.com/sairam0903/grafana into sairam0903-patch-1
|
2019-03-20 10:50:11 +01:00 |
|
Johannes Schill
|
13f70be5f0
|
fix: Update snapshot related to new jest version
|
2019-03-20 10:36:33 +01:00 |
|
Torkel Ödegaard
|
0091b86e9c
|
Merge pull request #16078 from grafana/secret-input-field-component
Secret input field component
|
2019-03-20 10:15:33 +01:00 |
|
Johannes Schill
|
e0e6dd8fb0
|
Regenerate lockfile due to the amount of merge conflicts.
|
2019-03-20 09:50:53 +01:00 |
|
Johannes Schill
|
7dec4a9f2d
|
Merge branch 'master' into bump-webpack
# Conflicts:
# package.json
# yarn.lock
|
2019-03-20 09:43:33 +01:00 |
|
Andrej Ocenas
|
a26dc64ebe
|
Remove commented code
|
2019-03-20 09:20:30 +01:00 |
|
Peter Holmberg
|
81afd68752
|
Merge branch 'master' into fix/15691-refresh-issue-playlists
|
2019-03-20 09:17:57 +01:00 |
|
Torkel Ödegaard
|
abd8948478
|
Merge pull request #15864 from ryantxu/all-data-as-table
Use TableData for all data in react
|
2019-03-20 09:15:06 +01:00 |
|
Torkel Ödegaard
|
0a2d69c794
|
Merge pull request #16089 from grafana/no-implicit-any-fixes-p4
Fixed no implicit any for form dropdown & panel model
|
2019-03-20 07:01:14 +01:00 |
|
Torkel Ödegaard
|
b203868a9f
|
Merge pull request #16034 from ryantxu/table-cell-measure
Don't measure cell widths in react table
|
2019-03-20 06:59:19 +01:00 |
|
ryan
|
2f8dd898b0
|
flot pairs
|
2019-03-19 22:22:38 -07:00 |
|
Sai Ram Gupta
|
6929593eb6
|
Update org_user.go
Add check for, if current role is ROLE_VIEWER, return true if the role I'm checking for is ROLE_VIEWER. Fixes #16092
|
2019-03-19 11:31:55 -07:00 |
|
Torkel Ödegaard
|
f69f0c2c31
|
Merge pull request #16079 from grafana/fix/threshold-custom-color
Fix threshold editor color picker not working for custom colors
|
2019-03-19 18:39:17 +01:00 |
|
Torkel Ödegaard
|
4f134ea4b8
|
Merge pull request #16080 from grafana/hugoh/no-implicit-any
Cleaning up no implicit anys in search_srv and tests
|
2019-03-19 18:26:28 +01:00 |
|
Torkel Ödegaard
|
42c87141a5
|
Minor progress on fixing no-implicit any issues
|
2019-03-19 18:24:47 +01:00 |
|
Hugo Häggmark
|
d845aacbdc
|
refactor: merged types and updated references
|
2019-03-19 17:44:58 +01:00 |
|
ryan
|
08d6540cbb
|
merge master
|
2019-03-19 09:26:15 -07:00 |
|
Torkel Ödegaard
|
b8be6aa3b8
|
Merge pull request #16084 from yalhyane/patch-1
Fixing docs typo in templating.md
|
2019-03-19 17:06:10 +01:00 |
|
Torkel Ödegaard
|
a1a60ceae0
|
Merge pull request #16087 from grafana/chore/bump-react
chore: Bump react and react-dom to 16.8.4
|
2019-03-19 17:00:11 +01:00 |
|
Dominik Prokop
|
9205b82f19
|
Remove leftover from first iteration
|
2019-03-19 16:38:14 +01:00 |
|
Peter Holmberg
|
5adb923ace
|
Only keep certain query params when going to next playlist
|
2019-03-19 16:34:33 +01:00 |
|
Dominik Prokop
|
12d452ce92
|
Snapshot update
|
2019-03-19 16:31:26 +01:00 |
|
Dominik Prokop
|
1178115d50
|
fix: ts issue on SelectOption test
|
2019-03-19 16:15:19 +01:00 |
|
Dominik Prokop
|
512f2dd024
|
chore: Bump react and react-dom to 16.8.4
|
2019-03-19 16:11:47 +01:00 |
|
Hugo Häggmark
|
124bedbf24
|
Update latest.json
|
2019-03-19 15:44:10 +01:00 |
|
yalhyane
|
9a4a8b0f85
|
Update templating.md
fix a typo in the example of `percentencode` option
|
2019-03-19 14:39:26 +00:00 |
|
Hugo Häggmark
|
40978ee08a
|
Update CHANGELOG.md
|
2019-03-19 15:10:00 +01:00 |
|
Leonard Gram
|
f2b06a89f2
|
Merge pull request #15977 from grafana/admin-on-create-poc
Editors becomes admin when creating dashboards, folders & teams
|
2019-03-19 15:02:52 +01:00 |
|
Torkel Ödegaard
|
531176b559
|
Merge pull request #16077 from grafana/gauge-change-options-render
Re-render gauge / singlestat panels when changing options
|
2019-03-19 15:01:26 +01:00 |
|