Commit Graph

762 Commits

Author SHA1 Message Date
Torkel Ödegaard
e4e553b5a2 Merge with master, and updated logo and name 2019-03-20 19:17:23 +01:00
ryan
e7a6041d22 Merge remote-tracking branch 'grafana/master' into show-all-columns
* grafana/master:
  flot pairs
2019-03-20 11:16:03 -07: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
ryan
0cfa929d4c incorporate torkels feedback 2019-03-20 10:32:34 -07:00
ryan
5947c1f76d cast to column 2019-03-20 09:56:53 -07:00
ryan
a9cc8a8992 update table data model 2019-03-20 09:45:19 -07:00
ryan
c4a503dbc5 show all columns in singlestats 2019-03-20 09:07:11 -07:00
ryan
2c8e1cbdb1 merge with master 2019-03-20 08:16:34 -07:00
ijin08
6471f6feb0 more fixes to snapshot 2019-03-20 11:37:45 +01:00
ijin08
67e802c595 more fixes to snapshot 2019-03-20 11:13:19 +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
ijin08
7fcb9777c0 removed empty space in snapshot 2019-03-20 10:49:34 +01:00
Johannes Schill
13f70be5f0 fix: Update snapshot related to new jest version 2019-03-20 10:36:33 +01:00
ijin08
2a53be050c fixed snapshot for test 2019-03-20 10:29:28 +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
ijin08
9e57195b1d removed dashboard variables, removed headings-font-family variable, created theme variables for links and z-index, removed unused class in _panel_editor and _dashboard 2019-03-20 09:48:19 +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
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
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
ryan
7e56514c5a add more functions and tests 2019-03-19 21:19:58 -07:00
ryan
37bb5ef790 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master: (101 commits)
  refactor: merged types and updated references
  Remove leftover from first iteration
  Snapshot update
  fix: ts issue on SelectOption test
  chore: Bump react and react-dom to 16.8.4
  Update latest.json
  Update templating.md
  Update CHANGELOG.md
  chore: cleaning up noimplicit anys in search_srv and tests progress: #14714
  Fix threshold editor color picker not working for custom colors
  Updated threshold editor test
  Re-render gauge / singlestat panels when changing options
  fix: refactored so members are loaded by TeamPages and use hideFromTabs instead of filtering out children in navModel
  teams: explains the external property of a team membership.
  fix: fixed snapshots and permission select not beeing able to click
  fix: new team link goes nowhere for viewers
  teams: refactor so that you can only delete teams if you are team admin
  permissions: removes global access to bus from MakeUserAdmin.
  teams: local access to bus, moving away from dep on global.
  teams: better names for api permissions.
  ...
2019-03-19 20:30:11 -07:00
ryan
08d6540cbb merge master 2019-03-19 09:26:15 -07: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
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
Andrej Ocenas
aa14d7528c Updated comments 2019-03-19 14:16:01 +01:00
Torkel Ödegaard
2ca5149c67 Updated threshold editor test 2019-03-19 14:12:47 +01:00
Hugo Häggmark
b82b94a247 teams: disable buttons for team members 2019-03-19 14:01:15 +01:00
Torkel Ödegaard
b8c355514d Merge branch 'master' into bar-gauge-refactoring 2019-03-19 13:43:49 +01:00
Andrej Ocenas
d8167ffb88 Add SecretFormField component 2019-03-19 13:40:17 +01:00
Andrej Ocenas
0d84a3fbe2 Add possibility to pass custom input component to FormField 2019-03-19 13:40:17 +01:00
Torkel Ödegaard
6be416dd93 Merge branch 'master' into bar-gauge-refactoring 2019-03-19 13:40:02 +01:00
Peter Holmberg
d075af2b67 adding story and fixing tests 2019-03-19 13:14:32 +01:00
ryan
9b4d2a5ffa remove the error collector 2019-03-18 15:06:57 -07:00
Torkel Ödegaard
32d80f2da8 Merge pull request #16045 from grafana/hugoh/no-implicit-any
Cleaning up implicit anys in DashboardExporter and tests
2019-03-18 22:50:23 +01:00
Torkel Ödegaard
89bf94b07c Merge pull request #16054 from grafana/input-to-grafanaui2
Input to grafanaui2
2019-03-18 22:49:40 +01:00
ryan
ed1b515f82 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master:
  docs: renamed file and added redux framework file
  docs: moved examples to frontend.md
  docs: intial draft for frontend review doc
  Use ora#fail instead of console.log
  Remove .only function
  Add more patterns to no-only-test task
2019-03-18 14:19:50 -07:00
Peter Holmberg
384e11fd68 Copied from new timepicker and unified component branch 2019-03-18 15:41:46 +01:00
Peter Holmberg
c0eb140297 moving 2019-03-18 10:41:28 +01:00
Andrej Ocenas
dcc5373e77 Remove .only function 2019-03-18 10:40:04 +01:00
Hugo Häggmark
0eb2ca3ffd chore: Cleaning up implicit anys in DashboardExporter and tests
progress: #14714
2019-03-18 07:42:43 +01:00
ryan
a0fa5698e0 rename reducer to statsCalculator 2019-03-17 18:02:09 -07:00
ryan
2969507784 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master: (75 commits)
  Explore: Fix log stats for long labels
  dont test exists in the test... it will fail if not found
  add random_walk_table scenario
  add test file
  add startAt to random walk scenario
  get values from base options
  use singlestat base where appropriate
  feature(explore/table): Add tooltips to explore table (#16007)
  Update changelog
  Add check for Env before log
  Update index.md
  chore: Cleaning up implicit anys in manage_dashboard.ts and manage_dashboard.test.ts progress: #14714
  chore: Cleaning up implicit anys in app.ts progress: #14714
  changelog: adds note about closing #15836
  changelog: adds note about closing #6359 and #15931
  add partial
  no inheratance
  improve single stat display
  revert most options sharing
  add migration tests
  ...
2019-03-17 16:48:54 -07:00
Torkel Ödegaard
1303a66725 Great progress on bar gauge look 2019-03-17 13:59:26 +01:00
ryan
a6132d7648 merge singlestat refactor 2019-03-15 15:37:56 -07:00
ryan
9bcc9b062c calculate the column width 2019-03-15 13:52:32 -07:00