gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

markdown wiki reference on README

Browse Source
This commit is contained in:
azivner 2018-09-03 21:06:24 +02:00
parent 185fb4b787
commit bc669c7b81
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -21,6 +21,7 @@ See other pictures in [screenshot tour](https://github.com/zadam/trilium/wiki/Sc
* [Scripting](https://github.com/zadam/trilium/wiki/Scripts) - see [Advanced showcases](https://github.com/zadam/trilium/wiki/Advanced-showcases) * [Scripting](https://github.com/zadam/trilium/wiki/Scripts) - see [Advanced showcases](https://github.com/zadam/trilium/wiki/Advanced-showcases)
* Scales well in both usability and performance upwards of 100 000 notes * Scales well in both usability and performance upwards of 100 000 notes
* [Night theme](https://github.com/zadam/trilium/wiki/Themes) * [Night theme](https://github.com/zadam/trilium/wiki/Themes)
* [Markdown import & export](https://github.com/zadam/trilium/wiki/Markdown)
## Builds ## Builds

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "trilium", "name": "trilium",
"version": "0.20.2", "version": "0.21.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

3
src/public/javascripts/services/export.js
View File

@ -1,4 +1,5 @@
import treeService from './tree.js'; import treeService from './tree.js';
import infoService from './info.js';
import protectedSessionHolder from './protected_session_holder.js'; import protectedSessionHolder from './protected_session_holder.js';
import utils from './utils.js'; import utils from './utils.js';
import server from './server.js'; import server from './server.js';
@ -8,6 +9,8 @@ function exportSubtree(noteId, format) {
"?protectedSessionId=" + encodeURIComponent(protectedSessionHolder.getProtectedSessionId()); "?protectedSessionId=" + encodeURIComponent(protectedSessionHolder.getProtectedSessionId());
utils.download(url); utils.download(url);
infoService.showMessage("Export to file has been finished.");
} }
let importNoteId; let importNoteId;

4
src/routes/api/import.js
View File

@ -15,6 +15,10 @@ async function importToBranch(req) {
const parentNoteId = req.params.parentNoteId; const parentNoteId = req.params.parentNoteId;
const file = req.file; const file = req.file;
if (file) {
return [400, "No file has been uploaded"];
}
const parentNote = await repository.getNote(parentNoteId); const parentNote = await repository.getNote(parentNoteId);
if (!parentNote) { if (!parentNote) {