IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-26 16:27:02 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,463 Commits 5,348 Branches 546 Tags 1.9 GiB
67fbb173e3
Commit Graph

3463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Torkel Ödegaard
7064d87106 Firefox/IE issue, invisible text in dashboard search fixed, Fixes #1872 2015-04-24 11:20:09 +02:00
Mark Oellermann
f8ceb341d6 Added units for voltage, current and frequency 2015-04-24 13:23:54 +10:00
Chris Madden
3fdab59029 Documented units for timepicker 
Timepicker units (like s, m, M, etc) were not in the documentation so I have added them.
 2015-04-23 23:53:15 +02:00
Anthony Woods
b6a4db3f8a always refresh varible options if refresh=true 2015-04-24 00:19:16 +08:00
Torkel Ödegaard
b99ee2562e Restored sql integration tests to use in mem sqlite3 2015-04-23 16:21:49 +02:00
Torkel Ödegaard
8526025792 MySQL: Dashboard.data column type changed to mediumtext (sql migration added), Fixes #1863 2015-04-23 16:18:46 +02:00
Torkel Ödegaard
236c4e65f8 Began work on dashboard: editable flag, that actually stops users from changing anything, #1834 2015-04-23 15:26:48 +02:00
Torkel Ödegaard
d92fae07a5 Merge pull request #1860 from aibou/master 
Fix and update documents
 2015-04-23 14:55:17 +02:00
aibou
968b1b4308 Fix and update documents 2015-04-23 17:42:04 +09:00
Torkel Ödegaard
e9a174d1c5 Merge pull request #1854 from ton31337/master 
Remove exit 0 at the end of init.d script
 2015-04-23 08:45:26 +02:00
Torkel Ödegaard
2c52224013 /api/login/ping Fix for issue when behind reverse proxy and subpath, Fixes #1857 2015-04-23 08:24:30 +02:00
Donatas Abraitis
869cf705e0 Remove exit 0 at the end of init.d script 2015-04-22 22:29:56 +03:00
Torkel Ödegaard
9f6a348851 Updated install docs with 2.0.2 version 2015-04-22 19:23:28 +02:00
Torkel Ödegaard
aa52f6675c updated changelog 2015-04-22 17:56:07 +02:00
Torkel Ödegaard
9cc5e981dd Bumped version to 2.0.2 2015-04-22 17:51:50 +02:00
Torkel Ödegaard
da74fa0862 Updated configuration and http api docs 2015-04-22 17:44:47 +02:00
Torkel Ödegaard
1dfc576263 Panel timeshift: You can now use panel timeshift without a relative time override, Fixes #1848 2015-04-22 13:54:31 +02:00
Torkel Ödegaard
170e8a5d76 Another docs update 2015-04-22 13:47:15 +02:00