release 0.25.1-beta

bin/build-linux-ia32.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-BUILD_DIR=./dist/trilium-linux-ia32
-rm -rf $BUILD_DIR
-
-echo "Rebuilding binaries for linux-ia32"
-./node_modules/.bin/electron-rebuild --arch=ia32
-
-./node_modules/.bin/electron-packager . --out=dist --executable-name=trilium --platform=linux --arch=ia32 --overwrite
-
-mv "./dist/Trilium Notes-linux-ia32" $BUILD_DIR
-
-rm -r $BUILD_DIR/resources/app/bin/deps
-# removing software WebGL binaries because they are pretty huge and not necessary
-rm -r $BUILD_DIR/swiftshader
-
-echo "Packaging linux ia32 electron distribution..."
-VERSION=`jq -r ".version" package.json`
-7z a $BUILD_DIR-${VERSION}.7z $BUILD_DIR

bin/build-linux-x64.sh

@@ -11,6 +11,10 @@ echo "Rebuilding binaries for linux-x64"
 
 mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR
 
+rm -r "$BUILD_DIR/resources/app/node_modules/sqlite3/lib/binding/*"
+
+cp -r bin/deps/linux-x64/sqlite/electron* "$BUILD_DIR/resources/app/node_modules/sqlite3/lib/binding/"
+
 rm -r $BUILD_DIR/resources/app/bin/deps
 # removing software WebGL binaries because they are pretty huge and not necessary
 rm -r $BUILD_DIR/swiftshader

bin/build-mac-x64.sh

@@ -14,10 +14,10 @@ MAC_RES_DIR=$BUILD_DIR/Trilium\ Notes.app/Contents/Resources/app
 
 rm -r "$MAC_RES_DIR/node_modules/sqlite3/lib/binding/*"
 
-cp -r bin/deps/mac/sqlite/* "$MAC_RES_DIR/node_modules/sqlite3/lib/binding/"
-cp bin/deps/mac/image/cjpeg "$MAC_RES_DIR/node_modules/mozjpeg/vendor/"
-cp bin/deps/mac/image/pngquant "$MAC_RES_DIR/node_modules/pngquant-bin/vendor/"
-cp bin/deps/mac/image/gifsicle "$MAC_RES_DIR/node_modules/giflossy/vendor/"
+cp -r bin/deps/mac-x64/sqlite/* "$MAC_RES_DIR/node_modules/sqlite3/lib/binding/"
+cp bin/deps/mac-x64/image/cjpeg "$MAC_RES_DIR/node_modules/mozjpeg/vendor/"
+cp bin/deps/mac-x64/image/pngquant "$MAC_RES_DIR/node_modules/pngquant-bin/vendor/"
+cp bin/deps/mac-x64/image/gifsicle "$MAC_RES_DIR/node_modules/giflossy/vendor/"
 
 rm -r "$MAC_RES_DIR/bin/deps"
 

bin/build-server.sh

@@ -24,10 +24,14 @@ cp -r ../../config-sample.ini ./
 
 rm -r ./node_modules/electron*
 
+rm -r ./node_modules/sqlite3/lib/binding/*
+
+cp -r ../../bin/deps/linux-x64/sqlite/node* ./node_modules/sqlite3/lib/binding/
+
 printf "#/bin/sh\n./node/bin/node src/www" > trilium.sh
 chmod 755 trilium.sh
 
 cd ..
 
-VERSION=`jq -r ".version" package.json`
+VERSION=`jq -r ".version" ../../package.json`
 7z a trilium-linux-x64-server-${VERSION}.7z trilium-linux-x64-server

bin/build-win-x64.sh

@@ -11,10 +11,10 @@ echo "Copying required windows binaries"
 
 WIN_RES_DIR=$BUILD_DIR/resources/app
 
-cp -r bin/deps/win/sqlite/* $WIN_RES_DIR/node_modules/sqlite3/lib/binding/
-cp bin/deps/win/image/cjpeg.exe $WIN_RES_DIR/node_modules/mozjpeg/vendor/
-cp bin/deps/win/image/pngquant.exe $WIN_RES_DIR/node_modules/pngquant-bin/vendor/
-cp bin/deps/win/image/gifsicle.exe $WIN_RES_DIR/node_modules/giflossy/vendor/
+cp -r bin/deps/win-x64/sqlite/* $WIN_RES_DIR/node_modules/sqlite3/lib/binding/
+cp bin/deps/win-x64/image/cjpeg.exe $WIN_RES_DIR/node_modules/mozjpeg/vendor/
+cp bin/deps/win-x64/image/pngquant.exe $WIN_RES_DIR/node_modules/pngquant-bin/vendor/
+cp bin/deps/win-x64/image/gifsicle.exe $WIN_RES_DIR/node_modules/giflossy/vendor/
 
 rm -r $WIN_RES_DIR/bin/deps
 # removing software WebGL binaries because they are pretty huge and not necessary

bin/build.sh

@@ -8,11 +8,11 @@ echo "Deleting existing builds"
 
 rm -r dist/*
 
-bin/build-linux-ia32.sh
-
 bin/build-win-x64.sh
 
 bin/build-mac-x64.sh
 
 # building X64 linux as the last so electron-rebuild will prepare X64 binaries for local development
 bin/build-linux-x64.sh
+
+bin/build-server.sh

bin/release.sh

@@ -88,9 +88,7 @@ github-release upload \
     --name "$MAC_X64_BUILD" \
     --file "dist/$MAC_X64_BUILD"
 
-echo "Packaging server version"
-
-bin/build-server.sh $VERSION
+echo "Uploading linux x64 server build"
 
 github-release upload \
     --tag $TAG \

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "trilium",
-  "version": "0.24.5",
+  "version": "0.25.0-beta",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -2,7 +2,7 @@
   "name": "trilium",
   "productName": "Trilium Notes",
   "description": "Trilium Notes",
-  "version": "0.25.0-beta",
+  "version": "0.25.1-beta",
   "license": "AGPL-3.0-only",
   "main": "electron.js",
   "bin": {

src/public/javascripts/services/bootstrap.js

@@ -104,6 +104,21 @@ if (utils.isElectron()) {
     });
 }
 
+function exec(cmd) {
+    document.execCommand(cmd);
+
+    return false;
+}
+
+if (utils.isElectron() && utils.isMac()) {
+    utils.bindShortcut('ctrl+c', () => exec("copy"));
+    utils.bindShortcut('ctrl+v', () => exec('paste'));
+    utils.bindShortcut('ctrl+x', () => exec('cut'));
+    utils.bindShortcut('ctrl+a', () => exec('selectAll'));
+    utils.bindShortcut('ctrl+z', () => exec('undo'));
+    utils.bindShortcut('ctrl+y', () => exec('redo'));
+}
+
 $("#export-note-button").click(function () {
     if ($(this).hasClass("disabled")) {
         return;
@@ -118,4 +133,4 @@ entrypoints.registerEntrypoints();
 
 tooltip.setupTooltip();
 
-bundle.executeStartupBundles();
+bundle.executeStartupBundles();

src/public/javascripts/services/drag_and_drop.js

@@ -4,6 +4,7 @@ import treeChangesService from './branches.js';
 const dragAndDropSetup = {
     autoExpandMS: 600,
     dragStart: (node, data) => {
+        // don't allow dragging root node
         if (node.data.noteId === 'root') {
             return false;
         }
@@ -22,11 +23,7 @@ const dragAndDropSetup = {
         // Return false to cancel dragging of node.
         return true;
     },
-    dragEnter: (node, data) => {
-        // we don't allow moving root to any other location in the tree
-        // we allow it to be placed on the relation map though, that's handled in a different drop handler
-        return node.data.noteId === 'root';
-    }, // allow drop on any node
+    dragEnter: (node, data) => true, // allow drop on any node
     dragDrop: (node, data) => {
         // This function MUST be defined to enable dropping of items on the tree.
         // data.hitMode is 'before', 'after', or 'over'.

src/public/javascripts/services/utils.js

@@ -46,6 +46,10 @@ function isElectron() {
     return window && window.process && window.process.type;
 }
 
+function isMac() {
+    return navigator.platform.indexOf('Mac') > -1;
+}
+
 function assertArguments() {
     for (const i in arguments) {
         if (!arguments[i]) {
@@ -150,6 +154,7 @@ export default {
     formatDateTime,
     now,
     isElectron,
+    isMac,
     assertArguments,
     isTopLevelNode,
     isRootNode,

src/public/stylesheets/style.css

@@ -107,7 +107,7 @@ body {
     (it kept growing with content) */
 #container:not(.distraction-free-mode) #note-detail-wrapper.protected {
     /* DON'T COLLAPSE THE RULES INTO SINGLE ONE, BACKGROUND WON'T DISPLAY */
-    background: url('/images/shield.svg') no-repeat;
+    background: url('../images/shield.svg') no-repeat;
     background-size: contain;
     background-position: center;
 }

src/routes/routes.js

@@ -169,7 +169,9 @@ function register(app) {
 
     apiRoute(GET, '/api/event-log', eventLogRoute.getEventLog);
 
-    apiRoute(PUT, '/api/recent-notes/:branchId/:notePath', recentNotesRoute.addRecentNote);
+    // * at the end means this will match params containing slash as well
+    // this is a problem with nginx (and possibly other proxies) which translate escaped slash back to the literal slash character
+    apiRoute(PUT, '/api/recent-notes/:branchId/:notePath*', recentNotesRoute.addRecentNote);
     apiRoute(GET, '/api/app-info', appInfoRoute.getAppInfo);
 
     route(GET, '/api/setup/status', [], setupApiRoute.getStatus, apiResultHandler);

src/services/build.js

@@ -1 +1 @@
-module.exports = { buildDate:"2018-12-02T00:30:07+01:00", buildRevision: "350cb52c07668f67c4d9c7700ceb9f91445a1acb" };
+module.exports = { buildDate:"2018-12-09T21:22:33+01:00", buildRevision: "492adc29092cbc6ff7a79ef4fec542e6da1769a8" };

src/views/index.ejs

@@ -201,7 +201,7 @@
       <% include dialogs/confirm.ejs %>
     </div>
 
-    <webview class="electron-in-page-search-window" nodeintegration disablewebsecurity src="/libraries/electron-in-page-search/search-window.html"></webview>
+    <webview class="electron-in-page-search-window" nodeintegration disablewebsecurity src="libraries/electron-in-page-search/search-window.html"></webview>
 
     <script type="text/javascript">
       window.baseApiUrl = 'api/';
@@ -216,29 +216,29 @@
     <!-- Required for correct loading of scripts in Electron -->
     <script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
 
-    <script src="/libraries/jquery.min.js"></script>
+    <script src="libraries/jquery.min.js"></script>
 
-    <link href="/libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <script src="/libraries/bootstrap/js/bootstrap.bundle.min.js"></script>
+    <link href="libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <script src="libraries/bootstrap/js/bootstrap.bundle.min.js"></script>
 
-    <script src="/libraries/bootstrap-notify.min.js"></script>
+    <script src="libraries/bootstrap-notify.min.js"></script>
 
     <!-- Include Fancytree skin and library -->
-    <link href="/libraries/fancytree/skin-win8/ui.fancytree.css" rel="stylesheet">
-    <script src="/libraries/fancytree/jquery.fancytree-all-deps.min.js"></script>
+    <link href="libraries/fancytree/skin-win8/ui.fancytree.css" rel="stylesheet">
+    <script src="libraries/fancytree/jquery.fancytree-all-deps.min.js"></script>
 
-    <script src="/libraries/jquery.hotkeys.js"></script>
-    <script src="/libraries/jquery.fancytree.hotkeys.js"></script>
+    <script src="libraries/jquery.hotkeys.js"></script>
+    <script src="libraries/jquery.fancytree.hotkeys.js"></script>
 
-    <script src="/libraries/knockout.min.js"></script>
+    <script src="libraries/knockout.min.js"></script>
 
-    <script src="/libraries/autocomplete.jquery.min.js"></script>
+    <script src="libraries/autocomplete.jquery.min.js"></script>
 
-    <link href="/stylesheets/style.css" rel="stylesheet">
+    <link href="stylesheets/style.css" rel="stylesheet">
 
-    <script src="/javascripts/services/bootstrap.js" crossorigin type="module"></script>
+    <script src="javascripts/services/bootstrap.js" crossorigin type="module"></script>
 
-    <link rel="stylesheet" type="text/css" href="/libraries/jam/css/jam.min.css">
+    <link rel="stylesheet" type="text/css" href="libraries/jam/css/jam.min.css">
 
     <script type="text/javascript">
       // we hide container initally because otherwise it is rendered first without CSS and then flickers into