Skip to content

Commit da511d0

Browse files
authored
Merge pull request #1870 from hackmdio/release/2.5.4
Release 2.5.4
2 parents 80cd92f + 94ec934 commit da511d0

File tree

8 files changed

+35
-10
lines changed

8 files changed

+35
-10
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ HackMD is built with one promise - **You own and control all your content**:
3939

4040
## CodiMD - The Open Source HackMD
4141

42-
CodiMD is the free software version of [HackMD](https://hackmd.io), developed and opened source by the HackMD team with reduced features (without book mode), you can use CodiMD for your community and own all your data. *(See the [origin of the name CodiMD](https://github.com/hackmdio/hackmd/issues/720).)*
42+
CodiMD is the free software version of [HackMD](https://hackmd.io), developed and open sourced by the HackMD team with reduced features (without book mode), you can use CodiMD for your community and own all your data. *(See the [origin of the name CodiMD](https://github.com/hackmdio/hackmd/issues/720).)*
4343

4444
CodiMD is perfect for open communities, while HackMD emphasizes on permission and access controls for commercial use cases.
4545

deployments/docker-compose.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ services:
1111
restart: always
1212
codimd:
1313
# you can use image or custom build below,
14-
# if you need CJK character with exported PDF files,
15-
# please change the image tag with `cjk` postfix version
16-
image: nabo.codimd.dev/hackmdio/hackmd:2.1.0
17-
# image: nabo.codimd.dev/hackmdio/hackmd:2.1.0-cjk
14+
image: nabo.codimd.dev/hackmdio/hackmd:2.5.3
1815
# build:
1916
# context: ..
2017
# dockerfile: ./deployments/Dockerfile

lib/imageRouter/filesystem.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ function randomFilename () {
2222
*/
2323
function pickFilename (defaultFilename) {
2424
let retryCounter = 5
25-
let filename = defaultFilename
2625
const extname = path.extname(defaultFilename)
26+
let filename = `${randomFilename()}${extname}`
2727
while (retryCounter-- > 0) {
2828
if (fs.existsSync(path.join(config.uploadsPath, filename))) {
2929
filename = `${randomFilename()}${extname}`
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
'use strict'
2+
3+
module.exports = {
4+
up: (queryInterface, Sequelize) => {
5+
return queryInterface.addIndex('Revisions', ['noteId'], {})
6+
},
7+
8+
down: (queryInterface, Sequelize) => {
9+
return queryInterface.removeIndex('Revisions', 'noteId')
10+
}
11+
}

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codimd",
3-
"version": "2.5.3",
3+
"version": "2.5.4",
44
"description": "Realtime collaborative markdown notes on all platforms.",
55
"keywords": [
66
"Collaborative",

public/docs/release-notes.md

+17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
Release Notes
22
===
33

4+
<i class="fa fa-tag"></i> 2.5.4 <i class="fa fa-clock-o"></i> 2024-06-06
5+
---
6+
7+
[Check out the complete release note][v2_5_4]. Thank you CodiMD community and all our contributors. ❤️
8+
9+
[v2_5_4]: https://hackmd.io/@codimd/release-notes/%2F%40codimd%2Fv2_5_4
10+
11+
## Enhancements
12+
13+
- Add index at revision table for improving system performance [#1856](https://github.com/hackmdio/codimd/pull/1856)
14+
- Refactor to reuse random filename in filesystem image provider [#1867](https://github.com/hackmdio/codimd/pull/1867)
15+
16+
## Fixes
17+
18+
- Fix exclusion of name attribute from iframe filterXSS allowlist [#1865](https://github.com/hackmdio/codimd/pull/1865)
19+
- Fix typo: "opened source" -> "open sourced" [#1869](https://github.com/hackmdio/codimd/pull/1869)
20+
421
<i class="fa fa-tag"></i> 2.5.3 <i class="fa fa-clock-o"></i> 2024-01-08
522
---
623

public/js/render.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ whiteList.style = []
2020
// allow kbd tag
2121
whiteList.kbd = []
2222
// allow ifram tag with some safe attributes
23-
whiteList.iframe = ['allowfullscreen', 'name', 'referrerpolicy', 'src', 'width', 'height']
23+
whiteList.iframe = ['allowfullscreen', 'referrerpolicy', 'src', 'width', 'height']
2424
// allow summary tag
2525
whiteList.summary = []
2626
// allow ruby tag

0 commit comments

Comments
 (0)