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
35,647 Commits 5,416 Branches 554 Tags
6a4906ef7eedee975a1a928e2284a981dff77ef0
Commit Graph

15648 Commits

Author SHA1 Message Date
Torkel Ödegaard
2c3aad785d Fix in unsaved changes service 2015-05-06 07:59:47 +02:00
Torkel Ödegaard
ece9e8dcea Merge branch 'master' into dashlinks 2015-05-06 07:48:45 +02:00
DaveBlooman
85c45c2b8f Add Android 5 theme colour 2015-05-05 22:42:56 +01:00
Torkel Ödegaard
8149381f01 minor refactoring and markup fix 2015-05-05 20:59:21 +02:00
Torkel Ödegaard
e221cbfbd6 Merge branch 'sidemenu_default_open' of https://github.com/raintank/grafana 2015-05-05 20:34:07 +02:00
Torkel Ödegaard
0c56ae4f32 more work on, #1944 2015-05-05 20:33:06 +02:00
Torkel Ödegaard
1e196fc091 Began work on dashboard links and nav feature, #1944 2015-05-05 19:56:49 +02:00
Torkel Ödegaard
d4c0d5d81b changed position for checkbox label 2015-05-05 13:37:20 +02:00
Torkel Ödegaard
12c770f0ab markup update for templating editor 2015-05-05 13:33:57 +02:00
Torkel Ödegaard
637988b104 UI Polish, refactoring markup 2015-05-05 13:26:42 +02:00
Torkel Ödegaard
71edd9ff1b DashEditView: fix for small ui bug, when having dashboard settings view open and entering panel edit mode, did not cause dash edit view to be closed 2015-05-05 12:38:18 +02:00
Torkel Ödegaard
e458ca7b47 Templating: updated template editor view & form 2015-05-05 10:56:39 +02:00
Anthony Woods
b915bb98fb fix whitespace 2015-05-05 16:21:37 +08:00
Anthony Woods
8aef297e71 show sidemenu when admin user logs in the first time. #54 2015-05-05 10:43:19 +08:00
Torkel Ödegaard
c628ac9bbb Upgraded to JQuery 2.1.1 -> 2.1.3, and spectrum.js, Fixes #1932 2015-05-04 14:36:46 +02:00
Torkel Ödegaard
385048b620 Templating: You can now select multiple template variables values at the same time. Closes #1922 2015-05-04 10:13:12 +02:00
Torkel Ödegaard
e5c1169120 HTTP API: GET /api/dashboards/db/:slug response changed property to to match the POST request nameing, Fixes #1928 2015-05-04 08:36:44 +02:00
Torkel Ödegaard
e7ac367392 SignUp: password strength meter updated, Fixes #1892 2015-05-01 11:22:21 +02:00
Anthony Woods
7a8851c5ab default sidemenu to open #54 2015-05-01 17:02:00 +08:00
Torkel Ödegaard
e771d8e944 Organization: You can now update the organization user role directly (without removing and readding the organization user). Closes #1899 2015-05-01 09:48:07 +02:00
Torkel Ödegaard
b48b11e902 Added new graphite function spec, weightedAverage, Closes #1879 2015-05-01 08:52:34 +02:00
Torkel Ödegaard
5de9230924 Security: New config option to disable the use of gravatar for profile images, Closes #1891 2015-05-01 08:40:13 +02:00
Torkel Ödegaard
95fcddcd95 More work on panel & row repeats, #1888, updated changelog 2015-05-01 08:07:57 +02:00
Torkel Ödegaard
e17f56b4ad Final polish on panel & row repeats, #1888, still some missing places where scopedVars needs to be used 2015-04-30 11:15:26 +02:00
Torkel Ödegaard
32e0ce1beb Minor code refinements to panel repeat code, #1888 2015-04-30 10:50:23 +02:00
Torkel Ödegaard
25ef49494b Final polish on repeat panel variable selection, #1888 2015-04-30 10:47:51 +02:00
Torkel Ödegaard
3ee1ea28e1 Templating: Support for search filtering and keyboard up/down filtering in the new multi variable value selector dropdown, #1144 2015-04-30 09:09:12 +02:00
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
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
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
52c32d8b10 Merge branch 'issue1862' of https://github.com/raintank/grafana into raintank-issue1862 2015-04-29 09:31:21 +02:00
Anthony Woods
b72eba1ef2 refactor handling of refresh when urlValues being used for templates. fixes #1862 2015-04-29 14:55:39 +08: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