IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-11 08:05:43 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,558 Commits 5,439 Branches 554 Tags 1.9 GiB
8149381f01
Commit Graph

3558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
34539c0c13 Enforce domain, host header validation against domain setting, Refactoring of PR #1866, Closes #1732 2015-05-05 11:21:06 +02:00
Torkel Ödegaard
1f2cba81eb Merge branch 'enforce-domain' of https://github.com/gummiboll/grafana 2015-05-05 11:15:09 +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
38d851eb98 Another HTTP API fix 2015-05-04 08:19:29 +02:00
Torkel Ödegaard
73ee8a5985 HTTP API: fix for POST /api/dashboards/db returned 200 ok when dashboard was not found, Fixes #1929 2015-05-04 07:46:53 +02:00
Torkel Ödegaard
697529d0e8 Worked on golang code coverage via coveralls 2015-05-02 17:24:03 +02:00
Torkel Ödegaard
b51a8f11d5 Added back coveralls coverage 2015-05-02 17:05:07 +02:00
Torkel Ödegaard
a4a8cd05d2 Updated to nodejs packages and karma code coverage setup 2015-05-02 16:59:19 +02:00
Torkel Ödegaard
38fc85d619 Final tweaks to auth proxy feature 2015-05-02 12:30:53 +02:00
Torkel Ödegaard
be589d81c7 Auth: Support for user authentication via reverse proxy header (like X-Authenticated-User, or X-WEBAUTH-USER), Closes #1921 2015-05-02 12:06:58 +02:00
Torkel Ödegaard
ba883d25fe More middleware unit tests cover all current auth mechanisms 2015-05-02 09:24:56 +02:00
Torkel Ödegaard
f416e2d1ac More middleware unit test, starting to look really good 2015-05-01 22:26:16 +02:00
Torkel Ödegaard
cb8110cd48 Refactoring, worked on middleware unit tests, and began thinking about api unit tests, #1921 2015-05-01 16:23:36 +02:00
Torkel Ödegaard
d1e9b6d6ae Began work on auth_proxy feature (#1932), and began work on testing http api, and auth middleware 2015-05-01 11:55:59 +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
59fcd3914d corrected master version 2015-05-01 08:08:31 +02:00
Torkel Ödegaard
95fcddcd95 More work on panel & row repeats, #1888, updated changelog 2015-05-01 08:07:57 +02:00
Torkel Ödegaard
293d0c3093 Merge branch 'panel_repeat' 2015-04-30 11:15:40 +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
0a8cf26731 Merge branch 'docs-2.0' 2015-04-30 08:12:37 +02:00
Morton Fox
a8b2074fc6 Fix the first CLA link. 2015-04-30 08:05:13 +02:00
Torkel Ödegaard
14be5e3ff7 Merge branch 'master' of github.com:grafana/grafana 2015-04-30 08:04:32 +02:00
Torkel Ödegaard
6de071a5f3 Merge pull request #1911 from mortonfox/patch-1 
Fix the first CLA link.
 2015-04-30 08:03:05 +02:00
Morton Fox
0a2b03ba52 Fix the first CLA link. 2015-04-29 16:35:03 -04: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
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