Merge branch 'master' into hooks-incoming-data-bug

Saint2078 · Nov 29, 2021 · 804eb4c · 804eb4c
2 parents d02e313 + 83c8cb3
commit 804eb4c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/frontend/express/public/javascripts/countly/countly.views.js b/frontend/express/public/javascripts/countly/countly.views.js
@@ -8486,7 +8486,7 @@ app.addAppSwitchCallback(function(appId) {
             versions[z] = versions[z].join(".");
         }
 
-        if (versions[0] !== versions[1] || versions[1] !== versions[2]) {
+        if (versions[1] !== versions[2]) {
             CountlyHelpers.notify({
                 title: jQuery.i18n.map["version_history.alert-title"],
                 message: jQuery.i18n.map["version_history.alert-message"]

diff --git a/plugins/hooks/api/parts/triggers/incoming_data.js b/plugins/hooks/api/parts/triggers/incoming_data.js
@@ -97,7 +97,6 @@ class IncomingDataTrigger {
                 catch (err) {
                     console.log(err);
                 }
-
             });
         });
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -97,7 +97,6 @@ class IncomingDataTrigger { @@
                     catch (err) {
                         console.log(err);
                     }
                 });
             });
         }
@@ Expand Down @@