Skip to content

TagSpaces is an offline, open source, document manager with tagging support

Merge remote-tracking branch 'origin/develop' into Migrate-to-a-newer-react-electron-boilerplate

sytolk5f5b78f7cab3
diff --cc .gitignore
index 59da1b5e8,469f643da..fdc66c532
--- a/.gitignore
+++ b/.gitignore
@@@ -126,4 -124,4 +126,5 @@@ playwright-report/
deploy.sh
docker/*.zip
+app/version.json
+ tx
diff --cc package.json
index df404f667,e31e69833..c0332f820
--- a/package.json
+++ b/package.json
@@@ -139,10 -129,10 +139,10 @@@
"test-refresh-data": "rimraf tests/testdata-tmp && shx mkdir -p tests/testdata-tmp/file-structure && shx cp -rL tests/testdata/file-structure tests/testdata-tmp && npx playwright install --with-deps",
"test-unit": "npx playwright test --config ./playwright.unit.js",
"test-watch": "npm run test --watch",
- "third-party": "npx generate-license-file --input package.json --output app/third-party.txt --overwrite",
+ "third-party": "npx generate-license-file --input package.json --output src/renderer/third-party.txt --overwrite",
"type-check": "tsc --noEmit",
- "update-changelog": "git log v5.4.6..HEAD --no-merges --format=%B > CHANGELOG.TXT",
- "update-changelog-pro": "cd extensions/tagspacespro && git log v5.4.6..HEAD --no-merges --format=%B > ../../CHANGELOG-PRO.TXT",
+ "update-changelog": "git log v5.5.2..HEAD --no-merges --format=%B > CHANGELOG.TXT",
+ "update-changelog-pro": "cd extensions/tagspacespro && git log v5.5.2..HEAD --no-merges --format=%B > ../../CHANGELOG-PRO.TXT",
"update-i18n": "./tx pull -a -f",
"version-meta": "node scripts/versionmeta.js",
"linux-fix-sandbox": "sudo chown root:root node_modules/electron/dist/chrome-sandbox && sudo chmod 4755 node_modules/electron/dist/chrome-sandbox",