Commits · d812414621de85cc242236bde89035cd663cd7e3 · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

29 Apr, 2015 11 commits
- Merge branch 'github-team-membership-requirement' of… · d8124146
```
Merge branch 'github-team-membership-requirement' of https://github.com/dewski/grafana into dewski-github-team-membership-requirement
```
  Torkel Ödegaard committed Apr 29, 2015
  d8124146 Browse Files
- Merge branch 'issue1862' of https://github.com/raintank/grafana into raintank-issue1862 · 52c32d8b
  Torkel Ödegaard committed Apr 29, 2015
  
  52c32d8b Browse Files
- Merge branch 'issue1907' of https://github.com/raintank/grafana · eace358f
```
Conflicts:
	pkg/api/dtos/models.go
```
  Torkel Ödegaard committed Apr 29, 2015
  eace358f Browse Files
- expose org id to frontend, Closes #1907 · e7c43bf6
  Torkel Ödegaard committed Apr 29, 2015
  
  e7c43bf6 Browse Files
- expose orgId via currentUser object. fixes #1907 · 81636d86
  Anthony Woods committed Apr 29, 2015
  
  81636d86 Browse Files
- refactor handling of refresh when urlValues being used for templates. fixes #1862 · b72eba1e
  Anthony Woods committed Apr 29, 2015
  
  b72eba1e Browse Files
- Update documentation for team_ids option · 1fdc5277
  Garrett Bjerkhoel committed Apr 28, 2015
  
  1fdc5277 Browse Files
- Handle special error case if connect.UserInfo returns an error · 1d7f9452
  Garrett Bjerkhoel committed Apr 28, 2015
  
  1d7f9452 Browse Files
- Check for active team membership when fetching s.UserInfo · eb37fc08
  Garrett Bjerkhoel committed Apr 28, 2015
  
  eb37fc08 Browse Files
- Add new error type for team membership permissions · 979d0ca7
  Garrett Bjerkhoel committed Apr 28, 2015
  
  979d0ca7 Browse Files
- Add team_ids configuration option · 7ea579bb
  Garrett Bjerkhoel committed Apr 28, 2015
  
  7ea579bb Browse Files
27 Apr, 2015 6 commits
- Using CTRL+S should not work when dashboardMeta.canSave is false, #1834 · 8a986ec3
  Torkel Ödegaard committed Apr 27, 2015
  
  8a986ec3 Browse Files
- Stop users from entering panel edit mode when dashboard editable is false, #1834 · b0ef659a
  Torkel Ödegaard committed Apr 27, 2015
  
  b0ef659a Browse Files
- Small fix for unsaved changes when using save as feature · 29a7490a
  Torkel Ödegaard committed Apr 27, 2015
  
  29a7490a Browse Files
- Merge branch 'editable_false' of github.com:grafana/grafana into editable_false · ad45b63e
  Torkel Ödegaard committed Apr 27, 2015
  
  ad45b63e Browse Files
- More work on editable false dashboards, #1834 · 16fc6e8b
  Torkel Ödegaard committed Apr 27, 2015
  
  16fc6e8b Browse Files
- Merge branch 'master' into editable_false · af277f56
  Torkel Ödegaard committed Apr 27, 2015
  
  af277f56 Browse Files
26 Apr, 2015 1 commit
- Merge pull request #1867 from maddenca/patch-1 · d66e510c
```
Documented units for timepicker
```
  Torkel Ödegaard committed Apr 26, 2015
  d66e510c Browse Files
25 Apr, 2015 5 commits
- Corrected SQL migration for snapshot table column type change, #1880 · e410fbb5
  Torkel Ödegaard committed Apr 25, 2015
  
  e410fbb5 Browse Files
- Merge pull request #1881 from raintank/issue1880 · 4eeaa6bf
```
fixes #1880 correct mysql statement for modifying column data type
```
  Torkel Ödegaard committed Apr 25, 2015
  4eeaa6bf Browse Files
- fixes #1880 dashboard_snapshot table does not have a data column · f227002a
  Anthony Woods committed Apr 25, 2015
  
  f227002a Browse Files
- fixes #1880 correct mysql statement for modifying column data type · d84d92f7
  Anthony Woods committed Apr 25, 2015
  
  d84d92f7 Browse Files
- more work on editable false, #1834 · a0cbca4c
  Torkel Ödegaard committed Apr 25, 2015
  
  a0cbca4c Browse Files
24 Apr, 2015 6 commits
- updated version to 2.1.0-pre1 · 380b7f4d
  Torkel Ödegaard committed Apr 24, 2015
  
  380b7f4d Browse Files
- Merge pull request #1869 from marknoe1/extra_uom · bad2d1a9
```
Added units for voltage, current and frequency
```
  Torkel Ödegaard committed Apr 24, 2015
  bad2d1a9 Browse Files
- Replaced slug dependency with one that did not use gopkgs.com · 4fd2c057
  Torkel Ödegaard committed Apr 24, 2015
  
  4fd2c057 Browse Files
- Merge branch 'master' into editable_false · fd274592
  Torkel Ödegaard committed Apr 24, 2015
  
  fd274592 Browse Files
- Firefox/IE issue, invisible text in dashboard search fixed, Fixes #1872 · 7064d871
  Torkel Ödegaard committed Apr 24, 2015
  
  7064d871 Browse Files
- Added units for voltage, current and frequency · f8ceb341
  Mark Oellermann committed Apr 24, 2015
  
  f8ceb341 Browse Files
23 Apr, 2015 9 commits
- Documented units for timepicker · 3fdab590
```
Timepicker units (like s, m, M, etc) were not in the documentation so I have added them.
```
  Chris Madden committed Apr 23, 2015
  3fdab590 Browse Files
- always refresh varible options if refresh=true · b6a4db3f
  Anthony Woods committed Apr 24, 2015
  
  b6a4db3f Browse Files
- Restored sql integration tests to use in mem sqlite3 · b99ee256
  Torkel Ödegaard committed Apr 23, 2015
  
  b99ee256 Browse Files
- MySQL: Dashboard.data column type changed to mediumtext (sql migration added), Fixes #1863 · 85260257
  Torkel Ödegaard committed Apr 23, 2015
  
  85260257 Browse Files
- Began work on dashboard: editable flag, that actually stops users from changing anything, #1834 · 236c4e65
  Torkel Ödegaard committed Apr 23, 2015
  
  236c4e65 Browse Files
- Merge pull request #1860 from aibou/master · d92fae07
```
Fix and update documents
```
  Torkel Ödegaard committed Apr 23, 2015
  d92fae07 Browse Files
- Fix and update documents · 968b1b43
  aibou committed Apr 23, 2015
  
  968b1b43 Browse Files
- Merge pull request #1854 from ton31337/master · e9a174d1
```
Remove exit 0 at the end of init.d script
```
  Torkel Ödegaard committed Apr 23, 2015
  e9a174d1 Browse Files
- /api/login/ping Fix for issue when behind reverse proxy and subpath, Fixes #1857 · 2c522240
  Torkel Ödegaard committed Apr 23, 2015
  
  2c522240 Browse Files
22 Apr, 2015 2 commits
- Remove exit 0 at the end of init.d script · 869cf705
  Donatas Abraitis committed Apr 22, 2015
  
  869cf705 Browse Files
- Updated install docs with 2.0.2 version · 9f6a3488
  Torkel Ödegaard committed Apr 22, 2015
  
  9f6a3488 Browse Files