Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into pr/desktop/fix-scroll-jump

pull/12118/head
Henry Heino 2025-04-16 14:24:24 -07:00 committed by GitHub
parent 0d2f96e8ba 2014fbf480
commit f0de11c6ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -31,7 +31,7 @@ Please see the [donation page](https://github.com/laurent22/joplin/blob/dev/read
# Sponsors
<!-- SPONSORS-ORG -->
<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-webseite&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://citricsheep.com"><img title="Citric Sheep" width="256" src="https://joplinapp.org/images/sponsors/CitricSheep.png"/></a> <a href="https://sorted.travel/?utm_source=joplinapp"><img title="Sorted Travel" width="256" src="https://joplinapp.org/images/sponsors/SortedTravel.png"/></a> <a href="https://celebian.com"><img title="Celebian" width="256" src="https://joplinapp.org/images/sponsors/Celebian.png"/></a> <a href="https://bestkru.com"><img title="BestKru" width="256" src="https://joplinapp.org/images/sponsors/BestKru.png"/></a> <a href="https://www.socialfollowers.uk/buy-tiktok-followers/"><img title="Social Followers" width="256" src="https://joplinapp.org/images/sponsors/SocialFollowers.png"/></a> <a href="https://stormlikes.com/"><img title="Stormlikes" width="256" src="https://joplinapp.org/images/sponsors/Stormlikes.png"/></a> <a href="https://route4me.com"><img title="Route4Me" width="256" src="https://joplinapp.org/images/sponsors/Route4Me.png"/></a> <a href="https://casinoreviews.net"><img title="Casino Reviews" width="256" src="https://joplinapp.org/images/sponsors/CasinoReviews.png"/></a> <a href="https://topagency.webflow.io"><img title="WebDesignAgency" width="256" src="https://joplinapp.org/images/sponsors/WebDesignAgency.png" alt="topagency"/></a> <a href="https://realgambling.ca/"><img title="RealGambling.ca" width="256" src="https://joplinapp.org/images/sponsors/RealGambling.png" alt="RealGambling.ca"/></a> <a href="https://essaypro.com/"><img title="write an essay online with EssayPro" width="256" src="https://joplinapp.org/images/sponsors/EssayPro.png" alt="write an essay online with EssayPro"/></a> <a href="https://www.slotozilla.com/nz/no-deposit-bonus"><img title="casino without making any upfront cost" width="256" src="https://joplinapp.org/images/sponsors/Slotozilla.png" alt="casino without making any upfront cost"/></a> <a href="https://www.reddit.com/r/tiktokRise/"><img title="Tiktok Rise" width="256" src="https://joplinapp.org/images/sponsors/TiktokRise.jpg" alt="Tiktok Rise"/></a>
<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-webseite&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://citricsheep.com"><img title="Citric Sheep" width="256" src="https://joplinapp.org/images/sponsors/CitricSheep.png"/></a> <a href="https://sorted.travel/?utm_source=joplinapp"><img title="Sorted Travel" width="256" src="https://joplinapp.org/images/sponsors/SortedTravel.png"/></a> <a href="https://celebian.com"><img title="Celebian" width="256" src="https://joplinapp.org/images/sponsors/Celebian.png"/></a> <a href="https://bestkru.com"><img title="BestKru" width="256" src="https://joplinapp.org/images/sponsors/BestKru.png"/></a> <a href="https://www.socialfollowers.uk/buy-tiktok-followers/"><img title="Social Followers" width="256" src="https://joplinapp.org/images/sponsors/SocialFollowers.png"/></a> <a href="https://stormlikes.com/"><img title="Stormlikes" width="256" src="https://joplinapp.org/images/sponsors/Stormlikes.png"/></a> <a href="https://route4me.com"><img title="Route4Me" width="256" src="https://joplinapp.org/images/sponsors/Route4Me.png"/></a> <a href="https://casinoreviews.net"><img title="Casino Reviews" width="256" src="https://joplinapp.org/images/sponsors/CasinoReviews.png"/></a> <a href="https://topagency.webflow.io"><img title="WebDesignAgency" width="256" src="https://joplinapp.org/images/sponsors/WebDesignAgency.png" alt="topagency"/></a> <a href="https://realgambling.ca/"><img title="RealGambling.ca" width="256" src="https://joplinapp.org/images/sponsors/RealGambling.png" alt="RealGambling.ca"/></a> <a href="https://essaypro.com/"><img title="write an essay online with EssayPro" width="256" src="https://joplinapp.org/images/sponsors/EssayPro.png" alt="write an essay online with EssayPro"/></a> <a href="https://www.slotozilla.com/nz/no-deposit-bonus"><img title="casino without making any upfront cost" width="256" src="https://joplinapp.org/images/sponsors/Slotozilla.png" alt="casino without making any upfront cost"/></a> <a href="https://www.reddit.com/r/tiktokRise/"><img title="Tiktok Rise" width="256" src="https://joplinapp.org/images/sponsors/TiktokRise.jpg" alt="Tiktok Rise"/></a> <a href="https://essaywriter.pro"><img title="write my essay services by EssayWriter" width="256" src="https://joplinapp.org/images/sponsors/EssayWriterPro.png" alt="write my essay services by EssayWriter"/></a>
<!-- SPONSORS-ORG -->
* * *

15
crowdin.yml
View File

@ -6,18 +6,19 @@ files:
- source: /readme/**/*
translation: /readme/i18n/%two_letters_code%/docusaurus-plugin-content-docs/current/**/%original_file_name%
ignore:
- /**/*.jpg
- /**/*.json
- /**/*.png
- /**/*.yml
- /readme/_i18n
- /readme/i18n
- /readme/about/changelog
- /readme/about/stats.md
- /readme/api
- /readme/dev
- /readme/news
- /readme/cla.md
- /readme/connection_check.md
- /readme/dev
- /readme/i18n
- /readme/licenses.md
- /readme/news
- /readme/privacy.md
- /**/*.yml
- /**/*.json
- /**/*.png
- /**/*.jpg

1
packages/app-desktop/gui/NoteEditor/WarningBanner/WarningBanner.tsx
View File

@ -36,7 +36,6 @@ const incompatiblePluginIds = [
// cSpell:disable
'com.septemberhx.Joplin.Enhancement',
'ylc395.noteLinkSystem',
'outline',
'joplin.plugin.cmoptions',
'com.asdibiase.joplin-languagetool',
// cSpell:enable

2
packages/default-plugins/pluginRepositories.json
View File

@ -7,6 +7,6 @@
"io.github.personalizedrefrigerator.js-draw": {
"cloneUrl": "https://github.com/personalizedrefrigerator/joplin-plugin-freehand-drawing.git",
"branch": "main",
"commit": "0edb52b167ba6d5084f5c969464f6d2a0cbef4be"
"commit": "49650407c1d56a2a0123d2d56d2387e48eb58415"
}
}

23
packages/doc-builder/README.md
View File

@ -8,12 +8,6 @@ This website is built using [Docusaurus 2](https://docusaurus.io/), a modern sta
From `packages/tools`, run `node website/processDocs.js --env dev`
### Getting the translations
```shell
CROWDIN_PERSONAL_TOKEN=..... yarn crowdinDownload
```
### Building the doc
From `packages/doc-builder`, run:
@ -40,6 +34,23 @@ Alternatively, to test the doc website after it has been built, build it using o
Translation is done using https://crowdin.com/
### Uploading the string
```shell
CROWDIN_PERSONAL_TOKEN=..... yarn crowdinUpload
```
### Getting the translations
```shell
CROWDIN_PERSONAL_TOKEN=..... yarn crowdinDownload
```
### Adding a translation
- Make sure the translation is available in Crowdin
- In `packages/doc-builder/docusaurus.config.js`, add the language code to `i18n.locales`
## Building for production
This is done in `release-website.sh` from the repository https://github.com/joplin/website/

2
packages/doc-builder/docusaurus.config.js
View File

@ -43,7 +43,7 @@ const config = {
// to replace "en" with "zh-Hans".
i18n: {
defaultLocale: 'en',
locales: ['en', 'fr'],
locales: ['en', 'fr', 'de'],
},
plugins: [

4
packages/tools/website/processDocs.ts
View File

@ -95,7 +95,9 @@ const parseHtml = (html: string) => {
attrHtml.push(`${n}=${escapedValue}`);
}
output.push(`<${name} ${attrHtml.join(' ')}${closingSign}`);
const closingSpace = isSelfClosingTag(name) || !!attrHtml.length ? ' ' : '';
output.push(`<${name}${attrHtml.length ? ` ${attrHtml.join(' ')}` : ''}${closingSpace}${closingSign}`);
},
ontext: (decodedText: string) => {

2
packages/tools/website/processDocsTestSamples/headers.mdx
View File

@ -12,6 +12,6 @@ More text
End
<img src="https://example.com/img.png"/>
<img src="https://example.com/img.png" />
# Image and header

2
packages/tools/website/processDocsTestSamples/image.mdx
View File

@ -1,5 +1,5 @@
One paragraph
<img src="https://joplinapp.org/images/logo-text.svg" width="40"/>
<img src="https://joplinapp.org/images/logo-text.svg" width="40" />
Two paragraph

1
packages/tools/website/processDocsTestSamples/kbd.md Normal file
View File

@ -0,0 +1 @@
Press <kbd>Ctrl</kbd>+<kbd>A</kbd>

1
packages/tools/website/processDocsTestSamples/kbd.mdx Normal file
View File

@ -0,0 +1 @@
Press <kbd>Ctrl</kbd>+<kbd>A</kbd>

2
packages/tools/website/processDocsTestSamples/style.mdx
View File

@ -1 +1 @@
<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/WebExtensionScreenshot.png" style={{"maxWidth":"50%","border":"1px solid gray"}}/>
<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/WebExtensionScreenshot.png" style={{"maxWidth":"50%","border":"1px solid gray"}} />

2
packages/tools/website/processDocsTestSamples/table.mdx
View File

@ -3,7 +3,7 @@
| Content Cell A1 | Content Cell A2 |
| Content Cell A2 | Content Cell B2 |
<img src="https://test"/>
<img src="https://test" />
| Header |
| ----- |