Merge branch 'master' into '0.9.0'

# Conflicts: # oe-logger/oe-logger.html # oe-logger/oe-logger.js
EdgeVerve · Aug 30, 2017 · 2afb27c · 2afb27c
2 parents 175df26 + 9dbcf9a
commit 2afb27c
Show file tree

Hide file tree

Showing 35 changed files with 171 additions and 16 deletions.
diff --git a/create-data/create-data.html b/create-data/create-data.html
@@ -20,7 +20,7 @@
         },
         inputs : 1,
         outputs : 2,
-        icon : "evf.png",
+        icon : "oeCloudLogo.svg",
         label : function() {
             return this.name || "create data";
         }

diff --git a/create-data/icons/evf.png b/create-data/icons/evf.png
diff --git a/create-data/icons/oeCloudLogo.svg b/create-data/icons/oeCloudLogo.svg
diff --git a/destroy-data/destroy-data.html b/destroy-data/destroy-data.html
@@ -20,7 +20,7 @@
         },
         inputs : 1,
         outputs : 2,
-        icon : "evf.png",
+        icon : "oeCloudLogo.svg",
         label : function() {
             return this.name || "destroy data";
         }

diff --git a/destroy-data/icons/evf.png b/destroy-data/icons/evf.png
diff --git a/destroy-data/icons/oeCloudLogo.svg b/destroy-data/icons/oeCloudLogo.svg
diff --git a/find-data/find-data.html b/find-data/find-data.html
@@ -20,7 +20,7 @@
         },
         inputs : 1,
         outputs : 2,
-        icon : "evf.png",
+        icon : "oeCloudLogo.svg",
         label : function() {
             return this.name || "find data";
         }

diff --git a/find-data/icons/evf.png b/find-data/icons/evf.png
diff --git a/find-data/icons/oeCloudLogo.svg b/find-data/icons/oeCloudLogo.svg
diff --git a/loopback-async-after-remote/async-after-remote.html b/loopback-async-after-remote/async-after-remote.html
@@ -19,7 +19,7 @@
         },
         inputs : 0,
         outputs : 1,
-        icon : "evf.png",
+        icon : "oeCloudLogo.svg",
         label : function() {
             return this.name || "async-after-remote";
         }

diff --git a/loopback-async-after-remote/icons/evf.png b/loopback-async-after-remote/icons/evf.png
diff --git a/loopback-async-after-remote/icons/oeCloudLogo.svg b/loopback-async-after-remote/icons/oeCloudLogo.svg
diff --git a/loopback-async-before-remote/async-before-remote.html b/loopback-async-before-remote/async-before-remote.html
@@ -19,7 +19,7 @@
         },
         inputs : 0,
         outputs : 1,
-        icon : "evf.png",
+        icon : "oeCloudLogo.svg",
         label : function() {
             return this.name || "async-before-remote";
         }

diff --git a/loopback-async-before-remote/icons/evf.png b/loopback-async-before-remote/icons/evf.png
diff --git a/loopback-async-before-remote/icons/oeCloudLogo.svg b/loopback-async-before-remote/icons/oeCloudLogo.svg
diff --git a/loopback-async-observer/async-observer.html b/loopback-async-observer/async-observer.html
@@ -19,7 +19,7 @@
         },
         inputs : 0,
         outputs : 1,
-        icon : "evf.png",
+        icon : "oeCloudLogo.svg",
         label : function() {
             return this.name || "async-observer";
         }

diff --git a/loopback-async-observer/icons/evf.png b/loopback-async-observer/icons/evf.png
diff --git a/loopback-async-observer/icons/oeCloudLogo.svg b/loopback-async-observer/icons/oeCloudLogo.svg
diff --git a/loopback-ds-switcher/ds-switcher.html b/loopback-ds-switcher/ds-switcher.html
@@ -25,7 +25,7 @@
     },
     inputs: 0,
     outputs: 2,
-    icon: "evf.png",
+    icon: "oeCloudLogo.svg",
     onpaletteadd: function() {
 
     },

diff --git a/loopback-ds-switcher/icons/evf.png b/loopback-ds-switcher/icons/evf.png
diff --git a/loopback-ds-switcher/icons/oeCloudLogo.svg b/loopback-ds-switcher/icons/oeCloudLogo.svg
diff --git a/loopback-model-observer/icons/evf.png b/loopback-model-observer/icons/evf.png
diff --git a/loopback-model-observer/icons/oeCloudLogo.svg b/loopback-model-observer/icons/oeCloudLogo.svg
diff --git a/loopback-model-observer/model-observer.html b/loopback-model-observer/model-observer.html
@@ -1,5 +1,5 @@
 <!-- 
- ©2016 EdgeVerve Systems Limited (a fully owned Infosys subsidiary),
+ �2016 EdgeVerve Systems Limited (a fully owned Infosys subsidiary),
  Bangalore, India. All Rights Reserved.
   -->
 <script type="text/javascript">
@@ -19,7 +19,7 @@
         },
         inputs : 0,
         outputs : 1,
-        icon : "evf.png",
+        icon : "oeCloudLogo.svg",
         label : function() {
             return this.name || "model-observer";
         }

diff --git a/loopback-model-observer/model-observer.js b/loopback-model-observer/model-observer.js
@@ -43,13 +43,13 @@ module.exports = function(RED) {
                 if (node.enabled) {
                     var msg = {
                         payload : eventPayload
-                    }
+                    };
 
                     node.send(msg);
                 } else {
                     console.log('node is disabled............');
                 }
-            })
+            });
         }
 
         node.on('close', function() {

diff --git a/loopback-sync-observer-end/icons/evf.png b/loopback-sync-observer-end/icons/evf.png
diff --git a/loopback-sync-observer-end/icons/oeCloudLogo.svg b/loopback-sync-observer-end/icons/oeCloudLogo.svg
diff --git a/loopback-sync-observer-end/sync-observer-end.html b/loopback-sync-observer-end/sync-observer-end.html
@@ -1,5 +1,5 @@
 <!-- 
- ©2016 EdgeVerve Systems Limited (a fully owned Infosys subsidiary),
+ ©2016 EdgeVerve Systems Limited (a fully owned Infosys subsidiary),
  Bangalore, India. All Rights Reserved.
   -->
 
@@ -14,7 +14,7 @@
         },
         inputs : 1,
         outputs : 0,
-        icon : "evf.png",
+        icon : "oeCloudLogo.svg",
         label : function() {
             return this.name || "sync-observer-end";
         }

diff --git a/loopback-sync-observer/icons/evf.png b/loopback-sync-observer/icons/evf.png
diff --git a/loopback-sync-observer/icons/oeCloudLogo.svg b/loopback-sync-observer/icons/oeCloudLogo.svg
diff --git a/loopback-sync-observer/sync-observer.html b/loopback-sync-observer/sync-observer.html
@@ -20,7 +20,7 @@
         },
         inputs : 0,
         outputs : 1,
-        icon : "evf.png",
+        icon : "oeCloudLogo.svg",
         label : function() {
             return this.name || "sync-observer";
         }

diff --git a/package.json b/package.json
@@ -43,7 +43,8 @@
     "should": "^8.2.2",
     "sinon": "^1.17.3",
     "supertest": "^1.2.0",
-    "when": "^3.7.7"
+    "when": "^3.7.7",
+    "oe-logger": "^0.9.1"
   },
   "dependencies": {
     "express": "^4.13.4"

diff --git a/rule-engine-decision-table/decision-table.html b/rule-engine-decision-table/decision-table.html
@@ -21,7 +21,7 @@
         },
         inputs : 1,
         outputs : 2,
-        icon : "evf.png",
+        icon : "oeCloudLogo.svg",
         label : function() {
             if(this.name){
                 return this.name;

diff --git a/rule-engine-decision-table/icons/evf.png b/rule-engine-decision-table/icons/evf.png
diff --git a/rule-engine-decision-table/icons/oeCloudLogo.svg b/rule-engine-decision-table/icons/oeCloudLogo.svg