Merge remote-tracking branch 'origin/master' into WINKSTART-806

UMojo · Jun 28, 2012 · 3a61cef · 3a61cef
2 parents 619c84a + c460eea
commit 3a61cef
Show file tree

Hide file tree

Showing 15 changed files with 131 additions and 12,082 deletions.
diff --git a/config/config.js b/config/config.js
@@ -8,6 +8,8 @@
 
         register_type: 'onboard',
 
+        device_threshold: [5, 20, 50, 100],
+
         /* web server used by the cdr module to show the link to the logs */
         logs_web_server_url: 'http://cdrs.2600hz.com/',
 

diff --git a/index.html b/index.html
@@ -42,15 +42,10 @@
         <link type="text/css" href="js/external/ui-listpanel/css/ui.listpanel.css" rel="stylesheet" media="screen" />
         <link type="text/css" href="js/external/ui-listpanel/css/jquery.jscrollpane.css" rel="stylesheet" media="screen" />
 
-        <link type="text/css" href="js/external/jqPlot/jquery.jqplot.css" rel="stylesheet" media="screen" />
-
         <link type="text/css" href="css/jquery.tooltip.css" rel="stylesheet" media="screen" />
         <script type="text/javascript" src="js/external/jquery.cors.js"></script>
         <script type="text/javascript" src="js/external/underscore-min.js"></script>
 
-        <script type="text/javascript" src="js/external/jqPlot/jquery.jqplot.js"></script>
-        <script type="text/javascript" src="js/external/jqPlot/plugins/jqplot.pieRenderer.js"></script>
-
         <script type="text/javascript" src="js/external/form2object.js"></script>
         <script type="text/javascript" src="js/external/formToWizard.js"></script>
         <script type="text/javascript" src="js/external/md5_generator.js"></script>

diff --git a/js/external/jqPlot/jquery.jqplot.css b/js/external/jqPlot/jquery.jqplot.css