diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 5a33f420c9..edc00b3d20 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,4 +1,5 @@ # These are supported funding model platforms patreon: joplin +github: laurent22 custom: https://joplinapp.org/donate/ diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 0df67c731b..063d603479 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -12,6 +12,11 @@ labels: 'bug' Please test using the latest Joplin release to make sure your issue has not already been fixed. --> + + ## Environment Joplin version: diff --git a/Clipper/joplin-webclipper/manifest.json b/Clipper/joplin-webclipper/manifest.json index 5a56122af7..78b958ab6d 100644 --- a/Clipper/joplin-webclipper/manifest.json +++ b/Clipper/joplin-webclipper/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Joplin Web Clipper [DEV]", - "version": "1.0.17", + "version": "1.0.18", "description": "Capture and save web pages and screenshots from your browser to Joplin.", "homepage_url": "https://joplinapp.org", "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'", diff --git a/Tools/release-clipper.js b/Tools/release-clipper.js index 1a3d8e8aac..bc4ba0745b 100644 --- a/Tools/release-clipper.js +++ b/Tools/release-clipper.js @@ -37,7 +37,10 @@ async function main() { console.info('Building extension...'); process.chdir(clipperDir + '/popup'); - console.info(await execCommand('npm run build')); + // SKIP_PREFLIGHT_CHECK avoids the error "There might be a problem with the project dependency tree." due to eslint 5.12.0 being + // installed by CRA and 6.1.0 by us. It doesn't affect anything though, and the behaviour of the preflight + // check is buggy so we can ignore it. + console.info(await execCommand('SKIP_PREFLIGHT_CHECK=true npm run build')); const dists = [ {