self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-24 08:12:24 +02:00
Code Issues Releases Activity

Setup new release 2.6

Browse Source
This commit is contained in:
Laurent Cozic 2021-11-02 20:07:13 +00:00
parent 66e79ccb23
commit bcd568a496
15 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@
], ],
"owner": "Laurent Cozic" "owner": "Laurent Cozic"
}, },
"version": "2.5.0", "version": "2.6.0",
"bin": { "bin": {
"joplin": "./main.js" "joplin": "./main.js"
}, },
@ -41,8 +41,8 @@
"node": ">=10.0.0" "node": ">=10.0.0"
}, },
"dependencies": { "dependencies": {
"@joplin/lib": "~2.5", "@joplin/lib": "~2.6",
"@joplin/renderer": "~2.5", "@joplin/renderer": "~2.6",
"aws-sdk": "^2.588.0", "aws-sdk": "^2.588.0",
"chalk": "^4.1.0", "chalk": "^4.1.0",
"compare-version": "^0.1.2", "compare-version": "^0.1.2",
@ -68,7 +68,7 @@
"yargs-parser": "^7.0.0" "yargs-parser": "^7.0.0"
}, },
"devDependencies": { "devDependencies": {
"@joplin/tools": "~2.5", "@joplin/tools": "~2.6",
"@types/fs-extra": "^9.0.6", "@types/fs-extra": "^9.0.6",
"@types/jest": "^26.0.15", "@types/jest": "^26.0.15",
"@types/node": "^14.14.6", "@types/node": "^14.14.6",

2
packages/app-clipper/manifest.json
View File

@ -1,7 +1,7 @@
{ {
"manifest_version": 2, "manifest_version": 2,
"name": "Joplin Web Clipper [DEV]", "name": "Joplin Web Clipper [DEV]",
"version": "2.5.0", "version": "2.6.0",
"description": "Capture and save web pages and screenshots from your browser to Joplin.", "description": "Capture and save web pages and screenshots from your browser to Joplin.",
"homepage_url": "https://joplinapp.org", "homepage_url": "https://joplinapp.org",
"content_security_policy": "script-src 'self'; object-src 'self'", "content_security_policy": "script-src 'self'; object-src 'self'",

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

@ -1,12 +1,12 @@
{ {
"name": "@joplin/app-desktop", "name": "@joplin/app-desktop",
"version": "2.5.10", "version": "2.6.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@joplin/app-desktop", "name": "@joplin/app-desktop",
"version": "2.5.10", "version": "2.6.0",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@electron/remote": "^2.0.1", "@electron/remote": "^2.0.1",

8
packages/app-desktop/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/app-desktop", "name": "@joplin/app-desktop",
"version": "2.5.10", "version": "2.6.0",
"description": "Joplin for Desktop", "description": "Joplin for Desktop",
"main": "main.js", "main": "main.js",
"private": true, "private": true,
@ -105,7 +105,7 @@
}, },
"homepage": "https://github.com/laurent22/joplin#readme", "homepage": "https://github.com/laurent22/joplin#readme",
"devDependencies": { "devDependencies": {
"@joplin/tools": "~2.5", "@joplin/tools": "~2.6",
"@testing-library/react-hooks": "^3.4.2", "@testing-library/react-hooks": "^3.4.2",
"@types/jest": "^26.0.15", "@types/jest": "^26.0.15",
"@types/node": "^14.14.6", "@types/node": "^14.14.6",
@ -136,8 +136,8 @@
"dependencies": { "dependencies": {
"@electron/remote": "^2.0.1", "@electron/remote": "^2.0.1",
"@fortawesome/fontawesome-free": "^5.13.0", "@fortawesome/fontawesome-free": "^5.13.0",
"@joplin/lib": "~2.5", "@joplin/lib": "~2.6",
"@joplin/renderer": "~2.5", "@joplin/renderer": "~2.6",
"async-mutex": "^0.1.3", "async-mutex": "^0.1.3",
"codemirror": "^5.56.0", "codemirror": "^5.56.0",
"color": "^3.1.2", "color": "^3.1.2",

2
packages/app-mobile/android/app/build.gradle
View File

@ -147,7 +147,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 2097656 versionCode 2097656
versionName "2.5.5" versionName "2.6.0"
ndk { ndk {
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
} }

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

@ -498,7 +498,7 @@
INFOPLIST_FILE = Joplin/Info.plist; INFOPLIST_FILE = Joplin/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0; IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 12.5.0; MARKETING_VERSION = 12.6.0;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
@ -526,7 +526,7 @@
INFOPLIST_FILE = Joplin/Info.plist; INFOPLIST_FILE = Joplin/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0; IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 12.5.0; MARKETING_VERSION = 12.6.0;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
@ -674,7 +674,7 @@
INFOPLIST_FILE = ShareExtension/Info.plist; INFOPLIST_FILE = ShareExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0; IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 12.5.0; MARKETING_VERSION = 12.6.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension; PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
@ -705,7 +705,7 @@
INFOPLIST_FILE = ShareExtension/Info.plist; INFOPLIST_FILE = ShareExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0; IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 12.5.0; MARKETING_VERSION = 12.6.0;
MTL_FAST_MATH = YES; MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension; PRODUCT_BUNDLE_IDENTIFIER = net.cozic.joplin.ShareExtension;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";

2
packages/generator-joplin/generators/app/templates/src/manifest.json
View File

@ -1,7 +1,7 @@
{ {
"manifest_version": 1, "manifest_version": 1,
"id": "<%= pluginId %>", "id": "<%= pluginId %>",
"app_min_version": "2.5", "app_min_version": "2.6",
"version": "1.0.0", "version": "1.0.0",
"name": "<%= pluginName %>", "name": "<%= pluginName %>",
"description": "<%= pluginDescription %>", "description": "<%= pluginDescription %>",

2
packages/generator-joplin/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "generator-joplin", "name": "generator-joplin",
"version": "2.5.0", "version": "2.6.0",
"description": "Scaffolds out a new Joplin plugin", "description": "Scaffolds out a new Joplin plugin",
"homepage": "https://github.com/laurent22/joplin/tree/dev/packages/generator-joplin", "homepage": "https://github.com/laurent22/joplin/tree/dev/packages/generator-joplin",
"author": { "author": {

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

@ -1,12 +1,12 @@
{ {
"name": "@joplin/lib", "name": "@joplin/lib",
"version": "2.5.0", "version": "2.6.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@joplin/lib", "name": "@joplin/lib",
"version": "2.5.0", "version": "2.6.0",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"async-mutex": "^0.1.3", "async-mutex": "^0.1.3",

4
packages/lib/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/lib", "name": "@joplin/lib",
"version": "2.5.0", "version": "2.6.0",
"description": "Joplin Core library", "description": "Joplin Core library",
"author": "Laurent Cozic", "author": "Laurent Cozic",
"homepage": "", "homepage": "",
@ -30,7 +30,7 @@
"dependencies": { "dependencies": {
"@joplin/fork-htmlparser2": "^4.1.36", "@joplin/fork-htmlparser2": "^4.1.36",
"@joplin/fork-sax": "^1.2.40", "@joplin/fork-sax": "^1.2.40",
"@joplin/renderer": "~2.5", "@joplin/renderer": "~2.6",
"@joplin/turndown": "^4.0.58", "@joplin/turndown": "^4.0.58",
"@joplin/turndown-plugin-gfm": "^1.0.40", "@joplin/turndown-plugin-gfm": "^1.0.40",
"async-mutex": "^0.1.3", "async-mutex": "^0.1.3",

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

@ -1,6 +1,6 @@
{ {
"name": "@joplin/plugin-repo-cli", "name": "@joplin/plugin-repo-cli",
"version": "2.5.0", "version": "2.6.0",
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"bin": { "bin": {
@ -19,8 +19,8 @@
"author": "", "author": "",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@joplin/lib": "~2.5", "@joplin/lib": "~2.6",
"@joplin/tools": "~2.5", "@joplin/tools": "~2.6",
"fs-extra": "^9.0.1", "fs-extra": "^9.0.1",
"gh-release-assets": "^2.0.0", "gh-release-assets": "^2.0.0",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",

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

@ -1,12 +1,12 @@
{ {
"name": "@joplin/renderer", "name": "@joplin/renderer",
"version": "2.5.0", "version": "2.6.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@joplin/renderer", "name": "@joplin/renderer",
"version": "2.5.0", "version": "2.6.0",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"font-awesome-filetypes": "^2.1.0", "font-awesome-filetypes": "^2.1.0",

2
packages/renderer/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/renderer", "name": "@joplin/renderer",
"version": "2.5.0", "version": "2.6.0",
"description": "The Joplin note renderer, used the mobile and desktop application", "description": "The Joplin note renderer, used the mobile and desktop application",
"repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer", "repository": "https://github.com/laurent22/joplin/tree/dev/packages/renderer",
"main": "index.js", "main": "index.js",

8
packages/server/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/server", "name": "@joplin/server",
"version": "2.5.10", "version": "2.6.0",
"private": true, "private": true,
"scripts": { "scripts": {
"start-dev": "npm run build && nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/app.js --env dev", "start-dev": "npm run build && nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/app.js --env dev",
@ -22,8 +22,8 @@
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^5.15.1", "@fortawesome/fontawesome-free": "^5.15.1",
"@joplin/lib": "~2.5", "@joplin/lib": "~2.6",
"@joplin/renderer": "~2.5", "@joplin/renderer": "~2.6",
"@koa/cors": "^3.1.0", "@koa/cors": "^3.1.0",
"@types/uuid": "^8.3.1", "@types/uuid": "^8.3.1",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
@ -56,7 +56,7 @@
"zxcvbn": "^4.4.2" "zxcvbn": "^4.4.2"
}, },
"devDependencies": { "devDependencies": {
"@joplin/tools": "~2.5", "@joplin/tools": "~2.6",
"@rmp135/sql-ts": "^1.7.0", "@rmp135/sql-ts": "^1.7.0",
"@types/fs-extra": "^8.0.0", "@types/fs-extra": "^8.0.0",
"@types/jest": "^26.0.15", "@types/jest": "^26.0.15",

6
packages/tools/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@joplin/tools", "name": "@joplin/tools",
"version": "2.5.0", "version": "2.6.0",
"description": "Various tools for Joplin", "description": "Various tools for Joplin",
"main": "index.js", "main": "index.js",
"author": "Laurent Cozic", "author": "Laurent Cozic",
@ -20,8 +20,8 @@
}, },
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@joplin/lib": "~2.5", "@joplin/lib": "~2.6",
"@joplin/renderer": "~2.5", "@joplin/renderer": "~2.6",
"execa": "^4.1.0", "execa": "^4.1.0",
"fs-extra": "^4.0.3", "fs-extra": "^4.0.3",
"gettext-parser": "^1.3.0", "gettext-parser": "^1.3.0",