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

Got Android version working again

Browse Source
This commit is contained in:
Laurent Cozic 2017-10-30 00:29:10 +00:00
parent 4ac86f52df
commit 5a7028bd11
10 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CliClient/locales/en_GB.po
View File

@ -15,10 +15,10 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
msgid "Give focus to next widget"
msgid "Give focus to next pane"
msgstr ""
msgid "Give focus to previous widget"
msgid "Give focus to previous pane"
msgstr ""
msgid "Enter command line mode"
@ -236,7 +236,9 @@ msgstr ""
msgid "Note has been saved."
msgstr ""
msgid "Exports Joplin data to the given target."
msgid ""
"Exports Joplin data to the given directory. By default, it will export the "
"complete database including notebooks, notes, tags and resources."
msgstr ""
msgid "Exports only the given note."
@ -260,6 +262,12 @@ msgstr ""
msgid "The possible commands are:"
msgstr ""
msgid ""
"In any command, a note or notebook can be refered to by title or ID, or "
"using the shortcuts `$n` or `$b` for, respectively, the currently selected "
"note or notebook. `$c` can be used to refer to the currently selected item."
msgstr ""
msgid "To move from one widget to another, press Tab or Shift+Tab."
msgstr ""

14
CliClient/locales/fr_FR.po
View File

@ -15,10 +15,10 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.3\n"
msgid "Give focus to next widget"
msgid "Give focus to next pane"
msgstr ""
msgid "Give focus to previous widget"
msgid "Give focus to previous pane"
msgstr ""
msgid "Enter command line mode"
@ -261,7 +261,9 @@ msgstr ""
msgid "Note has been saved."
msgstr "Aucun carnet n'est spécifié."
msgid "Exports Joplin data to the given target."
msgid ""
"Exports Joplin data to the given directory. By default, it will export the "
"complete database including notebooks, notes, tags and resources."
msgstr ""
#, fuzzy
@ -288,6 +290,12 @@ msgstr ""
msgid "The possible commands are:"
msgstr ""
msgid ""
"In any command, a note or notebook can be refered to by title or ID, or "
"using the shortcuts `$n` or `$b` for, respectively, the currently selected "
"note or notebook. `$c` can be used to refer to the currently selected item."
msgstr ""
msgid "To move from one widget to another, press Tab or Shift+Tab."
msgstr ""

14
CliClient/locales/joplin.pot
View File

@ -15,10 +15,10 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
msgid "Give focus to next widget"
msgid "Give focus to next pane"
msgstr ""
msgid "Give focus to previous widget"
msgid "Give focus to previous pane"
msgstr ""
msgid "Enter command line mode"
@ -236,7 +236,9 @@ msgstr ""
msgid "Note has been saved."
msgstr ""
msgid "Exports Joplin data to the given target."
msgid ""
"Exports Joplin data to the given directory. By default, it will export the "
"complete database including notebooks, notes, tags and resources."
msgstr ""
msgid "Exports only the given note."
@ -260,6 +262,12 @@ msgstr ""
msgid "The possible commands are:"
msgstr ""
msgid ""
"In any command, a note or notebook can be refered to by title or ID, or "
"using the shortcuts `$n` or `$b` for, respectively, the currently selected "
"note or notebook. `$c` can be used to refer to the currently selected item."
msgstr ""
msgid "To move from one widget to another, press Tab or Shift+Tab."
msgstr ""

2
CliClient/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "joplin",
"version": "0.10.60",
"version": "0.10.61",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
CliClient/package.json
View File

@ -18,7 +18,7 @@
],
"owner": "Laurent Cozic"
},
"version": "0.10.60",
"version": "0.10.61",
"bin": {
"joplin": "./main.js"
},

4
ReactNativeClient/android/app/build.gradle
View File

@ -90,8 +90,8 @@ android {
applicationId "net.cozic.joplin"
minSdkVersion 16
targetSdkVersion 22
versionCode 49
versionName "0.9.36"
versionCode 50
versionName "0.9.37"
ndk {
abiFilters "armeabi-v7a", "x86"
}

4
ReactNativeClient/lib/components/note-body-viewer.js
View File

@ -130,6 +130,10 @@ class NoteBodyViewer extends Component {
}
renderer.image = (href, title, text) => {
if (!Resource.isResourceUrl(href)) {
return '<span>' + href + '</span><img title="' + htmlentities(title) + '" src="' + href + '"/>';
}
const resourceId = Resource.urlToId(href);
if (!this.state.resources[resourceId]) {
this.loadResource(resourceId);

2
ReactNativeClient/lib/components/note-list.js
View File

@ -50,7 +50,7 @@ class NoteListComponent extends Component {
}
filterNotes(notes) {
const todoFilter = Setting.value('todoFilter');
const todoFilter = 'all'; //Setting.value('todoFilter');
if (todoFilter == 'all') return notes;
const now = time.unixMs();

10
ReactNativeClient/lib/models/setting.js
View File

@ -21,6 +21,10 @@ class Setting extends BaseModel {
return output;
}
static keyExists(key) {
return key in this.metadata_;
}
static keys(publicOnly = false, appType = null) {
if (!this.keys_) {
this.keys_ = [];
@ -56,12 +60,14 @@ class Setting extends BaseModel {
this.cache_ = [];
// Old keys - can be removed later
const ignore = ['clientId', 'sync.onedrive.auth', 'syncInterval', 'todoOnTop', 'todosOnTop'];
//const ignore = ['clientId', 'sync.onedrive.auth', 'syncInterval', 'todoOnTop', 'todosOnTop', 'todoFilter'];
for (let i = 0; i < rows.length; i++) {
let c = rows[i];
if (ignore.indexOf(c.key) >= 0) continue;
if (!this.keyExists(c.key)) continue;
//if (ignore.indexOf(c.key) >= 0) continue;
// console.info(c.key + ' = ' + c.value);

2
ReactNativeClient/lib/reducer.js
View File

@ -166,7 +166,7 @@ const reducer = (state = defaultState, action) => {
if (action.routeName == 'Welcome') navHistory = [];
reg.logger().info('Route: ' + currentRouteName + ' => ' + action.routeName);
//reg.logger().info('Route: ' + currentRouteName + ' => ' + action.routeName);
newState = Object.assign({}, state);