merge all code to one package

cool-aleuser01 · May 22, 2013 · 029d987 · 029d987
1 parent beeaff9
commit 029d987
Show file tree

Hide file tree

Showing 118 changed files with 68 additions and 336 deletions.
diff --git a/iframely-node2/README.md → README.md b/iframely-node2/README.md → README.md
diff --git a/iframely-proxy/TODO.txt → TODO.txt b/iframely-proxy/TODO.txt → TODO.txt
diff --git a/iframely-proxy/config.js → config.js b/iframely-proxy/config.js → config.js
diff --git a/config.local.js b/config.local.js
@@ -0,0 +1,10 @@
+(function() {
+    var config = {
+        DEBUG: !true,
+        baseAppUrl: "http://localhost:8061",
+        baseStaticUrl: "http://localhost:8061",
+        port: 8061
+    };
+
+    module.exports = config;
+})();
diff --git a/iframely-proxy/config.local.js.SAMPLE → config.local.js.SAMPLE b/iframely-proxy/config.local.js.SAMPLE → config.local.js.SAMPLE
diff --git a/iframely-node2/package.json b/iframely-node2/package.json
diff --git a/iframely-node2/providers.json b/iframely-node2/providers.json
diff --git a/iframely-plugins/package.json b/iframely-plugins/package.json
diff --git a/iframely-proxy/README.md b/iframely-proxy/README.md
diff --git a/iframely-proxy/package.json b/iframely-proxy/package.json
diff --git a/iframely-node2/lib/iframely.js → lib/iframely-meta.js b/iframely-node2/lib/iframely.js → lib/iframely-meta.js
@@ -870,7 +870,7 @@
      * @return {String} The oembed uri
      */
     function lookupStaticProviders(uri) {
-        var providers = require('../providers.json');
+        var providers = require('../../iframely-node2/providers.json');
 
         var protocolMatch = uri.match(/^(https?:\/\/)/);
         var uri2 = uri.substr(protocolMatch[1].length);