Merged from Master

2016-01-14 17:23:53 -08:00
parent 3e7eb11d84 88f8925d17
commit 032b2542f0
84 changed files with 605 additions and 3970 deletions
--- a/platform/features/scrolling/bundle.json
+++ b/platform/features/scrolling/bundle.json
@@ -1,25 +0,0 @@
-{
-    "name": "Scrolling Lists",
-    "description": "Time-ordered list of latest data.",
-    "extensions": {
-        "views": [
-            {
-                "key": "scrolling",
-                "name": "Scrolling",
-                "glyph": "5",
-                "description": "Scrolling list of data values.",
-                "templateUrl": "templates/scrolling.html",
-                "needs": [ "telemetry" ],
-                "delegation": true
-            }
-        ],
-        "controllers": [
-            {
-                "key": "ScrollingListController",
-                "implementation": "ScrollingListController.js",
-                "depends": [ "$scope", "telemetryFormatter" ]
-            }
-        ]
-    }
-
-}