IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,481 Commits 5,454 Branches 554 Tags 1.9 GiB
14be5e3ff7
Commit Graph

3481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
14be5e3ff7 Merge branch 'master' of github.com:grafana/grafana 2015-04-30 08:04:32 +02:00
Torkel Ödegaard
6de071a5f3 Merge pull request #1911 from mortonfox/patch-1 
Fix the first CLA link.
 2015-04-30 08:03:05 +02:00
Morton Fox
0a2b03ba52 Fix the first CLA link. 2015-04-29 16:35:03 -04:00
Torkel Ödegaard
294f7f1f0d Merge branch 'v2.0.x' 
Conflicts:
	conf/sample.ini
 2015-04-29 15:59:35 +02:00
Torkel Ödegaard
d10ce90936 Fixed XSS issue with file based dashboards, was really casued by an issue with alertSrv accepting html in message alerts 2015-04-29 15:50:47 +02:00
Torkel Ödegaard
74a8fa61f2 Merged with 2.0 docs and restored some stuff 2015-04-29 10:33:37 +02:00
Torkel Ödegaard
964d47d517 Merge branch 'docs-2.0' 2015-04-29 10:30:29 +02:00
Torkel Ödegaard
a38da2f7c6 Merge pull request #1901 from davidak/master 
add gigabytes as unit
 2015-04-29 10:29:49 +02:00
Torkel Ödegaard
593f2e0851 Merge pull request #1903 from craftytrickster/influx09-annotation-bugfix 
Fixed Annotations with InfluxDb9 Datasources
 2015-04-29 10:29:29 +02:00
Torkel Ödegaard
9ae3d66da7 Fixed docs, screencasts page 2015-04-29 10:18:11 +02:00
Torkel Ödegaard
4c7545e909 Updated docs Makefile 2015-04-29 10:14:02 +02:00
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 2015-04-29 10:13:00 +02:00
Torkel Ödegaard
75e6947c5a Merge branch 'master' into docs-2.0 2015-04-29 10:11:52 +02:00
Torkel Ödegaard
3007add4ca small docs fix 2015-04-29 10:10:44 +02:00
Torkel Ödegaard
67fbb173e3 Merge pull request #1904 from iandanforth/patch-1 
Correct deb version number in install guide.
 2015-04-29 10:09:25 +02:00
Torkel Ödegaard
0d3fbb8659 Added message alerts when login failed due to github team membership or email domain requirement, #1731, #1660 2015-04-29 10:08:01 +02:00
Torkel Ödegaard
32fa8180fa Github OAuth: You can now configure a Github team membership requirement, Closes #1731 2015-04-29 09:52:52 +02:00
Torkel Ödegaard
884dc53f8a smalĺ refactorings 2015-04-29 09:49:33 +02:00
Torkel Ödegaard
d812414621 Merge branch 'github-team-membership-requirement' of https://github.com/dewski/grafana into dewski-github-team-membership-requirement 2015-04-29 09:44:23 +02:00
Torkel Ödegaard
52c32d8b10 Merge branch 'issue1862' of https://github.com/raintank/grafana into raintank-issue1862 2015-04-29 09:31:21 +02:00
Torkel Ödegaard
eace358f1c Merge branch 'issue1907' of https://github.com/raintank/grafana 
Conflicts:
	pkg/api/dtos/models.go
 2015-04-29 09:29:55 +02:00
Torkel Ödegaard
e7c43bf614 expose org id to frontend, Closes #1907 2015-04-29 09:26:12 +02:00
Anthony Woods
81636d8634 expose orgId via currentUser object. fixes #1907 2015-04-29 15:14:49 +08:00
Anthony Woods
b72eba1ef2 refactor handling of refresh when urlValues being used for templates. fixes #1862 2015-04-29 14:55:39 +08:00
Garrett Bjerkhoel
1fdc5277ae Update documentation for team_ids option 2015-04-28 20:38:05 -07:00
Garrett Bjerkhoel
1d7f945268 Handle special error case if connect.UserInfo returns an error 2015-04-28 20:22:45 -07:00
Garrett Bjerkhoel
eb37fc089b Check for active team membership when fetching s.UserInfo 2015-04-28 20:22:21 -07:00
Garrett Bjerkhoel
979d0ca70f Add new error type for team membership permissions 2015-04-28 20:21:44 -07:00
Garrett Bjerkhoel
7ea579bb71 Add team_ids configuration option 2015-04-28 20:19:48 -07:00
Ian Danforth
a0dad38974 Correct deb version number in install guide. 2015-04-28 15:09:22 -07:00
David Raifaizen
e5844afb0f Corrected missing annotations: true tag from the influxdb9 plugin json and fixed influxseries data handling 2015-04-28 16:29:32 -04:00
davidak
c4ac3d61b1 add gigabytes as unit 2015-04-28 20:53:29 +02:00
Torkel Ödegaard
5175cf70ef fixed version in package.json 2015-04-27 15:07:13 +02:00
Torkel Ödegaard
5cb7721ab2 Updated config sample.ini with oauth allow_sign_up 2015-04-27 15:06:42 +02:00
Torkel Ödegaard
8a986ec340 Using CTRL+S should not work when dashboardMeta.canSave is false, #1834 2015-04-27 10:59:14 +02:00
Torkel Ödegaard
b0ef659add Stop users from entering panel edit mode when dashboard editable is false, #1834 2015-04-27 10:56:36 +02:00
Torkel Ödegaard
29a7490af2 Small fix for unsaved changes when using save as feature 2015-04-27 10:29:04 +02:00
Torkel Ödegaard
ad45b63e79 Merge branch 'editable_false' of github.com:grafana/grafana into editable_false 2015-04-27 10:10:01 +02:00
Torkel Ödegaard
16fc6e8b42 More work on editable false dashboards, #1834 2015-04-27 10:09:32 +02:00
Torkel Ödegaard
af277f560f Merge branch 'master' into editable_false 2015-04-27 08:53:57 +02:00
Torkel Ödegaard
d66e510c42 Merge pull request #1867 from maddenca/patch-1 
Documented units for timepicker
 2015-04-26 15:35:59 +02:00
Torkel Ödegaard
e410fbb558 Corrected SQL migration for snapshot table column type change, #1880 2015-04-25 20:28:50 +02:00
Torkel Ödegaard
4eeaa6bf9d Merge pull request #1881 from raintank/issue1880 
fixes #1880 correct mysql statement for modifying column data type
 2015-04-25 20:24:22 +02:00
Anthony Woods
f227002a80 fixes #1880 dashboard_snapshot table does not have a data column 2015-04-25 18:51:25 +08:00
Anthony Woods
d84d92f73c fixes #1880 correct mysql statement for modifying column data type 2015-04-25 18:46:30 +08:00
Torkel Ödegaard
a0cbca4cad more work on editable false, #1834 2015-04-25 11:10:28 +02:00
Torkel Ödegaard
380b7f4d94 updated version to 2.1.0-pre1 2015-04-24 15:57:20 +02:00
Torkel Ödegaard
bad2d1a974 Merge pull request #1869 from marknoe1/extra_uom 
Added units for voltage, current and frequency
 2015-04-24 15:55:53 +02:00
Torkel Ödegaard
4fd2c0570c Replaced slug dependency with one that did not use gopkgs.com 2015-04-24 15:46:16 +02:00
Torkel Ödegaard
fd274592d4 Merge branch 'master' into editable_false 2015-04-24 12:06:50 +02:00