Merge remote-tracking branch 'upstream/master'

Conflicts: registry.json
2015-06-05 15:25:51 +02:00
parent e7f9a2ceee c86c7fee17
commit d2281c9109
11 changed files with 79 additions and 2 deletions
@@ -0,0 +1,9 @@
+{
+  "format": "global",
+  "main": "build/auth0-lock.min",
+  "shim": {
+    "build/auth0-lock.min": {
+      "exports": "Auth0Lock"
+    }
+  }
+}
@@ -0,0 +1,12 @@
+{
+  "main": "build/hotkeys",
+  "registry": "jspm",
+  "dependencies": {
+    "angular": "^1.2.0"
+  },
+  "shim": {
+    "build/hotkeys": {
+      "deps": ["angular"]
+    }
+  }
+}
@@ -5,5 +5,5 @@
      "exports": "Handlebars"
    }
  },
-  "files": ["handlebars.js"]
+  "files": ["handlebars.js", "handlebars.runtime.js"]
 }
@@ -0,0 +1,3 @@
+{
+  "main": "jsol.js"
+}
@@ -0,0 +1,13 @@
+{
+  "main": "isteven-omni-bar.js",
+  "dependencies": {
+      "css": "^0.1.10"
+    },  
+  "shim": {
+    "isteven-omni-bar": {
+      "deps": [
+        "./isteven-omni-bar.css!"
+      ]
+    }
+  }
+}
@@ -0,0 +1,8 @@
+{
+  "format": "global",
+  "shim": {
+    "traceur-runtime": {
+      "exports": "$traceurRuntime"
+    }
+  }
+}
@@ -0,0 +1,8 @@
+{
+  "format": "global",
+  "shim": {
+    "traceur": {
+      "exports": "traceur"
+    }
+  }
+}
@@ -0,0 +1,10 @@
+{
+  "main": "velocity.js",
+  "files": [
+    "velocity.js",
+    "velocity.min.js",
+    "velocity.ui.js",
+    "velocity.ui.min.js"
+  ],
+  "format": "global"
+}
@@ -2,7 +2,12 @@
  "main": "js/foundation/foundation",
  "shim": {
    "js/foundation/foundation.*": "./foundation",
-    "js/foundation/foundation": ["jquery", "../vendor/custom.modernizr"]
+    "js/foundation/foundation": {
+      "deps": ["jquery", "../vendor/custom.modernizr"]
+    }
+  },
+  "dependencies": {
+    "jquery": "github:components/jquery"
  },
  "ignore": [
    "js/foundation.min.js", 
@@ -8,6 +8,9 @@
      "exports": "Foundation"
    }
  },
+  "dependencies": {
+    "jquery": "github:components/jquery"
+  },
  "ignore": [
    "js/foundation.min.js", 
    "js/vendor/jquery.cookie.js", 
@@ -115,6 +115,7 @@
  "bootstrap-wizard": "github:gwrey/bootstrap-wizard",
  "breeze": "npm:breeze-client",
  "buffer": "github:jspm/nodelibs-buffer",
+  "chai": "npm:chai",
  "chart": "github:nnnick/Chart.js",
  "child_process": "github:jspm/nodelibs-child_process",
  "chosen": "github:harvesthq/chosen",
@@ -131,6 +132,7 @@
  "curl": "github:cujojs/curl",
  "d3": "github:mbostock/d3",
  "datatables": "github:DataTables/DataTables",
+  "debug": "github:visionmedia/debug",
  "decimal.js": "github:MikeMcl/decimal.js",
  "dgram": "github:jspm/nodelibs-dgram",
  "di": "github:angular/di.js",
@@ -195,6 +197,7 @@
  "js-beautify": "github:beautify-web/js-beautify",
  "js.edgar": "npm:js.edgar",
  "jsfromhell": "github:jonasraoni/JSFromHell",
+  "jsol": "github:daepark/JSOL",
  "jsplumb": "github:sporritt/jsPlumb",
  "js-scrypt": "github:tonyg/js-scrypt",
  "kickstrap": "github:ajkochanowicz/Kickstrap",
@@ -215,6 +218,7 @@
  "meld": "github:cujojs/meld",
  "microplugin": "npm:microplugin",
  "minivents": "github:allouis/minivents",
+  "mithril": "npm:mithril",
  "mixing": "npm:mixing",
  "mocha": "npm:mocha",
  "modernizr": "github:Modernizr/Modernizr",
@@ -222,6 +226,7 @@
  "moment": "github:moment/moment",
  "moment-json-parser": "npm:moment-json-parser",
  "mongoose": "github:gavinaiken/mongoose-browser",
+  "moonridge-client": "github:capaj/Moonridge-client",
  "mq4-hover-shim": "npm:mq4-hover-shim",
  "msgs": "github:cujojs/msgs",
  "mustache": "github:janl/mustache.js",
@@ -313,6 +318,7 @@
  "url": "github:jspm/nodelibs-url",
  "util": "github:jspm/nodelibs-util",
  "vm": "github:jspm/nodelibs-vm",
+  "velocity": "github:julianshapiro/velocity",
  "vertxbus": "github:larrytin/bower-vertxbus",
  "virtual-dom": "npm:virtual-dom",
  "vue": "npm:vue",