mirror of
https://github.com/zadam/trilium.git
synced 2025-10-30 09:56:36 +01:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f43f0e10a1 | ||
|
|
6d842a65a2 | ||
|
|
50c4de021c | ||
|
|
936d8449f6 | ||
|
|
462bc0edd5 | ||
|
|
35ef3c8470 | ||
|
|
5117d43e29 |
@@ -47,7 +47,7 @@ bin/package.sh
|
||||
LINUX_X64_BUILD=trilium-linux-x64-$VERSION.7z
|
||||
LINUX_IA32_BUILD=trilium-linux-ia32-$VERSION.7z
|
||||
WINDOWS_X64_BUILD=trilium-windows-x64-$VERSION.7z
|
||||
SERVER_BUILD=trilium-linux-x64-server.elf
|
||||
SERVER_BUILD=trilium-linux-x64-server.7z
|
||||
|
||||
echo "Creating release in GitHub"
|
||||
|
||||
|
||||
@@ -12,13 +12,13 @@ create table attributes
|
||||
hash TEXT default "" not null);
|
||||
|
||||
create index IDX_attributes_name_value
|
||||
on labels (name, value);
|
||||
on attributes (name, value);
|
||||
|
||||
create index IDX_attributes_value
|
||||
on labels (value);
|
||||
on attributes (value);
|
||||
|
||||
create index IDX_attributes_noteId
|
||||
on labels (noteId);
|
||||
on attributes (noteId);
|
||||
|
||||
INSERT INTO attributes (attributeId, noteId, type, name, value, position, dateCreated, dateModified, isDeleted, hash)
|
||||
SELECT labelId, noteId, 'label', name, value, position, dateCreated, dateModified, isDeleted, hash FROM labels;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "trilium",
|
||||
"description": "Trilium Notes",
|
||||
"version": "0.19.0",
|
||||
"version": "0.19.1",
|
||||
"license": "AGPL-3.0-only",
|
||||
"main": "electron.js",
|
||||
"bin": {
|
||||
|
||||
@@ -15,7 +15,7 @@ const $prefixFormGroup = $("#add-link-prefix-form-group");
|
||||
const $linkTypeDiv = $("#add-link-type-div");
|
||||
const $linkTypes = $("input[name='add-link-type']");
|
||||
const $linkTypeHtml = $linkTypes.filter('input[value="html"]');
|
||||
const $showRecentNotesButton = $("#add-link-show-recent-notes");
|
||||
const $showRecentNotesButton = $dialog.find(".show-recent-notes-button");
|
||||
|
||||
function setLinkType(linkType) {
|
||||
$linkTypes.each(function () {
|
||||
|
||||
@@ -5,7 +5,7 @@ import searchNotesService from '../services/search_notes.js';
|
||||
const $dialog = $("#jump-to-note-dialog");
|
||||
const $autoComplete = $("#jump-to-note-autocomplete");
|
||||
const $showInFullTextButton = $("#show-in-full-text-button");
|
||||
const $showRecentNotesButton = $("#jump-to-note-show-recent-notes");
|
||||
const $showRecentNotesButton = $dialog.find(".show-recent-notes-button");
|
||||
|
||||
async function showDialog() {
|
||||
glob.activeDialog = $dialog;
|
||||
|
||||
@@ -3,7 +3,7 @@ import noteDetailText from './note_detail_text.js';
|
||||
import treeUtils from './tree_utils.js';
|
||||
|
||||
function getNotePathFromLink(url) {
|
||||
const notePathMatch = /#([A-Za-z0-9/]+)$/.exec(url);
|
||||
const notePathMatch = /#root([A-Za-z0-9/]*)$/.exec(url);
|
||||
|
||||
if (notePathMatch === null) {
|
||||
return null;
|
||||
@@ -14,7 +14,7 @@ function getNotePathFromLink(url) {
|
||||
}
|
||||
|
||||
function getNotePathFromLabel(label) {
|
||||
const notePathMatch = / \(([A-Za-z0-9/]+)\)/.exec(label);
|
||||
const notePathMatch = / \(([#A-Za-z0-9/]+)\)/.exec(label);
|
||||
|
||||
if (notePathMatch !== null) {
|
||||
return notePathMatch[1];
|
||||
|
||||
@@ -176,7 +176,8 @@ function register(app) {
|
||||
apiRoute(POST, '/api/anonymization/anonymize', anonymizationRoute.anonymize);
|
||||
|
||||
apiRoute(POST, '/api/cleanup/cleanup-unused-images', cleanupRoute.cleanupUnusedImages);
|
||||
apiRoute(POST, '/api/cleanup/vacuum-database', cleanupRoute.vacuumDatabase);
|
||||
// VACUUM requires execution outside of transaction
|
||||
route(POST, '/api/cleanup/vacuum-database', [auth.checkApiAuthOrElectron], cleanupRoute.vacuumDatabase, apiResultHandler, false);
|
||||
|
||||
apiRoute(POST, '/api/script/exec', scriptRoute.exec);
|
||||
apiRoute(POST, '/api/script/run/:noteId', scriptRoute.run);
|
||||
|
||||
@@ -1 +1 @@
|
||||
module.exports = { buildDate:"2018-08-14T14:19:37+02:00", buildRevision: "fec157444787ad3dbe01a5052cb01e5374bdcb79" };
|
||||
module.exports = { buildDate:"2018-08-14T18:06:31+02:00", buildRevision: "6d842a65a2adec832edc82bba14c8616c53fe90b" };
|
||||
|
||||
@@ -236,7 +236,8 @@ const primaryKeys = {
|
||||
"images": "imageId",
|
||||
"note_images": "noteImageId",
|
||||
"api_tokens": "apiTokenId",
|
||||
"options": "name"
|
||||
"options": "name",
|
||||
"attributes": "attributeId"
|
||||
};
|
||||
|
||||
async function getEntityRow(entityName, entityId) {
|
||||
|
||||
@@ -286,6 +286,8 @@
|
||||
|
||||
<div class="input-group">
|
||||
<input id="note-autocomplete" class="form-control" placeholder="search for note by its name" style="width: 100%;">
|
||||
|
||||
<span class="input-group-addon show-recent-notes-button" title="Show recent notes"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -309,7 +311,7 @@
|
||||
<div class="input-group">
|
||||
<input id="jump-to-note-autocomplete" class="form-control" placeholder="search for note by its name" style="width: 100%;">
|
||||
|
||||
<span class="input-group-addon" id="jump-to-note-show-recent-notes" title="Show recent notes" style="background: url('/images/icons/clock-16.png') no-repeat center; cursor: pointer;"></span>
|
||||
<span class="input-group-addon show-recent-notes-button" title="Show recent notes"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user