IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-27 00:37:04 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,514 Commits 5,353 Branches 546 Tags 1.9 GiB
dbc64c21a7
Commit Graph

3514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
dbc64c21a7 Merge branch 'master' into panel_repeat 2015-04-29 18:03:26 +02: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
fe0bf876d9 Style changes and polish to multi variable value selection, #1144 2015-04-29 15:34:14 +02:00
Torkel Ödegaard
c5be95e46c Began polish and tweaks of new template variable multi select dropdown 2015-04-29 14:23:29 +02:00
Torkel Ödegaard
b762f56aee Merge branch 'master' into panel_repeat 
Conflicts:
	public/app/features/templating/templateValuesSrv.js
 2015-04-29 13:59:15 +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
8c14e565a7 Restored the variable color for the label/name in the submenu 2015-04-28 17:54:22 +02:00
Torkel Ödegaard
53cb0feda9 Various fixes, restored search auto focus 2015-04-28 17:28:34 +02:00
Torkel Ödegaard
14e8c15a3a Lots of new unit tests for unsaved changes service 2015-04-28 16:42:40 +02:00
Torkel Ödegaard
aaea80e053 A lot of refactoring opf unsaved changes service so it can be unit tested better 2015-04-28 13:45:59 +02:00
Torkel Ödegaard
f6a61c1ec5 Changes to unsaved changes service to ignore repeated panels and rows, #1888 2015-04-28 12:02:39 +02:00
Torkel Ödegaard
5768f10769 More optimizations and unit tests for panel repeats #1888 2015-04-28 10:23:35 +02:00
Torkel Ödegaard
bcb80eb38f more tweaks 2015-04-28 09:26:20 +02:00
Torkel Ödegaard
9590f485f1 More optimizations and unit tests for panel repeats, this time reuse rows, #1888 2015-04-28 09:24:07 +02:00
Torkel Ödegaard
32fe723da6 More optimizations and unit tests for panel repeats, #1888 2015-04-28 08:44:48 +02:00
Torkel Ödegaard
48b25bc327 Fix to graph panel, and width=0 bug 2015-04-28 06:40:23 +02:00
Torkel Ödegaard
3044a74a52 Optimization and unit tests for panel and row repeat feature, #1888 2015-04-27 18:37:39 +02:00
Torkel Ödegaard
ca7aa294e0 Began wriing unit test for new panel repeat features, #1888 2015-04-27 17:20:32 +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
158b77d54e small update to panel repeats 2015-04-27 15:01:27 +02:00
Torkel Ödegaard
f8f302faad Merge branch 'panel_repeat' of github.com:grafana/grafana into panel_repeat 
Conflicts:
	public/app/partials/submenu.html
	public/css/less/submenu.less
	src/app/partials/roweditor.html
 2015-04-27 14:01:55 +02:00
Torkel Ödegaard
3f97bd8212 Added files removed in merge 2015-04-27 13:59:20 +02:00