blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'staging' into 2024.6-test

Browse source
This commit is contained in:
yflory 2024-06-24 16:32:28 +02:00
commit ab551aac31
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
package-lock.json generated
View file

@ -17,8 +17,8 @@
"bootstrap-tokenfield": "^0.12.0", "bootstrap-tokenfield": "^0.12.0",
"chainpad": "^5.2.6", "chainpad": "^5.2.6",
"chainpad-crypto": "^0.2.5", "chainpad-crypto": "^0.2.5",
"chainpad-listmap": "^1.0.0", "chainpad-listmap": "^1.1.0",
"chainpad-netflux": "^1.0.0", "chainpad-netflux": "^1.2.0",
"chainpad-server": "^5.2.0", "chainpad-server": "^5.2.0",
"ckeditor": "npm:ckeditor4@~4.22.1", "ckeditor": "npm:ckeditor4@~4.22.1",
"codemirror": "^5.19.0", "codemirror": "^5.19.0",
@ -27,7 +27,7 @@
"croppie": "^2.5.0", "croppie": "^2.5.0",
"dragula": "3.7.2", "dragula": "3.7.2",
"drawio": "github:cryptpad/drawio-npm#npm-21.8.2+5", "drawio": "github:cryptpad/drawio-npm#npm-21.8.2+5",
"express": "~4.18.2", "express": "~4.19.2",
"file-saver": "1.3.1", "file-saver": "1.3.1",
"fs-extra": "^7.0.0", "fs-extra": "^7.0.0",
"get-folder-size": "^2.0.1", "get-folder-size": "^2.0.1",
@ -41,7 +41,7 @@
"localforage": "^1.5.2", "localforage": "^1.5.2",
"marked": "^4.3.0", "marked": "^4.3.0",
"mathjax": "3.0.5", "mathjax": "3.0.5",
"netflux-websocket": "^1.0.0", "netflux-websocket": "^1.2.0",
"notp": "^2.0.3", "notp": "^2.0.3",
"nthen": "0.1.8", "nthen": "0.1.8",
"open-sans-fontface": "^1.4.0", "open-sans-fontface": "^1.4.0",
@ -1385,20 +1385,20 @@
} }
}, },
"node_modules/chainpad-listmap": { "node_modules/chainpad-listmap": {
"version": "1.0.2", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/chainpad-listmap/-/chainpad-listmap-1.0.2.tgz", "resolved": "https://registry.npmjs.org/chainpad-listmap/-/chainpad-listmap-1.1.0.tgz",
"integrity": "sha512-8DxiK7kkVAfXaFoTriLL360MImpX8ZwuuoISoZbizOgeacwOBVYBm4JecgVmXnft1UfjYUYBcXSl7HEI6EJHEQ==", "integrity": "sha512-1omk+bq+WX9XmcFkAjQLgKuCRRM7nWszA0dWwr2LCVXp/Y8fsSAm8id4zoX/L/5ToIXWpl53QdxDk6+4tQMH2w==",
"dependencies": { "dependencies": {
"chainpad-netflux": "^1.0.0", "chainpad-netflux": "^1.2.0",
"json.sortify": "~2.1.0" "json.sortify": "~2.1.0"
} }
}, },
"node_modules/chainpad-netflux": { "node_modules/chainpad-netflux": {
"version": "1.0.1", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/chainpad-netflux/-/chainpad-netflux-1.0.1.tgz", "resolved": "https://registry.npmjs.org/chainpad-netflux/-/chainpad-netflux-1.2.0.tgz",
"integrity": "sha512-fOUiYD7790XhSFegZY2Yv0HT5YJxJV/WH3QhQYP1Qu/pu7I4XHQfDac0/cf22b8HbM6bsjFTxqcOvn4m63km9A==", "integrity": "sha512-j3qzrL/tugpTNQTk1I7VMZuQJHAYRNmFaiAxLbEFre/gLIPPJqM4gHXuyTU2OFzIFSd5m5i4G3+GwZ32jLV3cA==",
"dependencies": { "dependencies": {
"netflux-websocket": "^1.0.0" "netflux-websocket": "^1.2.0"
} }
}, },
"node_modules/chainpad-server": { "node_modules/chainpad-server": {
@ -1598,9 +1598,9 @@
} }
}, },
"node_modules/cookie": { "node_modules/cookie": {
"version": "0.5.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
"integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
"engines": { "engines": {
"node": ">= 0.6" "node": ">= 0.6"
} }
@ -2232,16 +2232,16 @@
} }
}, },
"node_modules/express": { "node_modules/express": {
"version": "4.18.3", "version": "4.19.2",
"resolved": "https://registry.npmjs.org/express/-/express-4.18.3.tgz", "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
"integrity": "sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==", "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
"dependencies": { "dependencies": {
"accepts": "~1.3.8", "accepts": "~1.3.8",
"array-flatten": "1.1.1", "array-flatten": "1.1.1",
"body-parser": "1.20.2", "body-parser": "1.20.2",
"content-disposition": "0.5.4", "content-disposition": "0.5.4",
"content-type": "~1.0.4", "content-type": "~1.0.4",
"cookie": "0.5.0", "cookie": "0.6.0",
"cookie-signature": "1.0.6", "cookie-signature": "1.0.6",
"debug": "2.6.9", "debug": "2.6.9",
"depd": "2.0.0", "depd": "2.0.0",
@ -3962,9 +3962,9 @@
} }
}, },
"node_modules/netflux-websocket": { "node_modules/netflux-websocket": {
"version": "1.0.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-1.0.0.tgz", "resolved": "https://registry.npmjs.org/netflux-websocket/-/netflux-websocket-1.2.0.tgz",
"integrity": "sha512-xU5AXzSne9yA7eC6jXTU7UGvcG1Al0IUSeNd7IrumJBIr70DLa0nQfV3TOpZsmytBJbefi6fcfVjkgclAgWuOQ==" "integrity": "sha512-CNQF1wd/UOCmnfaWDATi5vTMfIpMm0Zghy1Fkvr5p7Q70wJdT85RdtnQvsqfLU5AXMUKwjeP1GgxMyAAdRUeJA=="
}, },
"node_modules/node-releases": { "node_modules/node-releases": {
"version": "2.0.14", "version": "2.0.14",

6
package.json
View file

@ -20,8 +20,8 @@
"bootstrap-tokenfield": "^0.12.0", "bootstrap-tokenfield": "^0.12.0",
"chainpad": "^5.2.6", "chainpad": "^5.2.6",
"chainpad-crypto": "^0.2.5", "chainpad-crypto": "^0.2.5",
"chainpad-listmap": "^1.0.0", "chainpad-listmap": "^1.1.0",
"chainpad-netflux": "^1.0.0", "chainpad-netflux": "^1.2.0",
"chainpad-server": "^5.2.0", "chainpad-server": "^5.2.0",
"ckeditor": "npm:ckeditor4@~4.22.1", "ckeditor": "npm:ckeditor4@~4.22.1",
"codemirror": "^5.19.0", "codemirror": "^5.19.0",
@ -44,7 +44,7 @@
"localforage": "^1.5.2", "localforage": "^1.5.2",
"marked": "^4.3.0", "marked": "^4.3.0",
"mathjax": "3.0.5", "mathjax": "3.0.5",
"netflux-websocket": "^1.0.0", "netflux-websocket": "^1.2.0",
"notp": "^2.0.3", "notp": "^2.0.3",
"nthen": "0.1.8", "nthen": "0.1.8",
"open-sans-fontface": "^1.4.0", "open-sans-fontface": "^1.4.0",