From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 6 May 2014 16:20:16 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~111
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=303e761d924ec5491f28039a6e06433d269b051e;hp=47e44bc61b088033691c43be4609e8c4248b2cb8;p=myslice.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

diff --git a/portal/static/js/myslice-ui.js b/portal/static/js/myslice-ui.js
index 1c91ccd2..564e34a8 100644
--- a/portal/static/js/myslice-ui.js
+++ b/portal/static/js/myslice-ui.js
@@ -22,7 +22,7 @@ $(document).ready(function() {
 		$(this).parent().hide();
 	});
 
-	mysliceAlert('hello','danger');
+	//mysliceAlert('hello','danger');
 	
 	
 	$("#objectList").load("/table/resource/", {"fields" : ["hostname","hrn","country","type"], "options": ["checkbox"] }, function(data) {