mirror of https://github.com/laurent22/joplin.git
Laurent Cozic
parent
add69aa210
commit
94a800aa3c
|
|
@ -28,13 +28,17 @@ matrix:
|
|||
before_install:
|
||||
# HOMEBREW_NO_AUTO_UPDATE needed so that Homebrew doesn't upgrade to the next
|
||||
# version, which requires Ruby 2.3, which is not available on the Travis VM.
|
||||
|
||||
# Silence apt-get update errors (for example when a module doesn't exist) since
|
||||
# otherwise it will make the whole build fails, even though all we need is yarn.
|
||||
- |
|
||||
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
|
||||
HOMEBREW_NO_AUTO_UPDATE=1 brew install yarn
|
||||
else
|
||||
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
|
||||
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
|
||||
sudo apt-get update && sudo apt-get install yarn
|
||||
sudo apt-get update || true
|
||||
sudo apt-get install -y yarn
|
||||
fi
|
||||
|
||||
script:
|
||||
|
|
|
|||
|
|
@ -544,6 +544,9 @@ msgstr ""
|
|||
msgid "Separate each tag by a comma."
|
||||
msgstr ""
|
||||
|
||||
msgid "Rename notebook:"
|
||||
msgstr ""
|
||||
|
||||
msgid "Layout"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -584,6 +587,9 @@ msgstr ""
|
|||
msgid "Remove this tag from all the notes?"
|
||||
msgstr ""
|
||||
|
||||
msgid "Rename"
|
||||
msgstr ""
|
||||
|
||||
msgid "Notebooks"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -603,6 +603,10 @@ msgstr "Modifier les étiquettes"
|
|||
msgid "Separate each tag by a comma."
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy
|
||||
msgid "Rename notebook:"
|
||||
msgstr "Nouveau carnet"
|
||||
|
||||
msgid "Layout"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -649,6 +653,9 @@ msgstr "Supprimer le carnet ?"
|
|||
msgid "Remove this tag from all the notes?"
|
||||
msgstr ""
|
||||
|
||||
msgid "Rename"
|
||||
msgstr ""
|
||||
|
||||
#, fuzzy
|
||||
msgid "Notebooks"
|
||||
msgstr "Nouveau carnet"
|
||||
|
|
|
|||
|
|
@ -544,6 +544,9 @@ msgstr ""
|
|||
msgid "Separate each tag by a comma."
|
||||
msgstr ""
|
||||
|
||||
msgid "Rename notebook:"
|
||||
msgstr ""
|
||||
|
||||
msgid "Layout"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -584,6 +587,9 @@ msgstr ""
|
|||
msgid "Remove this tag from all the notes?"
|
||||
msgstr ""
|
||||
|
||||
msgid "Rename"
|
||||
msgstr ""
|
||||
|
||||
msgid "Notebooks"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "joplin",
|
||||
"version": "0.10.68",
|
||||
"version": "0.10.69",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
],
|
||||
"owner": "Laurent Cozic"
|
||||
},
|
||||
"version": "0.10.68",
|
||||
"version": "0.10.69",
|
||||
"bin": {
|
||||
"joplin": "./main.js"
|
||||
},
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "Joplin",
|
||||
"version": "0.10.17",
|
||||
"version": "0.10.18",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
|
@ -10,14 +10,22 @@
|
|||
"integrity": "sha512-+rr4OgeTNrLuJAf09o3USdttEYiXvZshWMkhD6wR9v1ieXH0JM1Q2yT41/cJuJcqiPpSXlM/g3aR+Y5MWQdr0Q==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"7zip-bin-mac": "1.0.1"
|
||||
"7zip-bin-win": "2.1.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"7zip-bin-win": {
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/7zip-bin-win/-/7zip-bin-win-2.1.1.tgz",
|
||||
"integrity": "sha512-6VGEW7PXGroTsoI2QW3b0ea95HJmbVBHvfANKLLMzSzFA1zKqVX5ybNuhmeGpf6vA0x8FJTt6twpprDANsY5WQ==",
|
||||
"dev": true,
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"7zip-bin-mac": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/7zip-bin-mac/-/7zip-bin-mac-1.0.1.tgz",
|
||||
"integrity": "sha1-Pmh3i78JJq3GgVlCcHRQXUdVXAI=",
|
||||
"optional": true
|
||||
"7zip-bin-win": {
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/7zip-bin-win/-/7zip-bin-win-2.1.1.tgz",
|
||||
"integrity": "sha512-6VGEW7PXGroTsoI2QW3b0ea95HJmbVBHvfANKLLMzSzFA1zKqVX5ybNuhmeGpf6vA0x8FJTt6twpprDANsY5WQ=="
|
||||
},
|
||||
"@types/node": {
|
||||
"version": "7.0.46",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "Joplin",
|
||||
"version": "0.10.17",
|
||||
"version": "0.10.18",
|
||||
"description": "Joplin for Desktop",
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
"optionalDependencies": {
|
||||
"7zip-bin-mac": "^1.0.1",
|
||||
"7zip-bin-linux": "^1.0.1",
|
||||
"7zip-bin-win": "^1.0.1"
|
||||
"7zip-bin-win": "^2.1.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"app-module-path": "^2.2.0",
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ APP_DIR="$ROOT_DIR/app"
|
|||
cd "$APP_DIR"
|
||||
VERSION="$(npm version patch)"
|
||||
git add -A
|
||||
git commit -m "Version $VERSION"
|
||||
git commit -m "Electron release $VERSION"
|
||||
git tag $VERSION
|
||||
git push && git push --tags
|
||||
git push && git push --tags
|
||||
|
||||
echo "Open https://github.com/laurent22/joplin/tags and create a draft release for tag $VERSION"
|
||||
|
|
@ -90,8 +90,8 @@ android {
|
|||
applicationId "net.cozic.joplin"
|
||||
minSdkVersion 16
|
||||
targetSdkVersion 22
|
||||
versionCode 55
|
||||
versionName "0.9.42"
|
||||
versionCode 56
|
||||
versionName "0.9.43"
|
||||
ndk {
|
||||
abiFilters "armeabi-v7a", "x86"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue