self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-06 09:19:22 +02:00
Code Issues Releases Activity

All: Fixes #150: Extra comma causes crash

Browse Source
This commit is contained in:
Laurent Cozic
2018-01-09 19:45:08 +00:00
parent a8576a55d6
commit e9268edeff
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.md
View File

@@ -28,6 +28,8 @@ yarn dist
If there's an error `while loading shared libraries: libgconf-2.so.4: cannot open shared object file: No such file or directory`, run `sudo apt-get install libgconf-2-4` If there's an error `while loading shared libraries: libgconf-2.so.4: cannot open shared object file: No such file or directory`, run `sudo apt-get install libgconf-2-4`
For node-gyp to work, you might need to install the `windows-build-tools` using `npm install --global windows-build-tools`.
That will create the executable file in the `dist` directory. That will create the executable file in the `dist` directory.
From `/ElectronClient` you can also run `run.sh` to run the app for testing. From `/ElectronClient` you can also run `run.sh` to run the app for testing.

8
CliClient/publish.sh
View File

@@ -9,4 +9,10 @@ bash $SCRIPT_DIR/build.sh
cp "$SCRIPT_DIR/package.json" build/ cp "$SCRIPT_DIR/package.json" build/
cp "$SCRIPT_DIR/../README.md" build/ cp "$SCRIPT_DIR/../README.md" build/
cd "$SCRIPT_DIR/build" cd "$SCRIPT_DIR/build"
npm publish npm publish
NEW_VERSION=$("cat package.json | jq -r .version")
git add -A
git commit -m "CLI v$NEW_VERSION"
git tag "cli-v$NEW_VERSION"
git push && git push --tags

2
ReactNativeClient/lib/models/BaseItem.js
View File

@@ -611,7 +611,7 @@ class BaseItem extends BaseModel {
SELECT id SELECT id
FROM %s FROM %s
WHERE encryption_applied = 0`, WHERE encryption_applied = 0`,
this.db().escapeField(ItemClass.tableName()), this.db().escapeField(ItemClass.tableName())
); );
const items = await ItemClass.modelSelectAll(sql); const items = await ItemClass.modelSelectAll(sql);