Commits · 8ad37ea926d01244c624c09e5e05f19ff1c58565 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

13 Nov, 2018 27 commits
- Merge branch 'develop' of github.com:grafana/grafana into develop · 8ad37ea9
  Torkel Ödegaard committed Nov 13, 2018
  
  8ad37ea9 Browse Files
- Merge branch 'master' into develop · b530b9ce
  Torkel Ödegaard committed Nov 13, 2018
  
  b530b9ce Browse Files
- Merge pull request #14053 from grafana/singlestat-fix · f50dc4e9
```
fixed singlestat guage ceneterd dot rendering issue
```
  Torkel Ödegaard committed Nov 13, 2018
  f50dc4e9 Browse Files
- fixed singlestat guage ceneterd dot rendering issue · b5921ef2
  Torkel Ödegaard committed Nov 13, 2018
  
  b5921ef2 Browse Files
- Merge branch 'master' of github.com:grafana/grafana into develop · 2c6963fc
  Torkel Ödegaard committed Nov 13, 2018
  
  2c6963fc Browse Files
- Merge pull request #14020 from grafana/12759-timeshift · 51a95963
```
12759 timeshift and panelTimeOverrides
```
  Torkel Ödegaard committed Nov 13, 2018
  51a95963 Browse Files
- refactoring back the interval calculation, needs to be different for react panels · 6d91e06f
  Torkel Ödegaard committed Nov 13, 2018
  
  6d91e06f Browse Files
- fix case where timeshift and time override is used · f026be37
  Torkel Ödegaard committed Nov 13, 2018
  
  f026be37 Browse Files
- wip: refactoring interval and time override handling · f274195d
  Torkel Ödegaard committed Nov 13, 2018
  
  f274195d Browse Files
- Merge pull request #14043 from bergquist/upgrade_macaron_session · 81a5b900
```
Upgrades the go-macaroon package
```
  Carl Bergquist committed Nov 13, 2018
  81a5b900 Browse Files
- updates latest to 5.3.4 · a0496d55
  bergquist committed Nov 13, 2018
  
  a0496d55 Browse Files
- changelod: add release date for 5.3.3 and 5.3.4 · 3a672c6d
  bergquist committed Nov 13, 2018
  
  3a672c6d Browse Files
- Merge pull request #14042 from grafana/restore_prefs_control · aa47f80f
```
Restore user profile preferences
```
  Marcus Efraimsson committed Nov 13, 2018
  aa47f80f Browse Files
- adds redis devenv block · 5954ab2c
  bergquist committed Nov 13, 2018
  
  5954ab2c Browse Files
- restore user profile preferences · 69a57850
  Marcus Efraimsson committed Nov 13, 2018
  
  69a57850 Browse Files
- Merge branch 'develop' into 12759-timeshift · d49e857b
  Torkel Ödegaard committed Nov 13, 2018
  
  d49e857b Browse Files
- Merge pull request #14039 from grafana/minor-react-panels-refactor · 700c9642
```
minor react panels refafactor
```
  Torkel Ödegaard committed Nov 13, 2018
  700c9642 Browse Files
- changelog: add notes about closing #13328 #13949 · 97c6f356
```
[skip ci]
```
  Marcus Efraimsson committed Nov 13, 2018
  97c6f356 Browse Files
- updates macaron session package · d5555f12
  bergquist committed Nov 13, 2018
  
  d5555f12 Browse Files
- Merge branch 'develop' into 12759-timeshift · 81a9a3a3
  Torkel Ödegaard committed Nov 13, 2018
  
  81a9a3a3 Browse Files
- minor react panels refafactor · 7b805bdb
  Torkel Ödegaard committed Nov 13, 2018
  
  7b805bdb Browse Files
- Merge pull request #14038 from grafana/plugin-not-found · 6b2a47f2
```
Plugin not found
```
  Torkel Ödegaard committed Nov 13, 2018
  6b2a47f2 Browse Files
- removed console.log · e331d24a
  Torkel Ödegaard committed Nov 13, 2018
  
  e331d24a Browse Files
- some cleanup of unused stuff and type fixes · 9820c780
  Torkel Ödegaard committed Nov 13, 2018
  
  9820c780 Browse Files
- completed work on panel not found view · 9dbb0db6
  Torkel Ödegaard committed Nov 13, 2018
  
  9dbb0db6 Browse Files
- Merge pull request #14037 from matschaffer/patch-2 · 68eecf6c
```
Clarify wording of playlist protip
```
  Torkel Ödegaard committed Nov 13, 2018
  68eecf6c Browse Files
- Clarify wording of playlist protip · f6313fe6
```
Per discussion on https://github.com/grafana/grafana/commit/154fbe2413f9abe33157baa563e42fbf67e2f27b#r31238888 it seemed like this wording might be easier to understand.
```
  Mat Schaffer committed Nov 13, 2018
  f6313fe6 Browse Files
12 Nov, 2018 13 commits
- wip: panel plugin not found · 119e94f7
  Torkel Ödegaard committed Nov 12, 2018
  
  119e94f7 Browse Files
- fixed scrollbar autohide prop · 7a30220d
  Torkel Ödegaard committed Nov 12, 2018
  
  7a30220d Browse Files
- Merge branch 'pane-edit-ux-tabs' into develop · 727efa5a
  Torkel Ödegaard committed Nov 12, 2018
  
  727efa5a Browse Files
- Merge remote-tracking branch 'origin/data-source-settings-to-react' into develop · e0feb726
  Torkel Ödegaard committed Nov 12, 2018
  
  e0feb726 Browse Files
- Merge pull request #14023 from grafana/gauge-panel · a2a44589
```
React Gauge Panel - first step
```
  Torkel Ödegaard committed Nov 12, 2018
  a2a44589 Browse Files
- wip: panel-header: On panel refresh, get new timeRange from timeSrv, not the old one from the state · 6d4d7c50
  Johannes Schill committed Nov 12, 2018
  
  6d4d7c50 Browse Files
- wip: panel-header: Avoid null returning to get better code readability. High five @ peterholmberg · e0451690
  Johannes Schill committed Nov 12, 2018
  
  e0451690 Browse Files
- wip: panel-header: Remove the TimeData type · a3f1a1c6
  Johannes Schill committed Nov 12, 2018
  
  a3f1a1c6 Browse Files
- wip: panel-header: Add proper typings to maxDataPoints and interval + remove code in comment · 8117a755
  Johannes Schill committed Nov 12, 2018
  
  8117a755 Browse Files
- wip: panel-header: Move getResolution and calculateInterval into utils-functions… · e55f3f88
```
wip: panel-header: Move getResolution and calculateInterval into utils-functions and use the same code from react and angular
```
  Johannes Schill committed Nov 12, 2018
  e55f3f88 Browse Files
- wip: panel-header: Start implementing the applyPanelTimeOverrides in the react… · 9fd62b80
```
wip: panel-header: Start implementing the applyPanelTimeOverrides in the react panels by moving it to a util, make it pure and call it from angular and react.
```
  Johannes Schill committed Nov 12, 2018
  9fd62b80 Browse Files
- import changes · 490fb9e8
  Peter Holmberg committed Nov 12, 2018
  
  490fb9e8 Browse Files
- Merge pull request #14021 from mjtrangoni/fix-gofmt-issues · fdbea757
```
Fix gofmt issues
```
  Carl Bergquist committed Nov 12, 2018
  fdbea757 Browse Files