Commits · 30512b7032fec3355ebb21cadf16af0af1c30be5 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

02 Oct, 2014 9 commits
- Merge fix from 'v1.8.x' branch · 30512b70
```
Conflicts:
	CHANGELOG.md
```
  Torkel Ödegaard committed Oct 02, 2014
  30512b70 Browse Files
- Dashboard: fix for dashboard schema upgrade during load, ensure that annotation… · bc8fd62c
```
Dashboard: fix for dashboard schema upgrade during load, ensure that annotation and templating object as a list array, Closes #890
```
  Torkel Ödegaard committed Oct 02, 2014
  bc8fd62c Browse Files
- Fix to new checkboxes in features toggles tab · a9a51ee3
  Torkel Ödegaard committed Oct 02, 2014
  
  a9a51ee3 Browse Files
- Small tweak to shared tooltip edit option in Display styles tab · 2d2da7c8
  Torkel Ödegaard committed Oct 02, 2014
  
  2d2da7c8 Browse Files
- Added grafana logo to repo instead of fetching it from grafana.org, Fixes #881 · d22d8c49
  Torkel Ödegaard committed Oct 02, 2014
  
  d22d8c49 Browse Files
- Updated gitter badge · bcdc8eaf
  Torkel Ödegaard committed Oct 02, 2014
  
  bcdc8eaf Browse Files
- Updated gitter badge · 9cf6ace9
  Torkel Ödegaard committed Oct 02, 2014
  
  9cf6ace9 Browse Files
- Merge pull request #889 from gitter-badger/gitter-badge · eef063ce
```
Add a Gitter chat badge to README.md
```
  Torkel Ödegaard committed Oct 02, 2014
  eef063ce Browse Files
- Added Gitter badge · 8b9bdf90
  The Gitter Badger committed Oct 02, 2014
  
  8b9bdf90 Browse Files
01 Oct, 2014 11 commits
- Dashboard: show error when importing dashboard json file with broken/incorrect… · 1c7b898b
```
Dashboard: show error when importing dashboard json file with broken/incorrect json syntax, Closes #878
```
  Torkel Ödegaard committed Oct 01, 2014
  1c7b898b Browse Files
- update to test helper · 7ad18da0
  Torkel Ödegaard committed Oct 01, 2014
  
  7ad18da0 Browse Files
- Updated AngularJS from 1.3-beta-17 to 1.3-RC3 · 5530915b
  Torkel Ödegaard committed Oct 01, 2014
  
  5530915b Browse Files
- Graph: shared tooltip improvements, info tooltip when point counts are not the same, #850 · 77f380c9
  Torkel Ödegaard committed Oct 01, 2014
  
  77f380c9 Browse Files
- More fixes related to shared crosshair #880 · c79ab84f
  Torkel Ödegaard committed Oct 01, 2014
  
  c79ab84f Browse Files
- Fixed unit tests for grafanaGraph component · d77448d8
  Torkel Ödegaard committed Oct 01, 2014
  
  d77448d8 Browse Files
- Refactoring and fixes for PR #880 · 8fc5a278
  Torkel Ödegaard committed Oct 01, 2014
  
  8fc5a278 Browse Files
- Merge branch 'add_shared_croshair_to_dashboards' of… · 27da2b02
```
Merge branch 'add_shared_croshair_to_dashboards' of github.com:toni-moreno/grafana into toni-moreno-add_shared_croshair_to_dashboards
```
  Torkel Ödegaard committed Oct 01, 2014
  27da2b02 Browse Files
- Fix for SharePanelCtrl-specs and travis-ci timezone issue · 2e9cc2a7
  Torkel Ödegaard committed Oct 01, 2014
  
  2e9cc2a7 Browse Files
- fix tooltip test expecting for stacked data · ffd37017
  toni-moreno committed Oct 01, 2014
  
  ffd37017 Browse Files
- Added shared crosshair to dashboards to track better all graphs, and little Fix for #884 · 44f2a375
  toni-moreno committed Oct 01, 2014
  
  44f2a375 Browse Files
30 Sep, 2014 17 commits
- Updated changelog · 05cb9781
  Torkel Ödegaard committed Sep 30, 2014
  
  05cb9781 Browse Files
- updated package.json · 282c834d
  Torkel Ödegaard committed Sep 30, 2014
  
  282c834d Browse Files
- Merge branch 'v1.8.x' · 4a6ff9e2
  Torkel Ödegaard committed Sep 30, 2014
  
  4a6ff9e2 Browse Files
- Graph: css & scroll fix for dropdown menus in graph edit mode, Closes #855 · ce972d4f
  Torkel Ödegaard committed Sep 30, 2014
  
  ce972d4f Browse Files
- Trying to fox unit tests for sharePanelCtrl · b250d103
  Torkel Ödegaard committed Sep 30, 2014
  
  b250d103 Browse Files
- Small update to share panel · f63706d1
  Torkel Ödegaard committed Sep 30, 2014
  
  f63706d1 Browse Files
- ShareModal: Added template variables to share url, and an option for it, #864 · c41aa647
  Torkel Ödegaard committed Sep 30, 2014
  
  c41aa647 Browse Files
- PanelMenu: fixed interpolate template vars for new panel title/menu · 285d246c
  Torkel Ödegaard committed Sep 30, 2014
  
  285d246c Browse Files
- SharePanelModal: working on share feature, #864 · 2c852052
  Torkel Ödegaard committed Sep 30, 2014
  
  2c852052 Browse Files
- Updated changelog with the new panel menu, Closes #770 · 2d866b92
  Torkel Ödegaard committed Sep 30, 2014
  
  2d866b92 Browse Files
- Panel-menu: small tweeks to css for cursor types · 7a7629ac
  Torkel Ödegaard committed Sep 30, 2014
  
  7a7629ac Browse Files
- New checkbox change is complete · debf8200
  Torkel Ödegaard committed Sep 30, 2014
  
  debf8200 Browse Files
- added checkbox image for white theme · f908ae8c
  Torkel Ödegaard committed Sep 30, 2014
  
  f908ae8c Browse Files
- Merge branch 'master' into panel_edit_menu_poc · 022cbdda
  Torkel Ödegaard committed Sep 30, 2014
  
  022cbdda Browse Files
- Merge branch 'v1.8.x' · ae2523aa
  Torkel Ödegaard committed Sep 30, 2014
  
  ae2523aa Browse Files
- Updated package.json version and latest.json, preparation for 1.8.1 release · bf361d2b
  Torkel Ödegaard committed Sep 30, 2014
  
  bf361d2b Browse Files
- InfluxDB: save dashboard issue, another fix for #859 · 64f33037
  Torkel Ödegaard committed Sep 30, 2014
  
  64f33037 Browse Files
29 Sep, 2014 3 commits
- Merge branch 'master' of github.com:grafana/grafana · 06f382c4
  Torkel Ödegaard committed Sep 29, 2014
  
  06f382c4 Browse Files
- Updated changelog with merged PR #850, shared multi series graph tooltip & crosshair · 5f164d99
  Torkel Ödegaard committed Sep 29, 2014
  
  5f164d99 Browse Files
- Graph: shared multi series tooltip, refactoring PR #850 · 2473ae3b
  Torkel Ödegaard committed Sep 29, 2014
  
  2473ae3b Browse Files