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

01 May, 2015 7 commits
- Began work on auth_proxy feature (#1932), and began work on testing http api, and auth middleware · d1e9b6d6
  Torkel Ödegaard committed May 01, 2015
  
  d1e9b6d6 Browse Files
- SignUp: password strength meter updated, Fixes #1892 · e7ac3673
  Torkel Ödegaard committed May 01, 2015
  
  e7ac3673 Browse Files
- Organization: You can now update the organization user role directly (without… · e771d8e9
```
Organization: You can now update the organization user role directly (without removing and readding the organization user). Closes #1899
```
  Torkel Ödegaard committed May 01, 2015
  e771d8e9 Browse Files
- Added new graphite function spec, weightedAverage, Closes #1879 · b48b11e9
  Torkel Ödegaard committed May 01, 2015
  
  b48b11e9 Browse Files
- Security: New config option to disable the use of gravatar for profile images, Closes #1891 · 5de92309
  Torkel Ödegaard committed May 01, 2015
  
  5de92309 Browse Files
- corrected master version · 59fcd391
  Torkel Ödegaard committed May 01, 2015
  
  59fcd391 Browse Files
- More work on panel & row repeats, #1888, updated changelog · 95fcddcd
  Torkel Ödegaard committed May 01, 2015
  
  95fcddcd Browse Files
30 Apr, 2015 9 commits
- Merge branch 'panel_repeat' · 293d0c30
  Torkel Ödegaard committed Apr 30, 2015
  
  293d0c30 Browse Files
- Final polish on panel & row repeats, #1888, still some missing places where… · e17f56b4
```
Final polish on panel & row repeats, #1888, still some missing places where scopedVars needs to be used
```
  Torkel Ödegaard committed Apr 30, 2015
  e17f56b4 Browse Files
- Minor code refinements to panel repeat code, #1888 · 32e0ce1b
  Torkel Ödegaard committed Apr 30, 2015
  
  32e0ce1b Browse Files
- Final polish on repeat panel variable selection, #1888 · 25ef4949
  Torkel Ödegaard committed Apr 30, 2015
  
  25ef4949 Browse Files
- Templating: Support for search filtering and keyboard up/down filtering in the… · 3ee1ea28
```
Templating: Support for search filtering and keyboard up/down filtering in the new multi variable value selector dropdown, #1144
```
  Torkel Ödegaard committed Apr 30, 2015
  3ee1ea28 Browse Files
- 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 24 commits
- Fix the first CLA link. · 0a2b03ba
  Morton Fox committed Apr 29, 2015
  
  0a2b03ba Browse Files
- Merge branch 'master' into panel_repeat · dbc64c21
  Torkel Ödegaard committed Apr 29, 2015
  
  dbc64c21 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
- Style changes and polish to multi variable value selection, #1144 · fe0bf876
  Torkel Ödegaard committed Apr 29, 2015
  
  fe0bf876 Browse Files
- Began polish and tweaks of new template variable multi select dropdown · c5be95e4
  Torkel Ödegaard committed Apr 29, 2015
  
  c5be95e4 Browse Files
- Merge branch 'master' into panel_repeat · b762f56a
```
Conflicts:
	public/app/features/templating/templateValuesSrv.js
```
  Torkel Ödegaard committed Apr 29, 2015
  b762f56a 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