From cbfd36f793c68e29306402b3720a0bac63f7e8da Mon Sep 17 00:00:00 2001
From: Elbert Alias <77259+AliasIO@users.noreply.github.com>
Date: Wed, 2 Dec 2020 14:01:56 +1100
Subject: [PATCH] Fix merge

---
 src/technologies.json | 116 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 101 insertions(+), 15 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index b29ce46ac..28bd07995 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -567,6 +567,8 @@
         "adroll_pix_id": ""
       },
       "scripts": "(?:a|s)\\.adroll\\.com",
+      "saas": true,
+      "pricing": ["low", "recurring"],
       "website": "http://adroll.com"
     },
     "Adally": {
@@ -1530,6 +1532,8 @@
       "html": "<(?:iframe|img)[^>]+adnxs\\.(?:net|com)",
       "icon": "AppNexus.svg",
       "scripts": "adnxs\\.(?:net|com)",
+      "saas": true,
+      "pricing": ["poa"],
       "website": "http://appnexus.com"
     },
     "Apple Pay": {
@@ -1703,7 +1707,11 @@
       "headers": {
         "X-Confluence-Request-Time": ""
       },
-      "html": "Powered by <a href=[^>]+atlassian\\.com/software/confluence(?:[^>]+>Atlassian Confluence</a> ([\\d.]+))?\\;version:\\1",
+      "dom": {
+        "li.print-only": {
+          "text": "Atlassian Confluence ([\\d.]+)\\;version:\\1"
+        }
+      },
       "icon": "Atlassian Confluence.svg",
       "implies": "Java",
       "meta": {
@@ -1728,15 +1736,19 @@
         13
       ],
       "cpe": "cpe:/a:atlassian:jira",
-      "html": "Powered by\\s+<a href=[^>]+atlassian\\.com/(?:software/jira|jira-bug-tracking/)[^>]+>Atlassian\\s+JIRA(?:[^v]*v(?:ersion: )?(\\d+\\.\\d+(?:\\.\\d+)?))?\\;version:\\1",
       "icon": "Atlassian Jira.svg",
       "implies": "Java",
       "js": {
-        "jira": ""
+        "jira.id": ""
+      },
+      "dom": {
+        "#jira": {
+          "text": ""
+        }
       },
       "meta": {
-        "ajs-version-number": "^(.+)$\\;version:\\1",
-        "application-name": "JIRA"
+        "application-name": "JIRA",
+        "data-version": "([\\d.]+)\\;version:\\1\\;confidence:0"
       },
       "website": "http://www.atlassian.com/software/jira/overview/"
     },
@@ -2065,6 +2077,8 @@
       "icon": "BigCommerce.svg",
       "scripts": "cdn\\d+\\.bigcommerce\\.com/",
       "url": "mybigcommerce\\.com",
+      "saas": true,
+      "pricing": ["low", "recurring"],
       "website": "http://www.bigcommerce.com"
     },
     "BigDump": {
@@ -2696,6 +2710,7 @@
       "js": {
         "fn_compare_strings": ""
       },
+      "pricing": ["mid", "onetime"],
       "website": "http://www.cs-cart.com"
     },
     "CacheFly": {
@@ -2732,6 +2747,8 @@
         "EC_GLOBAL_INFO": "",
         "EC_ROOT_DOMAIN": ""
       },
+      "saas": true,
+      "pricing": ["low"],
       "website": "https://ec.cafe24.com/"
     },
     "CakePHP": {
@@ -2749,28 +2766,28 @@
       },
       "website": "http://cakephp.org"
     },
-    "Skedify": {
+    "Calendly": {
       "cats": [
         72
       ],
-      "description": "Skedify is an appointment booking solution created for enterprises.",
-      "icon": "Skedify.svg",
+      "description": "Calendly is an app for scheduling appointments, meetings, and events.",
+      "icon": "Calendly.svg",
       "js": {
-        "Skedify.Plugin.version": "^(.+)$\\;version:\\1"
+        "Calendly": ""
       },
-      "scripts": "plugin\\.skedify\\.io",
+      "scripts": "https://assets\\.calendly\\.com/assets/external/widget\\.js",
       "website": "https://calendly.com/"
     },
-    "Calendly": {
+    "Skedify": {
       "cats": [
         72
       ],
-      "description": "Calendly is an app for scheduling appointments, meetings, and events.",
-      "icon": "Calendly.svg",
+      "description": "Skedify is an appointment booking solution created for enterprises.",
+      "icon": "Skedify.svg",
       "js": {
-        "Calendly": ""
+        "Skedify.Plugin.version": "^(.+)$\\;version:\\1"
       },
-      "scripts": "https://assets\\.calendly\\.com/assets/external/widget\\.js",
+      "scripts": "plugin\\.skedify\\.io",
       "website": "https://calendly.com/"
     },
     "Captch Me": {
@@ -3734,6 +3751,8 @@
         "//(?:cas\\.criteo\\.com|(?:[^/]\\.)?criteo\\.net)/",
         "//static\\.criteo\\.net/js/ld/ld\\.js"
       ],
+      "saas": true,
+      "pricing": ["poa"],
       "website": "http://criteo.com"
     },
     "Cross Pixel": {
@@ -4296,6 +4315,7 @@
         "tpc\\.googlesyndication\\.com/safeframe",
         "googlesyndication\\.com.*abg\\.js"
       ],
+      "saas": true,
       "website": "http://www.doubleclickbygoogle.com/solutions/digital-marketing/ad-exchange/"
     },
     "DoubleClick Campaign Manager (DCM)": {
@@ -4321,6 +4341,8 @@
       "description": "DoubleClick for Publishers (DFP) is a hosted ad serving platform that streamlines your ad management.",
       "icon": "DoubleClick.svg",
       "scripts": "googletagservices\\.com/tag/js/gpt(?:_mobile)?\\.js",
+      "saas": true,
+      "pricing": ["freemium"],
       "website": "http://www.google.com/dfp"
     },
     "DovetailWRP": {
@@ -4487,6 +4509,7 @@
         "eccube\\.js",
         "win_op\\.js"
       ],
+      "oss": true,
       "website": "http://www.ec-cube.net"
     },
     "EKM": {
@@ -4532,6 +4555,8 @@
       "js": {
         "epages": ""
       },
+      "saas": true,
+      "pricing": ["low", "recurring"],
       "website": "http://www.epages.com/"
     },
     "EPiServer": {
@@ -4602,6 +4627,8 @@
         "https://app\\.multiscreenstore\\.com/script\\.js",
         "https://app\\.ecwid\\.com/script\\.js"
       ],
+      "saas": true,
+      "pricing": ["freemium"],
       "website": "https://www.ecwid.com/"
     },
     "EdgeCast": {
@@ -6014,6 +6041,7 @@
         "2mdn\\.net",
         "ad\\.ca\\.doubleclick\\.net"
       ],
+      "saas": true,
       "website": "https://www.google.fr/adsense/start/"
     },
     "Google Analytics": {
@@ -6813,6 +6841,8 @@
       "icon": "IBM.svg",
       "implies": "Java",
       "url": "/wcs/",
+      "saas": true,
+      "pricing": ["poa"],
       "website": "http://ibm.com/software/genservers/commerceproductline"
     },
     "IIS": {
@@ -7577,6 +7607,8 @@
       "js": {
         "Kajabi": ""
       },
+      "saas": true,
+      "pricing": ["mid"],
       "website": "https://newkajabi.com"
     },
     "Kampyle": {
@@ -8073,6 +8105,8 @@
       "icon": "Lightspeed.svg",
       "scripts": "http://assets\\.webshopapp\\.com",
       "url": "seoshop.webshopapp.com",
+      "saas": true,
+      "pricing": ["low"],
       "website": "http://www.lightspeedhq.com/products/ecommerce/"
     },
     "LinkSmart": {
@@ -8521,6 +8555,7 @@
         "skin/frontend/(?:default|(enterprise))\\;version:\\1?Enterprise:Community",
         "static/_requirejs\\;confidence:50\\;version:2"
       ],
+      "oss": true,
       "website": "https://magento.com"
     },
     "MailChimp": {
@@ -10090,6 +10125,7 @@
         "generator": "Odoo"
       },
       "scripts": "/web/js/(?:web\\.assets_common/|website\\.assets_frontend/)\\;confidence:25",
+      "oss": true,
       "website": "http://odoo.com"
     },
     "Olark": {
@@ -10381,6 +10417,8 @@
         "optimizely": ""
       },
       "scripts": "optimizely\\.com.*\\.js",
+      "saas": true,
+      "pricing": ["poa", "high"],
       "website": "https://www.optimizely.com"
     },
     "Oracle Application Server": {
@@ -11308,6 +11346,7 @@
         "<input type=\"hidden\" name=\"shopid\""
       ],
       "icon": "Powergap.png",
+      "saas": true,
       "website": "http://powergap.de"
     },
     "Prebid": {
@@ -11324,6 +11363,8 @@
         "/prebid\\.js",
         "adnxs\\.com/[^\"]*(?:prebid|/pb\\.js)"
       ],
+      "oss": true,
+      "pricing": ["freemium"],
       "website": "http://prebid.org"
     },
     "Prefix-Free": {
@@ -11369,6 +11410,8 @@
       "meta": {
         "generator": "PrestaShop"
       },
+      "oss": true,
+      "pricing": ["freemium"],
       "website": "http://www.prestashop.com"
     },
     "Prism": {
@@ -12275,6 +12318,8 @@
         "RISKX": "",
         "riskifiedBeaconLoad": ""
       },
+      "saas": true,
+      "pricing": ["poa"],
       "website": "https://www.riskified.com/"
     },
     "RiteCMS": {
@@ -12460,6 +12505,8 @@
       ],
       "icon": "SAP.svg",
       "implies": "Java",
+      "saas": true,
+      "pricing": ["poa"],
       "website": "https://www.sap.com/products/crm/e-commerce-platforms.html"
     },
     "SAP Customer Data Cloud Sign-in": {
@@ -12664,6 +12711,8 @@
         "dwAnalytics": ""
       },
       "scripts": "/demandware\\.static/",
+      "saas": true,
+      "pricing": ["poa"],
       "website": "http://demandware.com"
     },
     "Salesforce Service Cloud": {
@@ -13148,6 +13197,8 @@
       "js": {
         "shoper": ""
       },
+      "saas": true,
+      "pricing": ["low"],
       "website": "https://www.shoper.pl"
     },
     "Shopery": {
@@ -13197,6 +13248,8 @@
       },
       "scripts": "sdks\\.shopifycdn\\.com",
       "url": "^https?//.+\\.myshopify\\.com",
+      "saas": true,
+      "pricing": ["low", "recurring"],
       "website": "http://shopify.com"
     },
     "Shopline": {
@@ -13278,6 +13331,8 @@
         "/jquery\\.shopware\\.min\\.js",
         "/engine/Shopware/"
       ],
+      "saas": true,
+      "pricing": ["low", "freemium", "recurring"],
       "website": "https://www.shopware.com"
     },
     "Sift": {
@@ -15374,6 +15429,8 @@
         "powered": "vtex"
       },
       "icon": "VTEX.svg",
+      "saas": true,
+      "pricing": ["payg"],
       "website": "https://vtex.com/"
     },
     "Vaadin": {
@@ -15631,6 +15688,8 @@
         "volusion": ""
       },
       "scripts": "/volusion\\.js(?:\\?([\\d.]*))?\\;version:\\1",
+      "saas": true,
+      "pricing": ["low", "recurring"],
       "website": "https://www.volusion.com"
     },
     "Voog.com Website Builder": {
@@ -15737,6 +15796,8 @@
       "js": {
         "WHMCS": ""
       },
+      "oss": true,
+      "pricing": ["low", "recurring"],
       "website": "http://www.whmcs.com"
     },
     "WP Engine": {
@@ -16219,6 +16280,8 @@
         "generator": "Wix\\.com Website Builder"
       },
       "scripts": "static\\.parastorage\\.com",
+      "saas": true,
+      "pricing": ["low", "recurring"],
       "website": "https://www.wix.com"
     },
     "Wolf CMS": {
@@ -16257,6 +16320,7 @@
         "generator": "WooCommerce ([\\d.]+)\\;version:\\1"
       },
       "scripts": "/woocommerce(?:\\.min)?\\.js(?:\\?ver=([0-9.]+))?\\;version:\\1",
+      "oss": true,
       "website": "https://woocommerce.com"
     },
     "Woopra": {
@@ -17834,6 +17898,7 @@
       "meta": {
         "generator": "^nopCommerce$"
       },
+      "oss": true,
       "website": "http://www.nopcommerce.com"
     },
     "osCommerce": {
@@ -18447,6 +18512,27 @@
         "generator": "xt:Commerce"
       },
       "website": "https://www.xt-commerce.com"
+    },
+    "KaTeX": {
+      "cats": [
+        25
+      ],
+      "description": "KaTeX is a cross-browser JavaScript library that displays mathematical notation in web browsers.",
+      "icon": "KaTeX.svg",
+      "oss": true,
+      "dom": {
+        "link[href*=katex]": {
+          "attributes": {
+            "href": "katex(?:\\.min)?\\.css"
+          }
+        }
+      },
+      "js": {
+        "katex": "",
+        "katex.version": "^(.+)$\\;version:\\1"
+      },
+      "scripts": "katex(?:\\.min)?\\.js",
+      "website": "https://katex.org/"
     }
   }
 }