Merge branch '541-rc' of github.com:cryptpad/cryptpad into 541-rc

This commit is contained in:
yflory 2023-08-22 15:48:53 +02:00
commit cddfc7b5a1
4 changed files with 15 additions and 6 deletions

View File

@ -95,7 +95,7 @@ define([
return h('a', attrs, [icon, text]);
};
Pages.versionString = "5.4.0";
Pages.versionString = "5.4.1";
var customURLs = Pages.customURLs = {};
(function () {

View File

@ -272,9 +272,18 @@ app.get(mainPagePattern, Express.static('./customize.dist'));
app.use("/blob", Express.static(Path.resolve(Env.paths.blob), {
maxAge: Env.DEV_MODE? "0d": "365d"
}));
app.head("/datastore", Express.static(Env.paths.data, {
maxAge: "0d"
}));
app.use("/datastore",
(req, res, next) => {
if (req.method === 'HEAD') {
next();
} else {
res.status(403).end();
}
},
Express.static(Env.paths.data, {
maxAge: "0d"
}
));
app.use('/block/', function (req, res, next) {
var parsed = Path.parse(req.url);

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "cryptpad",
"version": "5.4.0",
"version": "5.4.1",
"lockfileVersion": 2,
"requires": true,
"packages": {

View File

@ -1,7 +1,7 @@
{
"name": "cryptpad",
"description": "realtime collaborative visual editor with zero knowlege server",
"version": "5.4.0",
"version": "5.4.1",
"license": "AGPL-3.0+",
"repository": {
"type": "git",