Merge branch 'master' of https://github.com/booleanhunter/ReactJS-AdminLTE

Author: booleanhunter

package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminlte-reactjs",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "repository": {
     "type": "git",
     "url": "http://github.com/booleanhunter/ReactJS-AdminLTE"

public/dist/js/app.js

@@ -56,7 +56,7 @@ $.AdminLTE.options = {
   //BoxRefresh Plugin
   enableBoxRefresh: true,
   //Bootstrap.js tooltip
-  enableBSToppltip: true,
+  enableBSToppltip: false,
   BSTooltipSelector: "[data-toggle='tooltip']",
   //Enable Fast Click. Fastclick.js creates a more
   //native touch experience with touch devices. If you
@@ -743,4 +743,4 @@ function _init() {
       }
     });
   };
-}(jQuery));
+}(jQuery));

public/dist/js/app.min.js

@@ -21,7 +21,7 @@ define (
 						timelineElement.items.map(function(item, i){
 							timelineInfo.push(
 								<TimelineItem 
-									key={"item"+iterator+i}
+									key={"item"+iterator+'.'+i}
 									icon={item.icon} 
 									iconTheme={item.iconTheme}
 									time= {item.time}

src/components/timeline/timeline.js

@@ -52,11 +52,11 @@
     </script>
 -->
 
-        <!-- AdminLTE App -->
-
-        <!-- <script src="dist/js/app.js"></script>
-    // <script src="dist/js/pages/dashboard.js"></script>
-    // <script src="dist/js/demo.js"></script> -->
+    <!-- AdminLTE App -->
+    <script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
+    <script src="dist/js/app.js"></script>
+    <!-- <script src="dist/js/pages/dashboard.js"></script>
+    <script src="dist/js/demo.js"></script> -->
 
 
         <script src="/dist/js/vendors.js"></script>
@@ -66,10 +66,11 @@
 
      <!--Use this only in development, while using React Hot Loader -->
 <!-- 
+        <script src="http://localhost:8080/dist/js/app.js"></script> 
         <script src="http://localhost:8080/dist/js/vendors.js"></script>      
         <script src="http://localhost:8080/dist/js/chartVendors.bundle.js"></script>
         <script src="http://localhost:8080/dist/js/dashboardV1.bundle.js"></script> -->
 
     </body>
 
-</html>
+</html>