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
4,465 Commits 5,454 Branches 554 Tags 1.9 GiB
cdab0d208e
Commit Graph

4465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Masaori Koshiba
0a23a996bc Remove targetLetters 2015-04-25 16:12:10 +09: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
Emil Thelin
2d7c7871b0 Fixes broken test 2015-04-23 20:56:31 +02:00
Emil Thelin
9fd3ef2687 Enforce domain 2015-04-23 20:38:00 +02:00
Anthony Woods
b6a4db3f8a always refresh varible options if refresh=true 2015-04-24 00:19:16 +08:00