Skip to content

Commit

Permalink
Merge remote-tracking branch 'grafana/master' into timepicker-tooltip
Browse files Browse the repository at this point in the history
* grafana/master: (2079 commits)
  Fixes undefined issue with angular panels and editorTabs
  changelog: adds note about closing grafana#14562
  Update field name
  Add documentation
  Rename the setting and add description
  export init notifier func
  Increase recent and starred limit in search and home dashboard, closes grafana#13950
  changelog: adds note about closing grafana#14486
  Panel help view fixes
  Add min/max height when resizing and replace debounce with throttle
  changelog: adds note about closing grafana#14546
  Adding tests for auth proxy CIDR support
  changelog: adds note about closing grafana#14109
  fix signed in user for orgId=0 result should return active org id
  Another take on resizing the panel, now using react-draggable
  Raise datasources number to 5000
  copy props to state to make it visible in the view
  refactor to not crash when no links
  updating snaps
  renaming component
  ...
  • Loading branch information
ryantxu committed Dec 19, 2018
2 parents 0977591 + 2325c5d commit a15dc23
Show file tree
Hide file tree
Showing 1,485 changed files with 93,142 additions and 20,666 deletions.
11 changes: 11 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"presets": [
[
"@babel/preset-env",
{
"targets": { "browsers": "last 3 versions" },
"useBuiltIns": "entry"
}
]
]
}
5 changes: 3 additions & 2 deletions .bra.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[run]
init_cmds = [
["go", "run", "build.go", "-dev", "build-server"],
["./bin/grafana-server", "cfg:app_mode=development"]
["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
]
watch_all = true
follow_symlinks = true
watch_dirs = [
"$WORKDIR/pkg",
"$WORKDIR/public/views",
Expand All @@ -13,5 +14,5 @@ watch_exts = [".go", ".ini", ".toml", ".template.html"]
build_delay = 1500
cmds = [
["go", "run", "build.go", "-dev", "build-server"],
["./bin/grafana-server", "cfg:app_mode=development"]
["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
]
Loading

0 comments on commit a15dc23

Please sign in to comment.