self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-26 18:58:21 +02:00
Code Issues Releases Activity

Merge branch 'release-2.4' into dev

Browse Source
This commit is contained in:
Laurent Cozic 2021-09-29 16:29:38 +01:00
commit ff7f487ed0
23 changed files with 66 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/app-cli/package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "joplin",
"version": "2.3.2",
"version": "2.4.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "joplin",
"version": "2.3.2",
"version": "2.4.1",
"license": "MIT",
"dependencies": {
"aws-sdk": "^2.588.0",

2
packages/app-cli/package.json
View File

@ -33,7 +33,7 @@
],
"owner": "Laurent Cozic"
},
"version": "2.4.0",
"version": "2.4.1",
"bin": {
"joplin": "./main.js"
},

16
packages/app-mobile/ios/Joplin.xcodeproj/project.pbxproj
View File

@ -486,13 +486,13 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
CURRENT_PROJECT_VERSION = 72;
CURRENT_PROJECT_VERSION = 73;
DEVELOPMENT_TEAM = A9BXAFS6CT;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Joplin/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 12.4.0;
MARKETING_VERSION = 12.4.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
@ -514,12 +514,12 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Joplin/Joplin.entitlements;
CURRENT_PROJECT_VERSION = 72;
CURRENT_PROJECT_VERSION = 73;
DEVELOPMENT_TEAM = A9BXAFS6CT;
INFOPLIST_FILE = Joplin/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 12.4.0;
MARKETING_VERSION = 12.4.1;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
@ -659,14 +659,14 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 72;
CURRENT_PROJECT_VERSION = 73;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = A9BXAFS6CT;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = ShareExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 12.4.0;
MARKETING_VERSION = 12.4.1;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
@ -690,14 +690,14 @@
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 72;
CURRENT_PROJECT_VERSION = 73;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = A9BXAFS6CT;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = ShareExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 12.4.0;
MARKETING_VERSION = 12.4.1;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
PRODUCT_NAME = "$(TARGET_NAME)";

2
packages/app-mobile/ios/Podfile.lock
View File

@ -488,7 +488,7 @@ SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
FBReactNativeSpec: d2f54de51f69366bd1f5c1fb9270698dce678f8d
FBReactNativeSpec: 6da2c8ff1ebe6b6cf4510fcca58c24c4d02b16fc
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
JoplinCommonShareExtension: 270b4f8eb4e22828eeda433a04ed689fc1fd09b5
JoplinRNShareExtension: 7137e9787374e1b0797ecbef9103d1588d90e403

2
packages/fork-htmlparser2/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/fork-htmlparser2",
"version": "4.1.34",
"version": "4.1.36",
"lockfileVersion": 2,
"requires": true,
"packages": {

4
packages/fork-htmlparser2/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@joplin/fork-htmlparser2",
"description": "Fast & forgiving HTML/XML/RSS parser",
"version": "4.1.34",
"version": "4.1.36",
"author": "Felix Boehm <me@feedic.com>",
"publishConfig": {
"access": "public"
@ -65,5 +65,5 @@
"prettier": {
"tabWidth": 4
},
"gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2"
"gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14"
}

2
packages/fork-sax/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/fork-sax",
"version": "1.2.38",
"version": "1.2.40",
"lockfileVersion": 2,
"requires": true,
"packages": {

4
packages/fork-sax/package.json
View File

@ -2,7 +2,7 @@
"name": "@joplin/fork-sax",
"description": "An evented streaming XML parser in JavaScript",
"author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
"version": "1.2.38",
"version": "1.2.40",
"main": "lib/sax.js",
"publishConfig": {
"access": "public"
@ -18,5 +18,5 @@
"standard": "^8.6.0",
"tap": "^10.5.1"
},
"gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2"
"gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14"
}

2
packages/htmlpack/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/htmlpack",
"version": "1.0.0",
"version": "1.0.1",
"lockfileVersion": 2,
"requires": true,
"packages": {

8
packages/htmlpack/package.json
View File

@ -1,8 +1,9 @@
{
"name": "@joplin/htmlpack",
"version": "1.0.0",
"version": "1.0.1",
"description": "Pack an HTML file and all its linked resources into a single HTML file",
"main": "dist/index.js",
"private": true,
"scripts": {
"tsc": "tsc --project tsconfig.json",
"watch": "tsc --watch --project tsconfig.json"
@ -10,7 +11,7 @@
"author": "Laurent Czoic",
"license": "MIT",
"dependencies": {
"@joplin/fork-htmlparser2": "^4.1.34",
"@joplin/fork-htmlparser2": "^4.1.35",
"css": "^3.0.0",
"datauri": "^4.1.0",
"fs-extra": "^10.0.0",
@ -18,5 +19,6 @@
},
"devDependencies": {
"@types/fs-extra": "^9.0.6"
}
},
"gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14"
}

2
packages/lib/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/lib",
"version": "2.4.1",
"version": "2.4.3",
"lockfileVersion": 2,
"requires": true,
"packages": {

14
packages/lib/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/lib",
"version": "2.4.1",
"version": "2.4.3",
"description": "Joplin Core library",
"author": "Laurent Cozic",
"homepage": "",
@ -26,11 +26,11 @@
"typescript": "^4.0.5"
},
"dependencies": {
"@joplin/fork-htmlparser2": "^4.1.34",
"@joplin/fork-sax": "^1.2.38",
"@joplin/renderer": "^2.4.1",
"@joplin/turndown": "^4.0.56",
"@joplin/turndown-plugin-gfm": "^1.0.38",
"@joplin/fork-htmlparser2": "^4.1.36",
"@joplin/fork-sax": "^1.2.40",
"@joplin/renderer": "^2.4.3",
"@joplin/turndown": "^4.0.58",
"@joplin/turndown-plugin-gfm": "^1.0.40",
"async-mutex": "^0.1.3",
"aws-sdk": "^2.588.0",
"base-64": "^0.1.0",
@ -85,5 +85,5 @@
"word-wrap": "^1.2.3",
"xml2js": "^0.4.19"
},
"gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2"
"gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14"
}

2
packages/plugin-repo-cli/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/plugin-repo-cli",
"version": "2.4.1",
"version": "2.4.3",
"lockfileVersion": 2,
"requires": true,
"packages": {

9
packages/plugin-repo-cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/plugin-repo-cli",
"version": "2.4.1",
"version": "2.4.3",
"description": "",
"main": "index.js",
"bin": {
@ -19,8 +19,8 @@
"author": "",
"license": "MIT",
"dependencies": {
"@joplin/lib": "^2.4.1",
"@joplin/tools": "^2.4.1",
"@joplin/lib": "^2.4.3",
"@joplin/tools": "^2.4.3",
"fs-extra": "^9.0.1",
"gh-release-assets": "^2.0.0",
"node-fetch": "^2.6.1",
@ -32,5 +32,6 @@
"@types/node": "^14.14.6",
"jest": "^26.6.3",
"typescript": "^4.1.3"
}
},
"gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14"
}

2
packages/renderer/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/renderer",
"version": "2.4.1",
"version": "2.4.3",
"lockfileVersion": 2,
"requires": true,
"packages": {

6
packages/renderer/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/renderer",
"version": "2.4.1",
"version": "2.4.3",
"description": "The Joplin note renderer, used the mobile and desktop application",
"repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer",
"main": "index.js",
@ -24,7 +24,7 @@
"typescript": "^4.0.5"
},
"dependencies": {
"@joplin/fork-htmlparser2": "^4.1.34",
"@joplin/fork-htmlparser2": "^4.1.36",
"font-awesome-filetypes": "^2.1.0",
"fs-extra": "^8.1.0",
"highlight.js": "^11.2.0",
@ -48,5 +48,5 @@
"mermaid": "^8.12.1",
"uslug": "git+https://github.com/laurent22/uslug.git#emoji-support"
},
"gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2"
"gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14"
}

2
packages/tools/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/tools",
"version": "2.4.1",
"version": "2.4.3",
"lockfileVersion": 2,
"requires": true,
"packages": {

12
packages/tools/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/tools",
"version": "2.4.1",
"version": "2.4.3",
"description": "Various tools for Joplin",
"main": "index.js",
"author": "Laurent Cozic",
@ -20,8 +20,8 @@
},
"license": "MIT",
"dependencies": {
"@joplin/lib": "^2.4.1",
"@joplin/renderer": "^2.4.1",
"@joplin/lib": "^2.4.3",
"@joplin/renderer": "^2.4.3",
"execa": "^4.1.0",
"fs-extra": "^4.0.3",
"gettext-parser": "^1.3.0",
@ -41,14 +41,14 @@
"devDependencies": {
"@rmp135/sql-ts": "^1.6.0",
"@types/fs-extra": "^9.0.6",
"@types/jest": "^26.0.15",
"@types/mustache": "^0.8.32",
"@types/node": "^14.14.6",
"@types/jest": "^26.0.15",
"jest": "^26.6.3",
"gulp": "^4.0.2",
"jest": "^26.6.3",
"sass": "^1.39.2",
"sqlite3": "^5.0.0",
"typescript": "^4.1.3"
},
"gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2"
"gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14"
}

2
packages/turndown-plugin-gfm/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/turndown-plugin-gfm",
"version": "1.0.38",
"version": "1.0.40",
"lockfileVersion": 2,
"requires": true,
"packages": {

4
packages/turndown-plugin-gfm/package.json
View File

@ -4,7 +4,7 @@
"publishConfig": {
"access": "public"
},
"version": "1.0.38",
"version": "1.0.40",
"author": "Dom Christie",
"main": "lib/turndown-plugin-gfm.cjs.js",
"devDependencies": {
@ -41,5 +41,5 @@
"build-test": "browserify test/turndown-plugin-gfm-test.js --outfile test/turndown-plugin-gfm-test.browser.js",
"prepare": "npm run build"
},
"gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2"
"gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14"
}

2
packages/turndown/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "@joplin/turndown",
"version": "4.0.56",
"version": "4.0.58",
"lockfileVersion": 2,
"requires": true,
"packages": {

4
packages/turndown/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@joplin/turndown",
"description": "A library that converts HTML to Markdown",
"version": "4.0.56",
"version": "4.0.58",
"author": "Dom Christie",
"main": "lib/turndown.cjs.js",
"publishConfig": {
@ -48,5 +48,5 @@
"build-test": "browserify test/turndown-test.js --outfile test/turndown-test.browser.js",
"prepare": "npm run build"
},
"gitHead": "80c0089d2c52aff608b2bea74389de5a7f12f2e2"
"gitHead": "eb4b0e64eab40a51b0895d3a40a9d8c3cb7b1b14"
}

11
readme/changelog_cli.md
View File

@ -1,5 +1,16 @@
# Joplin terminal app changelog
## [cli-v2.4.1](https://github.com/laurent22/joplin/releases/tag/cli-v2.4.1) - 2021-09-29T15:28:01Z
- New: Add a way to disable a master key (7faa58e)
- New: Add support for single master password, to simplify handling of multiple encryption keys (ce89ee5)
- New: Added "None" sync target to allow disabling synchronisation (f5f05e6)
- Improved: Allow importing certain corrupted ENEX files (f144dae)
- Improved: Improved sync locks so that they do not prevent upgrading a sync target (06ed58b)
- Fixed: Fixed file paths when exporting as HTML (#5325)
- Fixed: Misinterpreted search term after filter in quotation marks (#5445) (#5444 by [@JackGruber](https://github.com/JackGruber))
- Fixed: Setting note contents using "set" command does not update note timestamp (#5435)
## [cli-v2.3.2](https://github.com/laurent22/joplin/releases/tag/cli-v2.3.2) - 2021-08-16T09:38:40Z
- Improved: Improved E2EE usability by making its state a property of the sync target (#5276)