Commits · 0a8cf267319298e66806bdbfefe01dfa3bb0028a · Kornkitt Poolsup / nexpie-grafana-theme · GitLab

30 Apr, 2015 4 commits
- Merge branch 'docs-2.0' · 0a8cf267
  Torkel Ödegaard committed Apr 30, 2015
  
  0a8cf267 Browse Files
- Fix the first CLA link. · a8b2074f
  Morton Fox committed Apr 30, 2015
  
  a8b2074f Browse Files
- Merge branch 'master' of github.com:grafana/grafana · 14be5e3f
  Torkel Ödegaard committed Apr 30, 2015
  
  14be5e3f Browse Files
- Merge pull request #1911 from mortonfox/patch-1 · 6de071a5
```
Fix the first CLA link.
```
  Torkel Ödegaard committed Apr 30, 2015
  6de071a5 Browse Files
29 Apr, 2015 27 commits
- Fix the first CLA link. · 0a2b03ba
  Morton Fox committed Apr 29, 2015
  
  0a2b03ba Browse Files
- Merge branch 'v2.0.x' · 294f7f1f
```
Conflicts:
	conf/sample.ini
```
  Torkel Ödegaard committed Apr 29, 2015
  294f7f1f Browse Files
- Fixed XSS issue with file based dashboards, was really casued by an issue with… · d10ce909
```
Fixed XSS issue with file based dashboards, was really casued by an issue with alertSrv accepting html in message alerts
```
  Torkel Ödegaard committed Apr 29, 2015
  d10ce909 Browse Files
- Merged with 2.0 docs and restored some stuff · 74a8fa61
  Torkel Ödegaard committed Apr 29, 2015
  
  74a8fa61 Browse Files
- Merge branch 'docs-2.0' · 964d47d5
  Torkel Ödegaard committed Apr 29, 2015
  
  964d47d5 Browse Files
- Merge pull request #1901 from davidak/master · a38da2f7
```
add gigabytes as unit
```
  Torkel Ödegaard committed Apr 29, 2015
  a38da2f7 Browse Files
- Merge pull request #1903 from craftytrickster/influx09-annotation-bugfix · 593f2e08
```
Fixed Annotations with InfluxDb9 Datasources
```
  Torkel Ödegaard committed Apr 29, 2015
  593f2e08 Browse Files
- Fixed docs, screencasts page · 9ae3d66d
  Torkel Ödegaard committed Apr 29, 2015
  
  9ae3d66d Browse Files
- Updated docs Makefile · 4c7545e9
  Torkel Ödegaard committed Apr 29, 2015
  
  4c7545e9 Browse Files
- Updated 2.0 docs, merged with master and removed docs for features in 2.1, doc… · a0e80e58
```
Updated 2.0 docs, merged with master and removed docs for features in 2.1, doc updates related to 2.0 needs to be done to this branch
```
  Torkel Ödegaard committed Apr 29, 2015
  a0e80e58 Browse Files
- Merge branch 'master' into docs-2.0 · 75e6947c
  Torkel Ödegaard committed Apr 29, 2015
  
  75e6947c Browse Files
- small docs fix · 3007add4
  Torkel Ödegaard committed Apr 29, 2015
  
  3007add4 Browse Files
- Merge pull request #1904 from iandanforth/patch-1 · 67fbb173
```
Correct deb version number in install guide.
```
  Torkel Ödegaard committed Apr 29, 2015
  67fbb173 Browse Files
- Added message alerts when login failed due to github team membership or email… · 0d3fbb86
```
Added message alerts when login failed due to github team membership or email domain requirement, #1731, #1660
```
  Torkel Ödegaard committed Apr 29, 2015
  0d3fbb86 Browse Files
- Github OAuth: You can now configure a Github team membership requirement, Closes #1731 · 32fa8180
  Torkel Ödegaard committed Apr 29, 2015
  
  32fa8180 Browse Files
- smalĺ refactorings · 884dc53f
  Torkel Ödegaard committed Apr 29, 2015
  
  884dc53f Browse Files
- 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
28 Apr, 2015 3 commits
- Correct deb version number in install guide. · a0dad389
  Ian Danforth committed Apr 28, 2015
  
  a0dad389 Browse Files
- Corrected missing annotations: true tag from the influxdb9 plugin json and fixed… · e5844afb
```
Corrected missing annotations: true tag from the influxdb9 plugin json and fixed influxseries data handling
```
  David Raifaizen committed Apr 28, 2015
  e5844afb Browse Files
- add gigabytes as unit · c4ac3d61
  davidak committed Apr 28, 2015
  
  c4ac3d61 Browse Files
27 Apr, 2015 6 commits
- fixed version in package.json · 5175cf70
  Torkel Ödegaard committed Apr 27, 2015
  
  5175cf70 Browse Files
- Updated config sample.ini with oauth allow_sign_up · 5cb7721a
  Torkel Ödegaard committed Apr 27, 2015
  
  5cb7721a Browse Files
- 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