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
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
Andrej Ocenas
a26dc64ebe
Remove commented code
2019-03-20 09:20:30 +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
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
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
Torkel Ödegaard
c19a47d34f
Merge pull request #16008 from grafana/bar-gauge-refactoring
...
Refactoring the bar gauge and the orientation modes
2019-03-19 15:00:30 +01:00
Hugo Häggmark
c1d585b156
chore: cleaning up noimplicit anys in search_srv and tests
...
progress: #14714
2019-03-19 14:48:35 +01:00
Dominik Prokop
97a000c319
Fix threshold editor color picker not working for custom colors
...
When user selected Custom as an option for a threshold colors, the Custom color picker did not work. The problem was caused by threshold model not including the default colors for fill and line colors when custom was selected. Now, when changing the type to custom, the default valoues are set.
2019-03-19 14:47:48 +01:00
Andrej Ocenas
aa14d7528c
Updated comments
2019-03-19 14:16:01 +01:00
Leonard Gram
95f7a91328
Merge pull request #16069 from xlson/ci-deploy-speedup
...
build: crcmod speedups rsync to gcp for deploy.
2019-03-19 14:13:15 +01:00
Torkel Ödegaard
2ca5149c67
Updated threshold editor test
2019-03-19 14:12:47 +01:00
Leonard Gram
2ca8d17874
Merge pull request #16071 from xlson/include-build-container
...
build: migrates the build container into the main repo.
2019-03-19 14:10:02 +01:00
Torkel Ödegaard
d597271844
Re-render gauge / singlestat panels when changing options
2019-03-19 14:07:48 +01:00
Hugo Häggmark
53322a51e2
fix: refactored so members are loaded by TeamPages and use hideFromTabs instead of filtering out children in navModel
2019-03-19 14:01:22 +01:00
Leonard Gram
978c20a604
teams: explains the external property of a team membership.
2019-03-19 14:01:22 +01:00
Hugo Häggmark
e23e6a8bdc
fix: fixed snapshots and permission select not beeing able to click
2019-03-19 14:01:21 +01:00
Hugo Häggmark
b71c9803a9
fix: new team link goes nowhere for viewers
2019-03-19 14:01:21 +01:00
Hugo Häggmark
53c74fa2f5
teams: refactor so that you can only delete teams if you are team admin
2019-03-19 14:01:21 +01:00
Leonard Gram
a615b78f8a
permissions: removes global access to bus from MakeUserAdmin.
2019-03-19 14:01:20 +01:00
Leonard Gram
adf0390b2c
teams: local access to bus, moving away from dep on global.
2019-03-19 14:01:20 +01:00
Leonard Gram
6589a4e55f
teams: better names for api permissions.
2019-03-19 14:01:20 +01:00
Leonard Gram
9f33f00343
teams: refactor.
2019-03-19 14:01:19 +01:00
Leonard Gram
9f8e43916d
permissions: refactor.
2019-03-19 14:01:19 +01:00
Leonard Gram
b796027bc6
teams: refactor.
2019-03-19 14:01:19 +01:00
Hugo Häggmark
13ed10495a
teams: hide tabs settings and groupsync for non team admins
2019-03-19 14:01:18 +01:00
Leonard Gram
d1481cac50
teams: refactored db code.
2019-03-19 14:01:18 +01:00
Hugo Häggmark
8c34f595f0
teams: disable new team button if user is viewer
2019-03-19 14:01:18 +01:00
Hugo Häggmark
e3fc61b326
refactor: moved test from TeamMembers to TeamMemberRow
2019-03-19 14:01:17 +01:00
Hugo Häggmark
178d637b4e
refactor: splitted TeamMembers to TeamMemberRow
2019-03-19 14:01:17 +01:00
Hugo Häggmark
6a63725df0
teams: comment explaining input validation
...
Co-Authored-By: xlson <leo@xlson.com>
2019-03-19 14:01:17 +01:00
Leonard Gram
3f57a81c47
teams: cleanup.
2019-03-19 14:01:16 +01:00
Leonard Gram
ccfd6789ca
teams: cleanup.
2019-03-19 14:01:16 +01:00
