public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,332 Commits 655 Branches 650 Tags
659a01903e3bf6963da17029cd2b4304f5554bd7
Commit Graph
44332 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Torkel Ödegaard bf6f0f1a65 Merge branch 'master' into panel_repeat 
Conflicts:
	public/app/features/dashboard/dashboardCtrl.js
	public/app/partials/submenu.html
	public/css/less/submenu.less
	public/test/specs/templateSrv-specs.js
	src/app/partials/roweditor.html
 2015-04-27 13:53:02 +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 ff403efe09 Merge pull request #1887 from masaori335/kairosdb-tag-suggention 
Refactoring of tag suggestion in KairosDB Plugin
 2015-04-26 20:31:29 +02:00
Masaori Koshiba df9403809b Fix conflict 2015-04-26 23:14:50 +09:00
Masaori Koshiba d86814b6c5 Refactoring of tag suggestion 2015-04-26 23:02:40 +09: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 87007994af Merge branch 'kairosdb-metric-text' of https://github.com/masaori335/grafana into kariosdb 2015-04-26 15:22:21 +02:00
Torkel Ödegaard 03e4afa736 Merge pull request #1882 from masaori335/kairosdb-appearance 
Fix query editor appearance of KairosDB Plugin
 2015-04-26 15:15:05 +02:00
Torkel Ödegaard f120e96eeb Merge pull request #1883 from masaori335/kairosdb-merge-master 
Merge branch 'master' into kariosdb
 2015-04-26 15:14:28 +02:00
Masaori Koshiba 7e044e29ba Change metric form input text 
Preparation of templated dashboard support.
 2015-04-26 19:31:04 +09:00
Masaori Koshiba 63ac6640e6 Merge branch 'master' into kairosdb-merge-master 2015-04-26 11:04:02 +09: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
Masaori Koshiba 5d57931060 Fix appearance of query editor 2015-04-26 00:24:04 +09:00