ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'dev' 

Winter cleaning

See merge request Shinobi-Systems/Shinobi!375
matrix-notifications
Moe 2022-08-05 15:01:01 +00:00
parent f63bb5b47d ed02aa8d5d
commit b07e3ce400
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@ -19,7 +19,7 @@
"discord.js": "^12.2.0", "discord.js": "^12.2.0",
"ejs": "^2.7.4", "ejs": "^2.7.4",
"express": "^4.16.4", "express": "^4.16.4",
"express-fileupload": "^1.1.6-alpha.6", "express-fileupload": "^1.4.0",
"fs-extra": "9.0.1", "fs-extra": "9.0.1",
"ftp-srv": "^4.4.0", "ftp-srv": "^4.4.0",
"googleapis": "^100.0.0", "googleapis": "^100.0.0",
@ -27,7 +27,7 @@
"jsonfile": "^3.0.1", "jsonfile": "^3.0.1",
"knex": "^0.21.4", "knex": "^0.21.4",
"ldapauth-fork": "^5.0.2", "ldapauth-fork": "^5.0.2",
"moment": "^2.27.0", "moment": "^2.29.4",
"mp4frag": "^0.2.0", "mp4frag": "^0.2.0",
"mqtt": "^4.3.7", "mqtt": "^4.3.7",
"mysql": "^2.18.1", "mysql": "^2.18.1",

2
web/assets/js/bs5.help.js
View File

@ -75,6 +75,6 @@ $(document).ready(function(){
dontShowForOneWeek() dontShowForOneWeek()
return false; return false;
}) })
console.log('Please support the Shinobi developement.') console.log('Please support the Shinobi development.')
console.log('https://licenses.shinobi.video/subscribe') console.log('https://licenses.shinobi.video/subscribe')
}) })

1
web/pages/blocks/header.ejs
View File

@ -7,7 +7,6 @@
<html lang="en"> <html lang="en">
<head> <head>
<title><%-pageTitle%></title> <title><%-pageTitle%></title>
<div><%-window.libURL%></div>
<meta charset="utf-8"> <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 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"> <meta name="description" content="Shinobi">

1
web/pages/blocks/superPluginManager.ejs
View File

@ -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"> <form class="form-group-group card bg-dark grey mt-1" id="downloadNewPlugin">
<div class="card-body"> <div class="card-body">
<div class="form-group"> <div class="form-group">