 Torkel Ödegaard
|
14be5e3ff7
Merge branch 'master' of github.com:grafana/grafana
|
10 years ago |
|
Torkel Ödegaard
|
6de071a5f3
Merge pull request #1911 from mortonfox/patch-1
|
10 years ago |
 Morton Fox
|
0a2b03ba52
Fix the first CLA link.
|
10 years ago |
|
Torkel Ödegaard
|
294f7f1f0d
Merge branch 'v2.0.x'
|
10 years ago |
|
Torkel Ödegaard
|
d10ce90936
Fixed XSS issue with file based dashboards, was really casued by an issue with alertSrv accepting html in message alerts
|
10 years ago |
|
Torkel Ödegaard
|
74a8fa61f2
Merged with 2.0 docs and restored some stuff
|
10 years ago |
|
Torkel Ödegaard
|
964d47d517
Merge branch 'docs-2.0'
|
10 years ago |
|
Torkel Ödegaard
|
a38da2f7c6
Merge pull request #1901 from davidak/master
|
10 years ago |
|
Torkel Ödegaard
|
593f2e0851
Merge pull request #1903 from craftytrickster/influx09-annotation-bugfix
|
10 years ago |
|
Torkel Ödegaard
|
9ae3d66da7
Fixed docs, screencasts page
|
10 years ago |
|
Torkel Ödegaard
|
4c7545e909
Updated docs Makefile
|
10 years ago |
|
Torkel Ödegaard
|
a0e80e5869
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
|
10 years ago |
|
Torkel Ödegaard
|
75e6947c5a
Merge branch 'master' into docs-2.0
|
10 years ago |
|
Torkel Ödegaard
|
3007add4ca
small docs fix
|
10 years ago |
|
Torkel Ödegaard
|
67fbb173e3
Merge pull request #1904 from iandanforth/patch-1
|
10 years ago |
|
Torkel Ödegaard
|
0d3fbb8659
Added message alerts when login failed due to github team membership or email domain requirement, #1731, #1660
|
10 years ago |
|
Torkel Ödegaard
|
32fa8180fa
Github OAuth: You can now configure a Github team membership requirement, Closes #1731
|
10 years ago |
|
Torkel Ödegaard
|
884dc53f8a
smalĺ refactorings
|
10 years ago |
|
Torkel Ödegaard
|
d812414621
Merge branch 'github-team-membership-requirement' of https://github.com/dewski/grafana into dewski-github-team-membership-requirement
|
10 years ago |
|
Torkel Ödegaard
|
52c32d8b10
Merge branch 'issue1862' of https://github.com/raintank/grafana into raintank-issue1862
|
10 years ago |
|
Torkel Ödegaard
|
eace358f1c
Merge branch 'issue1907' of https://github.com/raintank/grafana
|
10 years ago |
|
Torkel Ödegaard
|
e7c43bf614
expose org id to frontend, Closes #1907
|
10 years ago |
 Anthony Woods
|
81636d8634
expose orgId via currentUser object. fixes #1907
|
10 years ago |
|
Anthony Woods
|
b72eba1ef2
refactor handling of refresh when urlValues being used for templates. fixes #1862
|
10 years ago |
 Garrett Bjerkhoel
|
1fdc5277ae
Update documentation for team_ids option
|
10 years ago |
|
Garrett Bjerkhoel
|
1d7f945268
Handle special error case if connect.UserInfo returns an error
|
10 years ago |
|
Garrett Bjerkhoel
|
eb37fc089b
Check for active team membership when fetching s.UserInfo
|
10 years ago |
|
Garrett Bjerkhoel
|
979d0ca70f
Add new error type for team membership permissions
|
10 years ago |
|
Garrett Bjerkhoel
|
7ea579bb71
Add team_ids configuration option
|
10 years ago |
 Ian Danforth
|
a0dad38974
Correct deb version number in install guide.
|
10 years ago |
