Merge branch 'dev' into 'dev'

Winter cleaning See merge request Shinobi-Systems/Shinobi!375
2022-08-05 15:01:01 +00:00 · 2022-08-05 15:01:01 +00:00 · b07e3ce400
parent f63bb5b47d ed02aa8d5d
commit b07e3ce400
4 changed files with 3 additions and 5 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -19,7 +19,7 @@
        "discord.js": "^12.2.0",
        "ejs": "^2.7.4",
        "express": "^4.16.4",
-        "express-fileupload": "^1.1.6-alpha.6",
+        "express-fileupload": "^1.4.0",
        "fs-extra": "9.0.1",
        "ftp-srv": "^4.4.0",
        "googleapis": "^100.0.0",
@ -27,7 +27,7 @@
        "jsonfile": "^3.0.1",
        "knex": "^0.21.4",
        "ldapauth-fork": "^5.0.2",
-        "moment": "^2.27.0",
+        "moment": "^2.29.4",
        "mp4frag": "^0.2.0",
        "mqtt": "^4.3.7",
        "mysql": "^2.18.1",
--- a/web/assets/js/bs5.help.js
+++ b/web/assets/js/bs5.help.js
@ -75,6 +75,6 @@ $(document).ready(function(){
        dontShowForOneWeek()
        return false;
    })
-    console.log('Please support the Shinobi developement.')
+    console.log('Please support the Shinobi development.')
    console.log('https://licenses.shinobi.video/subscribe')
 })
--- a/web/pages/blocks/header.ejs
+++ b/web/pages/blocks/header.ejs
@ -7,7 +7,6 @@
 <html lang="en">
 <head>
    <title><%-pageTitle%></title>
-    <div><%-window.libURL%></div>
    <meta charset="utf-8">
    <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no' name='viewport' />
    <meta name="description" content="Shinobi">
--- a/web/pages/blocks/superPluginManager.ejs
+++ b/web/pages/blocks/superPluginManager.ejs
@ -1,4 +1,3 @@
-<link rel="stylesheet" href="<%-window.libURL%>libs/css/super.pluginManager.css">
 <form class="form-group-group card bg-dark grey mt-1" id="downloadNewPlugin">
    <div class="card-body">
        <div class="form-group">