release 0.58.4

# Conflicts:
#	src/services/import/enex.js

.github/FUNDING.yml

@@ -1,3 +1,4 @@
 # These are supported funding model platforms
 
 github: [zadam]
+custom: ["https://paypal.me/za4am"]

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,52 @@
+name: Bug Report
+description: Report a bug
+title: "(Bug report) "
+labels: "Type: Bug"
+body:
+- type: input
+  attributes:
+    label: Trilium Version
+    description: What version of Trilium are you using?
+    placeholder: 0.57.0-beta
+  validations:
+    required: true
+- type: dropdown
+  attributes:
+    label: What operating system are you using?
+    options:
+      - Windows
+      - macOS
+      - Ubuntu
+      - Other Linux
+      - Other (specify below)
+  validations:
+    required: true
+- type: dropdown
+  attributes:
+    label: What is your setup?
+    description: https://github.com/zadam/trilium/wiki#choose-the-setup
+    options:
+      - Local (no sync)
+      - Local + server sync
+      - Server access only
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Operating System Version
+    description: What operating system version are you using? On Windows, click Start button > Settings > System > About. On macOS, click the Apple Menu > About This Mac. On Linux, use lsb_release or uname -a.
+    placeholder: "e.g. Windows 10 version 1909, macOS Catalina 10.15.7, or Ubuntu 20.04"
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Description
+    description: A clear and concise description of the bug and any additional information.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Error logs
+    description: Please provide error logs, see [wiki page](https://github.com/zadam/trilium/wiki/Error-logs) for instructions on how to submit them.
+  validations:
+    required: false

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,15 @@
+name: Feature Request
+description: Ask for a new feature to be added
+title: "(Feature request) "
+labels: "Type: Enhancement"
+body:
+- type: textarea
+  attributes:
+    label: Describe feature
+    description: A clear and concise description of what you want to be added..
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Additional Information
+    description: If your problem needs further explanation, or if the issue you're seeing cannot be reproduced in a gist, please add more information here.

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '37 4 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/docker.yaml

@@ -0,0 +1,53 @@
+name: Publish Docker image
+on:
+  push:
+    tags: [v*]
+jobs:
+  push_to_registries:
+    name: Push Docker image to multiple registries
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            zadam/trilium
+            ghcr.io/zadam/trilium
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}-latest
+            type=match,pattern=(\d+.\d+).\d+\-beta,enable=${{ endsWith(github.ref, 'beta') }},group=1,suffix=-latest
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          install: true
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Log in to GitHub Docker Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create server-package.json
+        run: cat package.json | grep -v electron > server-package.json
+      - name: Build and Push
+        uses: docker/build-push-action@v2.7.0
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+          push: true
+          cache-from: type=registry,ref=zadam/trilium:buildcache
+          cache-to: type=registry,ref=zadam/trilium:buildcache,mode=max
+          tags: ${{ steps.meta.outputs.tags }}

.gitignore

@@ -9,3 +9,6 @@ config.ini
 cert.key
 cert.crt
 server-package.json
+.idea/httpRequests/
+data/
+tmp/

.gitpod.yml

@@ -2,7 +2,7 @@ image:
   file: .gitpod.dockerfile
 
 tasks:
-    - before: nvm install 10 && nvm use 10
+    - before: nvm install 16.19.0 && nvm use 16.19.0
       init: npm install
       command: npm run start-server
 

.idea/dataSources.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="document.db" uuid="4e69c96a-8a2b-43f5-9b40-d1608f75f7a4">
+    <data-source source="LOCAL" name="SQLite - document.db" uuid="30cef30d-e704-484d-a4ca-5d3bfc2ece63">
       <driver-ref>sqlite.xerial</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:$USER_HOME$/trilium-data/document.db</jdbc-url>
+      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/../trilium-data/document.db</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
     </data-source>
   </component>
 </project>

.idea/jsLibraryMappings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JavaScriptLibraryMappings">
-    <file url="PROJECT" libraries="{@types/jquery}" />
+    <includedPredefinedLibrary name="Node.js Core" />
   </component>
 </project>

.idea/misc.xml

@@ -3,7 +3,7 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_16" default="true" project-jdk-name="openjdk-16" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

.idea/sqldialects.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="SqlDialectMappings">
+    <file url="file://$PROJECT_DIR$" dialect="SQLite" />
     <file url="PROJECT" dialect="SQLite" />
   </component>
 </project>

.vscode/launch.json

@@ -9,7 +9,8 @@
                 "<node_internals>/**"
             ],
             "env": {
-                "TRILIUM_ENV": "dev"
+                "TRILIUM_ENV": "dev",
+                "TRILIUM_DATA_DIR": "./data"
             },
             "outputCapture": "std",
             "program": "${workspaceFolder}/src/www"

CODE_OF_CONDUCT

@@ -0,0 +1 @@
+Please treat each other with respect and understanding.

DockerHealthcheck.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Try connecting to /api/health-check using both http and https.
+# TODO: we should only be connecting with the actual protocol that is enabled
+# TODO: this assumes we use the default port 8080
+
+for proto in http https; do
+    if wget --spider -S "$proto://127.0.0.1:8080/api/health-check" 2>&1 | awk 'NR==2' | grep -w "HTTP/1.1 200 OK" ; then
+        exit 0
+    fi
+done
+
+exit 1

Dockerfile

@@ -1,8 +1,12 @@
-FROM node:12.19.0-alpine
+# !!! Don't try to build this Dockerfile directly, run it through bin/build-docker.sh script !!!
+FROM node:16.19.0-alpine
 
 # Create app directory
 WORKDIR /usr/src/app
 
+# Bundle app source
+COPY . .
+
 COPY server-package.json package.json
 
 # Install app dependencies
@@ -16,14 +20,23 @@ RUN set -x \
         make \
         nasm \
         libpng-dev \
-        python \
-    && npm install --production \
-    && apk del .build-dependencies
+        python3 \
+    && npm install \
+    && apk del .build-dependencies \
+    && npm run webpack \
+    && npm prune --omit=dev \
+    && cp src/public/app/share.js src/public/app-dist/. \
+    && cp -r src/public/app/doc_notes src/public/app-dist/. \
+    && rm -rf src/public/app
 
-# Bundle app source
-COPY . .
+# Some setup tools need to be kept
+RUN apk add --no-cache su-exec shadow
 
-USER node
+# Add application user and setup proper volume permissions
+RUN adduser -s /bin/false node; exit 0
 
+# Start the application
 EXPOSE 8080
-CMD [ "node", "./src/www" ]
+CMD [ "./start-docker.sh" ]
+
+HEALTHCHECK CMD sh DockerHealthcheck.sh

README-ZH_CN.md

@@ -1,41 +1,56 @@
-# Trilium注意事项
+# Trilium Notes
+
+[English](https://github.com/zadam/trilium/blob/master/README.md) | [Chinese](https://github.com/zadam/trilium/blob/master/README-ZH_CN.md) | [Russian](https://github.com/zadam/trilium/blob/master/README.ru.md)
 
 [![Join the chat at https://gitter.im/trilium-notes/Lobby](https://badges.gitter.im/trilium-notes/Lobby.svg)](https://gitter.im/trilium-notes/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-Trilium Notes是一个分层的笔记应用程序，专注于建立大型个人知识库。请参阅[屏幕截图](https://github.com/zadam/trilium/wiki/Screenshot-tour)以快速了解：
+Trilium Notes 是一个层次化的笔记应用程序，专注于建立大型个人知识库。请参阅[屏幕截图](https://github.com/zadam/trilium/wiki/Screenshot-tour)以快速了解：
 
 ![](https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png)
 
+Ukraine is currently suffering from Russian aggression, please consider donating to [one of these charities](https://old.reddit.com/r/ukraine/comments/s6g5un/want_to_support_ukraine_heres_a_list_of_charities/).
+
+<img src="https://upload.wikimedia.org/wikipedia/commons/4/49/Flag_of_Ukraine.svg" alt="drawing" width="600"/>
+
 ## 特性
 
 * 笔记可以排列成任意深的树。单个笔记可以放在树中的多个位置（请参阅[克隆](https://github.com/zadam/trilium/wiki/Cloning-notes)）
-* 丰富的所见即所得笔记编辑功能，包括带有markdown[自动格式化功能的](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)表格，图像和[数学](https://github.com/zadam/trilium/wiki/Text-notes#math-support)
+* 丰富的所见即所得笔记编辑功能，包括带有 Markdown [自动格式化功能的](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)表格，图像和[数学](https://github.com/zadam/trilium/wiki/Text-notes#math-support)
 * 支持编辑[使用源代码的笔记](https://github.com/zadam/trilium/wiki/Code-notes)，包括语法高亮显示
-* 笔记之间快速[导航](https://github.com/zadam/trilium/wiki/Note-navigation)，全文搜索和[笔记挂起](https://github.com/zadam/trilium/wiki/Note-hoisting)
+* 笔记之间快速[导航](https://github.com/zadam/trilium/wiki/Note-navigation)，全文搜索和[笔记聚焦](https://github.com/zadam/trilium/wiki/Note-hoisting)
 * 无缝[笔记版本控制](https://github.com/zadam/trilium/wiki/Note-revisions)
 * 笔记[属性](https://github.com/zadam/trilium/wiki/Attributes)可用于笔记组织，查询和高级[脚本编写](https://github.com/zadam/trilium/wiki/Scripts)
 * [同步](https://github.com/zadam/trilium/wiki/Synchronization)与自托管同步服务器
+  * 有一个[第三方提供的同步服务器托管服务](https://trilium.cc/paid-hosting)
+* 公开地[分享](https://github.com/zadam/trilium/wiki/Sharing)（发布）笔记到互联网
 * 具有按笔记粒度的强大的[笔记加密](https://github.com/zadam/trilium/wiki/Protected-notes)
+* 使用自带的 Excalidraw 来绘制图表（笔记类型“画布”）
 * [关系图](https://github.com/zadam/trilium/wiki/Relation-map)和[链接图](https://github.com/zadam/trilium/wiki/Link-map)，用于可视化笔记及其关系
-* [脚本](https://github.com/zadam/trilium/wiki/Scripts)-请参阅[高级展示](https://github.com/zadam/trilium/wiki/Advanced-showcases)
-* 可用性和性能均能很好地扩展至超过10万个笔记
-* 针对智能手机和平板电脑进行触摸优化的[移动前端](https://github.com/zadam/trilium/wiki/Mobile-frontend)
+* [脚本](https://github.com/zadam/trilium/wiki/Scripts) - 请参阅[高级功能展示](https://github.com/zadam/trilium/wiki/Advanced-showcases)
+* 在拥有超过 10 万条笔记时仍能保持良好的可用性和性能
+* 针对智能手机和平板电脑进行优化的[用于移动设备的前端](https://github.com/zadam/trilium/wiki/Mobile-frontend)
 * [夜间主题](https://github.com/zadam/trilium/wiki/Themes)
-* [Evernote](https://github.com/zadam/trilium/wiki/Evernote-import)和[Markdown导入导出](https://github.com/zadam/trilium/wiki/Markdown)
-* [Web Clipper](https://github.com/zadam/trilium/wiki/Web-clipper)可轻松保存Web内容
+* [Evernote](https://github.com/zadam/trilium/wiki/Evernote-import) 和 [Markdown 导入导出](https://github.com/zadam/trilium/wiki/Markdown)功能
+* 使用[网页剪藏](https://github.com/zadam/trilium/wiki/Web-clipper)轻松保存互联网上的内容
 
 ## 构建
 
-Trilium是作为桌面应用程序（Linux和Windows）或服务器上托管的Web应用程序（Linux）提供的。Mac OS桌面版本可用，但[不受支持](https://github.com/zadam/trilium/wiki/FAQ#mac-os-support)。
+Trilium 可以用作桌面应用程序（Linux 和 Windows）或服务器（Linux）上托管的 Web 应用程序。虽然有 macOS 版本的桌面应用程序，但它[不受支持](https://github.com/zadam/trilium/wiki/FAQ#mac-os-support)。
 
-* 如果要在桌面上使用Trilium，请从[最新版本](https://github.com/zadam/trilium/releases/latest)下载适用于您平台的二进制[版本](https://github.com/zadam/trilium/releases/latest)，解压缩该软件包并运行`trilium`可执行文件。
-* 如果要在服务器上安装Trilium，请遵循[此页面](https://github.com/zadam/trilium/wiki/Server-installation)。
-    * 当前仅支持（经过测试）最新的Chrome和Firefox浏览器。
+* 如果要在桌面上使用 Trilium，请从[最新版本](https://github.com/zadam/trilium/releases/latest)下载适用于您平台的二进制版本，解压缩该软件包并运行`trilium`可执行文件。
+* 如果要在服务器上安装 Trilium，请参考[此页面](https://github.com/zadam/trilium/wiki/Server-installation)。
+  * 当前仅支持（测试过）最近发布的 Chrome 和 Firefox 浏览器。
+
+Trilium 也提供 Flatpak：
+
+[<img width="240" src="https://flathub.org/assets/badges/flathub-badge-en.png">](https://flathub.org/apps/details/com.github.zadam.trilium)
 
 ## 文档
 
-[有关文档页面的完整列表，请参见Wiki。](https://github.com/zadam/trilium/wiki/)
+[有关文档页面的完整列表，请参见 Wiki。](https://github.com/zadam/trilium/wiki/)
 
-您还可以阅读[个人知识库模式](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base)，以获取有关如何使用Trilium的灵感。
+* [Wiki 的中文翻译版本](https://github.com/baddate/trilium/wiki/)
+
+您还可以阅读[个人知识库模式](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base)，以获取有关如何使用 Trilium 的灵感。
 
 ## 贡献
 
@@ -43,7 +58,7 @@ Trilium是作为桌面应用程序（Linux和Windows）或服务器上托管的W
 
 [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/zadam/trilium)
 
-或在本地克隆并运行
+或者克隆本仓库到本地，并运行
 
 ```
 npm install
@@ -52,7 +67,15 @@ npm run start-server
 
 ## 致谢
 
-* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - 市场上最好的所见即所得编辑器，互动性强且聆听能力强的团队
-* [FancyTree](https://github.com/mar10/fancytree) - 一个非常丰富的关于树的库，强大的没有对手。没有它，Trilium Notes将不会如此。
+* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - 市面上最好的所见即所得编辑器，拥有互动性强且聆听能力强的团队
+* [FancyTree](https://github.com/mar10/fancytree) - 一个非常丰富的关于树的库，强大到没有对手。没有它，Trilium Notes 将不会如此。
 * [CodeMirror](https://github.com/codemirror/CodeMirror) - 支持大量语言的代码编辑器
-* [jsPlumb](https://github.com/jsplumb/jsplumb)强大的可视化连接库。- 用于[关系图](https://github.com/zadam/trilium/wiki/Relation-map)和[链接图](https://github.com/zadam/trilium/wiki/Link-map)
+* [jsPlumb](https://github.com/jsplumb/jsplumb) - 强大的可视化连接库。用于[关系图](https://github.com/zadam/trilium/wiki/Relation-map)和[链接图](https://github.com/zadam/trilium/wiki/Link-map)
+
+## 捐赠
+
+你可以通过 GitHub Sponsors，[PayPal](https://paypal.me/za4am) 或者比特币 (bitcoin:bc1qv3svjn40v89mnkre5vyvs2xw6y8phaltl385d2) 来捐赠。
+
+## 许可证
+
+本程序是自由软件：你可以再发布本软件和/或修改本软件，只要你遵循 Free Software Foundation 发布的 GNU Affero General Public License 的第三版或者任何（由你选择）更晚的版本。

README.md

@@ -1,10 +1,16 @@
 # Trilium Notes
 
+[English](https://github.com/zadam/trilium/blob/master/README.md) | [Chinese](https://github.com/zadam/trilium/blob/master/README-ZH_CN.md) | [Russian](https://github.com/zadam/trilium/blob/master/README.ru.md)
+
 [![Join the chat at https://gitter.im/trilium-notes/Lobby](https://badges.gitter.im/trilium-notes/Lobby.svg)](https://gitter.im/trilium-notes/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases. See [screenshots](https://github.com/zadam/trilium/wiki/Screenshot-tour) for quick overview:
 
 ![](https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png)
 
+Ukraine is currently defending itself from Russian aggression, please consider [donating to Ukrainian Army or humanitarian charities](https://standforukraine.com/).
+
+<img src="https://upload.wikimedia.org/wikipedia/commons/4/49/Flag_of_Ukraine.svg" alt="drawing" width="600"/>
+
 ## Features
 
 * Notes can be arranged into arbitrarily deep tree. Single note can be placed into multiple places in the tree (see [cloning](https://github.com/zadam/trilium/wiki/Cloning-notes))
@@ -14,9 +20,13 @@ Trilium Notes is a hierarchical note taking application with focus on building l
 * Seamless [note versioning](https://github.com/zadam/trilium/wiki/Note-revisions)
 * Note [attributes](https://github.com/zadam/trilium/wiki/Attributes) can be used for note organization, querying and advanced [scripting](https://github.com/zadam/trilium/wiki/Scripts)
 * [Synchronization](https://github.com/zadam/trilium/wiki/Synchronization) with self-hosted sync server
+  * there's a [3rd party service for hosting synchronisation server](https://trilium.cc/paid-hosting)
+* [Sharing](https://github.com/zadam/trilium/wiki/Sharing) (publishing) notes to public internet
 * Strong [note encryption](https://github.com/zadam/trilium/wiki/Protected-notes) with per-note granularity
+* Sketching diagrams with built-in Excalidraw (note type "canvas")
 * [Relation maps](https://github.com/zadam/trilium/wiki/Relation-map) and [link maps](https://github.com/zadam/trilium/wiki/Link-map) for visualizing notes and their relations
 * [Scripting](https://github.com/zadam/trilium/wiki/Scripts) - see [Advanced showcases](https://github.com/zadam/trilium/wiki/Advanced-showcases)
+* [REST API](https://github.com/zadam/trilium/wiki/ETAPI) for automation
 * Scales well in both usability and performance upwards of 100 000 notes
 * Touch optimized [mobile frontend](https://github.com/zadam/trilium/wiki/Mobile-frontend) for smartphones and tablets
 * [Night theme](https://github.com/zadam/trilium/wiki/Themes)
@@ -31,6 +41,10 @@ Trilium is provided as either desktop application (Linux and Windows) or web app
 * If you want to install Trilium on server, follow [this page](https://github.com/zadam/trilium/wiki/Server-installation).
   * Currently only recent Chrome and Firefox are supported (tested) browsers.
 
+Trilium is also provided as a Flatpak:
+
+[<img width="240" src="https://flathub.org/assets/badges/flathub-badge-en.png">](https://flathub.org/apps/details/com.github.zadam.trilium)
+
 ## Documentation
 
 [See wiki for complete list of documentation pages.](https://github.com/zadam/trilium/wiki/)
@@ -56,6 +70,10 @@ npm run start-server
 * [CodeMirror](https://github.com/codemirror/CodeMirror) - code editor with support for huge amount of languages
 * [jsPlumb](https://github.com/jsplumb/jsplumb) - visual connectivity library without competition. Used in [relation maps](https://github.com/zadam/trilium/wiki/Relation-map) and [link maps](https://github.com/zadam/trilium/wiki/Link-map)
 
+## Donating
+
+You can donate using GitHub Sponsors, [PayPal](https://paypal.me/za4am) or Bitcoin (bitcoin:bc1qv3svjn40v89mnkre5vyvs2xw6y8phaltl385d2).
+
 ## License
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.

README.ru.md

@@ -0,0 +1,67 @@
+# Trilium Notes
+
+[English](https://github.com/zadam/trilium/blob/master/README.md) | [Chinese](https://github.com/zadam/trilium/blob/master/README-ZH_CN.md) | [Russian](https://github.com/zadam/trilium/blob/master/README.ru.md)
+
+[![Join the chat at https://gitter.im/trilium-notes/Lobby](https://badges.gitter.im/trilium-notes/Lobby.svg)](https://gitter.im/trilium-notes/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+Trilium Notes – это приложение для заметок с иерархической структурой, ориентированное на создание больших персональных баз знаний. Для быстрого ознакомления посмотрите [скриншот-тур](https://github.com/zadam/trilium/wiki/Screenshot-tour):
+
+![](https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png)
+
+Ukraine is currently suffering from Russian aggression, please consider donating to [one of these charities](https://old.reddit.com/r/ukraine/comments/s6g5un/want_to_support_ukraine_heres_a_list_of_charities/).
+
+<img src="https://upload.wikimedia.org/wikipedia/commons/4/49/Flag_of_Ukraine.svg" alt="drawing" width="600"/>
+
+## Возможности
+
+* Заметки можно расположить в виде дерева произвольной глубины. Отдельную заметку можно разместить в нескольких местах дерева (см. [клонирование](https://github.com/zadam/trilium/wiki/Cloning-notes))
+* Продвинутый визуальный редактор (WYSIWYG) позволяет работать с таблицами, изображениями, [формулами](https://github.com/zadam/trilium/wiki/Text-notes#math-support) и разметкой markdown, имеет [автоформатирование](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)
+* Редактирование [заметок с исходным кодом](https://github.com/zadam/trilium/wiki/Code-notes), включая подсветку синтаксиса
+* Быстрая и простая [навигация между заметками](https://github.com/zadam/trilium/wiki/Note-navigation), полнотекстовый поиск и [выделение заметок](https://github.com/zadam/trilium/wiki/Note-hoisting) в отдельный блок
+* Бесшовное [версионирование заметки](https://github.com/zadam/trilium/wiki/Note-revisions)
+* Специальные [атрибуты](https://github.com/zadam/trilium/wiki/Attributes) позволяют гибко организовать структуру, используются для поиска и продвинутого [скриптинга](https://github.com/zadam/trilium/wiki/Scripts)
+* [Синхронизация](https://github.com/zadam/trilium/wiki/Synchronization) заметок со своим сервером
+* Надёжное [шифрование](https://github.com/zadam/trilium/wiki/Protected-notes) с детализацией по каждой заметке
+* [Карты связей](https://github.com/zadam/trilium/wiki/Relation-map) и [карты ссылок](https://github.com/zadam/trilium/wiki/Link-map) для визуализации их взяимосвязей
+* [Скрипты](https://github.com/zadam/trilium/wiki/Scripts) - см. [продвинутые примеры](https://github.com/zadam/trilium/wiki/Advanced-showcases)
+* Хорошо масштабируется, как по удобству использования, так и по производительности до 100000 заметок
+* Оптимизированный [мобильный фронтенд](https://github.com/zadam/trilium/wiki/Mobile-frontend) смартфонов и планшетов
+* [Темная тема](https://github.com/zadam/trilium/wiki/Themes)
+* Импорт и экпорт [Evernote](https://github.com/zadam/trilium/wiki/Evernote-import) и данных в [markdown](https://github.com/zadam/trilium/wiki/Markdown) формате
+* [Web Clipper](https://github.com/zadam/trilium/wiki/Web-clipper) для удобного сохранения веб-контента
+
+## Сборки
+
+Trilium предоставляется в виде десктопного приложения (Linux и Windows) или веб-приложения, размещенного на вашем сервере (Linux). Доступна сборка Mac OS, но она [не поддерживается](https://github.com/zadam/trilium/wiki/FAQ#mac-os-support).
+
+* Если вы хотите использовать Trilium на десктопе, скачайте архив для своей платформы со страницы [релизов](https://github.com/zadam/trilium/releases/latest), распакуйте и запустите исполняемый файл ```trilium```.
+* Если вы хотите установить Trilium на сервере, следуйте этой [инструкции](https://github.com/zadam/trilium/wiki/Server-installation).
+  * В данный момент поддерживаются (протестированы) последние версии браузеров Chrome и Firefox.
+
+## Документация
+
+[Полный список страниц документации доступен в Wiki.](https://github.com/zadam/trilium/wiki/)
+
+Вы также можете ознакомиться с [шаблонами персональных баз знаний](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base), чтобы получить представление о том, как можно использовать Trilium.
+
+## Участвуйте в разработке
+
+Используйте онлайн среду разработки в браузере
+
+[![Открыть в Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/zadam/trilium)
+
+Или склонируйте на своё устройство и запустите
+```
+npm install
+npm run start-server
+```
+
+## Благодарности
+
+* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - лучший WYSIWYG редактор, очень активная и внимательная команда.
+* [FancyTree](https://github.com/mar10/fancytree) - многофункциональная библиотека для создания древовидных структур. Вне конкуренции. Без него Trilium Notes не были бы таким.
+* [CodeMirror](https://github.com/codemirror/CodeMirror) - редактор кода с поддержкой огромного количество языков.
+* [jsPlumb](https://github.com/jsplumb/jsplumb) - библиотека для визуализации связей. Вне конкуренции. Используется в [картах связей](https://github.com/zadam/trilium/wiki/Relation-map) и [картах ссылок](https://github.com/zadam/trilium/wiki/Link-map).
+
+## Лицензия
+
+Эта программа является бесплатным программным обеспечением: вы можете распространять и/или изменять ее в соответствии с условиями GNU Affero General Public License, опубликованной Free Software Foundation, либо версии 3 Лицензии, либо (по вашему выбору) любой более поздней версии.

bin/build-debian.sh

@@ -5,3 +5,18 @@ echo "Packaging debian x64 distribution..."
 VERSION=`jq -r ".version" package.json`
 
 ./node_modules/.bin/electron-installer-debian --config bin/deb-options.json --options.version=${VERSION} --arch amd64
+
+
+# hacky stop-gag measure to produce debian compatible XZ compressed debs until this is fixed: https://github.com/electron-userland/electron-installer-debian/issues/272
+cd dist
+ar x trilium_${VERSION}_amd64.deb
+rm trilium_${VERSION}_amd64.deb
+# recompress
+< control.tar.zst zstd -d | xz > control.tar.xz
+< data.tar.zst zstd -d | xz > data.tar.xz
+# create deb archive (I really do not know, what argument "sdsd" is for but something is required for ar to create the archive as desired)
+ar -m -c -a sdsd trilium_${VERSION}_amd64.deb debian-binary control.tar.xz data.tar.xz
+
+rm control* data* debian-binary
+
+echo "Converted to XZ deb"

bin/build-linux-x64.sh

@@ -27,8 +27,19 @@ cp images/app-icons/png/128x128.png $BUILD_DIR/icon.png
 # removing software WebGL binaries because they are pretty huge and not necessary
 rm -r $BUILD_DIR/swiftshader
 
-cp bin/tpl/portable-trilium.sh $BUILD_DIR/
-chmod 755 $BUILD_DIR/portable-trilium.sh
+cp bin/tpl/anonymize-database.sql $BUILD_DIR/
+
+cp -r dump-db $BUILD_DIR/
+rm -rf $BUILD_DIR/dump-db/node_modules
+
+cp bin/tpl/trilium-portable.sh $BUILD_DIR/
+chmod 755 $BUILD_DIR/trilium-portable.sh
+
+cp bin/tpl/trilium-safe-mode.sh $BUILD_DIR/
+chmod 755 $BUILD_DIR/trilium-safe-mode.sh
+
+cp bin/tpl/trilium-no-cert-check.sh $BUILD_DIR/
+chmod 755 $BUILD_DIR/trilium-no-cert-check.sh
 
 echo "Packaging linux x64 electron distribution..."
 VERSION=`jq -r ".version" package.json`

bin/build-mac-x64.sh

@@ -23,6 +23,11 @@ rm -rf $BUILD_DIR
 # Mac build has by default useless directory level
 mv "./dist/Trilium Notes-darwin-x64" $BUILD_DIR
 
+cp bin/tpl/anonymize-database.sql $BUILD_DIR/
+
+cp -r dump-db $BUILD_DIR/
+rm -rf $BUILD_DIR/dump-db/node_modules
+
 echo "Zipping mac x64 electron distribution..."
 
 VERSION=`jq -r ".version" package.json`

bin/build-server.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 PKG_DIR=dist/trilium-linux-x64-server
-NODE_VERSION=12.19.0
+NODE_VERSION=16.19.0
 
 if [ "$1" != "DONTCOPY" ]
 then
@@ -20,12 +20,19 @@ rm -r $PKG_DIR/node/lib/node_modules/npm
 rm -r $PKG_DIR/node/include/node
 
 rm -r $PKG_DIR/node_modules/electron*
+rm -r $PKG_DIR/webpack*
+rm -r $PKG_DIR/electron.js
 
 cp -r bin/better-sqlite3/linux-server-better_sqlite3.node $PKG_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 
 printf "#!/bin/sh\n./node/bin/node src/www" > $PKG_DIR/trilium.sh
 chmod 755 $PKG_DIR/trilium.sh
 
+cp bin/tpl/anonymize-database.sql $PKG_DIR/
+
+cp -r dump-db $PKG_DIR/
+rm -rf $PKG_DIR/dump-db/node_modules
+
 VERSION=`jq -r ".version" package.json`
 
 cd dist

bin/build-win-x64.sh

@@ -25,7 +25,12 @@ mv "./dist/Trilium Notes-win32-x64" $BUILD_DIR
 # removing software WebGL binaries because they are pretty huge and not necessary
 rm -r $BUILD_DIR/swiftshader
 
-cp bin/tpl/portable-trilium.bat $BUILD_DIR/
+cp bin/tpl/anonymize-database.sql $BUILD_DIR/
+
+cp -r dump-db $BUILD_DIR/
+rm -rf $BUILD_DIR/dump-db/node_modules
+
+cp bin/tpl/trilium-{portable,no-cert-check,safe-mode}.bat $BUILD_DIR/
 
 echo "Zipping windows x64 electron distribution..."
 VERSION=`jq -r ".version" package.json`

bin/copy-trilium.sh

@@ -5,7 +5,7 @@ if [[ $# -eq 0 ]] ; then
     exit 1
 fi
 
-n exec 12 npm run webpack
+n exec 16.19.0 npm run webpack
 
 DIR=$1
 
@@ -27,7 +27,7 @@ cp -r electron.js $DIR/
 cp webpack-* $DIR/
 
 # run in subshell (so we return to original dir)
-(cd $DIR && n exec 12 npm install --only=prod)
+(cd $DIR && n exec 16.19.0 npm install --only=prod)
 
 # cleanup of useless files in dependencies
 rm -r $DIR/node_modules/image-q/demo
@@ -44,8 +44,7 @@ find $DIR/node_modules -name demo -exec rm -rf {} \;
 
 find $DIR/libraries -name "*.map" -type f -delete
 
-rm -r $DIR/src/public/app
+cp $DIR/src/public/app/share.js $DIR/src/public/app-dist/
+cp -r $DIR/src/public/app/doc_notes $DIR/src/public/app-dist/
 
-sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' $DIR/src/views/desktop.ejs
-sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' $DIR/src/views/mobile.ejs
-sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' $DIR/src/views/setup.ejs
+rm -rf $DIR/src/public/app

bin/create-anonymization-script.js

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+
+const anonymizationService = require('../src/services/anonymization');
+const fs = require('fs');
+const path = require('path');
+
+fs.writeFileSync(path.resolve(__dirname, 'tpl', 'anonymize-database.sql'), anonymizationService.getFullAnonymizationScript());

bin/push-docker-image.sh

@@ -8,9 +8,9 @@ fi
 VERSION=$1
 SERIES=${VERSION:0:4}-latest
 
-sudo docker push zadam/trilium:$VERSION
-sudo docker push zadam/trilium:$SERIES
+docker push zadam/trilium:$VERSION
+docker push zadam/trilium:$SERIES
 
 if [[ $1 != *"beta"* ]]; then
-  sudo docker push zadam/trilium:latest
+  docker push zadam/trilium:latest
 fi

bin/release-flatpack.sh

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+if [[ $# -eq 0 ]] ; then
+    echo "Missing argument of new version"
+    exit 1
+fi
+
+VERSION=$1
+
+if ! [[ ${VERSION} =~ ^[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}(-.+)?$ ]] ;
+then
+    echo "Version ${VERSION} isn't in format X.Y.Z"
+    exit 1
+fi
+
+VERSION_DATE=$(git log -1 --format=%aI "v${VERSION}" | cut -c -10)
+VERSION_COMMIT=$(git rev-list -n 1 "v${VERSION}")
+
+# expecting the directory at a specific path
+cd ~/trilium-flathub || exit
+
+if ! git diff-index --quiet HEAD --; then
+    echo "There are uncommitted changes"
+    exit 1
+fi
+
+BASE_BRANCH=master
+
+if [[ "$VERSION" == *"beta"* ]]; then
+    BASE_BRANCH=beta
+fi
+
+git switch "${BASE_BRANCH}"
+git pull
+
+BRANCH=b${VERSION}
+
+git branch "${BRANCH}"
+git switch "${BRANCH}"
+
+echo "Updating files with version ${VERSION}, date ${VERSION_DATE} and commit ${VERSION_COMMIT}"
+
+flatpak-node-generator npm ../trilium/package-lock.json
+
+xmlstarlet ed --inplace --update "/component/releases/release/@version" --value "${VERSION}" --update "/component/releases/release/@date" --value "${VERSION_DATE}" ./com.github.zadam.trilium.metainfo.xml
+
+yq --inplace "(.modules[0].sources[0].tag = \"v${VERSION}\") | (.modules[0].sources[0].commit = \"${VERSION_COMMIT}\")" ./com.github.zadam.trilium.yml
+
+git add ./generated-sources.json
+git add ./com.github.zadam.trilium.metainfo.xml
+git add ./com.github.zadam.trilium.yml
+
+git commit -m "release $VERSION"
+git push --set-upstream origin "${BRANCH}"
+
+gh pr create --fill -B "${BASE_BRANCH}"
+gh pr merge --auto --merge --delete-branch

bin/release.sh

@@ -69,13 +69,3 @@ gh release create "$TAG" \
     "dist/$WINDOWS_X64_BUILD" \
     "dist/$MAC_X64_BUILD" \
     "dist/$SERVER_BUILD"
-
-echo "Building docker image"
-
-bin/build-docker.sh $VERSION
-
-echo "Pushing docker image to dockerhub"
-
-bin/push-docker-image.sh $VERSION
-
-echo "Release finished!"

bin/tpl/anonymize-database.sql

@@ -0,0 +1,17 @@
+
+UPDATE etapi_tokens SET tokenHash = 'API token hash value';
+UPDATE notes SET title = 'title' WHERE title NOT IN ('root', '_hidden', '_share');
+UPDATE note_contents SET content = 'text' WHERE content IS NOT NULL;
+UPDATE note_revisions SET title = 'title';
+UPDATE note_revision_contents SET content = 'text' WHERE content IS NOT NULL;
+
+UPDATE attributes SET name = 'name', value = 'value' WHERE type = 'label' AND name NOT IN('inbox', 'disableVersioning', 'calendarRoot', 'archived', 'excludeFromExport', 'disableInclusion', 'appCss', 'appTheme', 'hidePromotedAttributes', 'readOnly', 'autoReadOnlyDisabled', 'cssClass', 'iconClass', 'keyboardShortcut', 'run', 'runOnInstance', 'runAtHour', 'customRequestHandler', 'customResourceProvider', 'widget', 'noteInfoWidgetDisabled', 'linkMapWidgetDisabled', 'noteRevisionsWidgetDisabled', 'whatLinksHereWidgetDisabled', 'similarNotesWidgetDisabled', 'workspace', 'workspaceIconClass', 'workspaceTabBackgroundColor', 'searchHome', 'workspaceInbox', 'workspaceSearchHome', 'sqlConsoleHome', 'datePattern', 'pageSize', 'viewType', 'mapRootNoteId', 'bookmarkFolder', 'sorted', 'top', 'fullContentWidth', 'shareHiddenFromTree', 'shareAlias', 'shareOmitDefaultCss', 'shareRoot', 'shareDescription', 'internalLink', 'imageLink', 'relationMapLink', 'includeMapLink', 'runOnNoteCreation', 'runOnNoteTitleChange', 'runOnNoteContentChange', 'runOnNoteChange', 'runOnChildNoteCreation', 'runOnAttributeCreation', 'runOnAttributeChange', 'template', 'widget', 'renderNote', 'shareCss', 'shareJs', 'shareFavicon');
+UPDATE attributes SET name = 'name' WHERE type = 'relation' AND name NOT IN ('inbox', 'disableVersioning', 'calendarRoot', 'archived', 'excludeFromExport', 'disableInclusion', 'appCss', 'appTheme', 'hidePromotedAttributes', 'readOnly', 'autoReadOnlyDisabled', 'cssClass', 'iconClass', 'keyboardShortcut', 'run', 'runOnInstance', 'runAtHour', 'customRequestHandler', 'customResourceProvider', 'widget', 'noteInfoWidgetDisabled', 'linkMapWidgetDisabled', 'noteRevisionsWidgetDisabled', 'whatLinksHereWidgetDisabled', 'similarNotesWidgetDisabled', 'workspace', 'workspaceIconClass', 'workspaceTabBackgroundColor', 'searchHome', 'workspaceInbox', 'workspaceSearchHome', 'sqlConsoleHome', 'datePattern', 'pageSize', 'viewType', 'mapRootNoteId', 'bookmarkFolder', 'sorted', 'top', 'fullContentWidth', 'shareHiddenFromTree', 'shareAlias', 'shareOmitDefaultCss', 'shareRoot', 'shareDescription', 'internalLink', 'imageLink', 'relationMapLink', 'includeMapLink', 'runOnNoteCreation', 'runOnNoteTitleChange', 'runOnNoteContentChange', 'runOnNoteChange', 'runOnChildNoteCreation', 'runOnAttributeCreation', 'runOnAttributeChange', 'template', 'widget', 'renderNote', 'shareCss', 'shareJs', 'shareFavicon');
+UPDATE branches SET prefix = 'prefix' WHERE prefix IS NOT NULL AND prefix != 'recovered';
+UPDATE options SET value = 'anonymized' WHERE name IN
+                    ('documentId', 'documentSecret', 'encryptedDataKey',
+                     'passwordVerificationHash', 'passwordVerificationSalt',
+                     'passwordDerivedKeySalt', 'username', 'syncServerHost', 'syncProxy')
+                      AND value != '';
+
+VACUUM;

bin/tpl/portable-trilium.bat

@@ -1,4 +0,0 @@
-SET DIR=%~dp0
-SET TRILIUM_DATA_DIR=%DIR%\trilium-data
-cd %DIR%
-start trilium.exe

bin/tpl/trilium-no-cert-check.bat

@@ -0,0 +1,23 @@
+@echo off
+:: Try to get powershell to launch Trilium since it deals with UTF-8 characters in current path
+:: If there's no powershell available, fallback to unicode enabled command interpreter
+
+WHERE powershell.exe > NUL 2>&1
+IF %ERRORLEVEL% NEQ 0 GOTO BATCH ELSE GOTO POWERSHELL
+
+:POWERSHELL
+powershell -ExecutionPolicy Bypass -NonInteractive -NoLogo "Set-Item -Path Env:NODE_TLS_REJECT_UNAUTHORIZED -Value 0; ./trilium.exe"
+GOTO END
+
+:BATCH
+:: Make sure we support UTF-8 characters
+chcp 65001
+
+:: Get Current Trilium executable directory and compute data directory
+SET DIR=%~dp0
+set NODE_TLS_REJECT_UNAUTHORIZED=0
+cd %DIR%
+start trilium.exe
+GOTO END
+
+:END

bin/tpl/trilium-no-cert-check.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+DIR=`dirname "$0"`
+export NODE_TLS_REJECT_UNAUTHORIZED=0
+
+"$DIR/trilium"
+

bin/tpl/trilium-portable.bat

@@ -0,0 +1,23 @@
+@echo off
+:: Try to get powershell to launch Trilium since it deals with UTF-8 characters in current path
+:: If there's no powershell available, fallback to unicode enabled command interpreter
+
+WHERE powershell.exe > NUL 2>&1
+IF %ERRORLEVEL% NEQ 0 GOTO BATCH ELSE GOTO POWERSHELL
+
+:POWERSHELL
+powershell -ExecutionPolicy Bypass -NonInteractive -NoLogo "Set-Item -Path Env:TRILIUM_DATA_DIR -Value './trilium-data'; ./trilium.exe"
+GOTO END
+
+:BATCH
+:: Make sure we support UTF-8 characters
+chcp 65001
+
+:: Get Current Trilium executable directory and compute data directory
+SET DIR=%~dp0
+SET TRILIUM_DATA_DIR=%DIR%\trilium-data
+cd %DIR%
+start trilium.exe
+GOTO END
+
+:END

bin/tpl/trilium-safe-mode.bat

@@ -0,0 +1,23 @@
+@echo off
+:: Try to get powershell to launch Trilium since it deals with UTF-8 characters in current path
+:: If there's no powershell available, fallback to unicode enabled command interpreter
+
+WHERE powershell.exe > NUL 2>&1
+IF %ERRORLEVEL% NEQ 0 GOTO BATCH ELSE GOTO POWERSHELL
+
+:POWERSHELL
+powershell -ExecutionPolicy Bypass -NonInteractive -NoLogo "Set-Item -Path Env:TRILIUM_SAFE_MODE -Value 1; ./trilium.exe --disable-gpu"
+GOTO END
+
+:BATCH
+:: Make sure we support UTF-8 characters
+chcp 65001
+
+:: Get Current Trilium executable directory and compute data directory
+SET DIR=%~dp0
+SET TRILIUM_SAFE_MODE=1
+cd %DIR%
+start trilium.exe --disable-gpu
+GOTO END
+
+:END

bin/tpl/trilium-safe-mode.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+DIR=`dirname "$0"`
+export TRILIUM_SAFE_MODE=1
+
+"$DIR/trilium" --disable-gpu
+

config-sample.ini

@@ -21,3 +21,9 @@ https=false
 # path to certificate (run "bash bin/generate-cert.sh" to generate self-signed certificate). Relevant only if https=true
 certPath=
 keyPath=
+# setting to give trust to reverse proxies, a comma-separated list of trusted rev. proxy IPs can be specified (CIDR notation is permitted),
+# alternatively 'true' will make use of the leftmost IP in X-Forwarded-For, ultimately an integer can be used to tell about the number of hops between
+# Trilium (which is hop 0) and the first trusted rev. proxy. 
+# once set, expressjs will use the X-Forwarded-For header set by the rev. proxy to determinate the real IPs of clients.
+# expressjs shortcuts are supported: loopback(127.0.0.1/8, ::1/128), linklocal(169.254.0.0/16, fe80::/10), uniquelocal(10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, fc00::/7)
+trustedReverseProxy=false

db/TODO.txt

@@ -0,0 +1,6 @@
+- isDeleted = 0 by default
+- rename openTabs to openNoteContexts
+- unify readOnly handling to a single attribute:
+  * readOnly - like now
+  * readOnly=auto - like without readOnly (used to override inherited readOnly)
+  * readOnly=never - like autoReadOnlyDisabled

db/migrations/0001__cleanup_tables.sql

@@ -1,11 +0,0 @@
-DROP TABLE IF EXISTS anchors;
-DROP TABLE IF EXISTS attachments;
-DROP TABLE IF EXISTS bookmarks;
-DROP TABLE IF EXISTS custom_properties;
-DROP TABLE IF EXISTS deletions;
-DROP TABLE IF EXISTS deletions_attachments;
-DROP TABLE IF EXISTS formatting;
-DROP TABLE IF EXISTS icons;
-DROP TABLE IF EXISTS tags;
-DROP TABLE IF EXISTS tags_notes;
-DROP TABLE IF EXISTS tasks;

db/migrations/0002__cleanup_unused_columns_from_notes.sql

@@ -1,3 +0,0 @@
-CREATE TABLE notes_mig AS SELECT note_id, note_title, note_text, note_clone_id, date_created, date_modified, encryption FROM notes;
-DROP TABLE notes;
-ALTER TABLE notes_mig RENAME TO notes;

db/migrations/0003__add_is_deleted_to_note.sql

@@ -1 +0,0 @@
-ALTER TABLE notes ADD COLUMN is_deleted INTEGER NOT NULL DEFAULT 0

db/migrations/0004__add_date_modified_to_notes_tree.sql

@@ -1 +0,0 @@
-ALTER TABLE notes_tree ADD COLUMN date_modified INTEGER NOT NULL DEFAULT 0

db/migrations/0005__cleanup_options.sql

@@ -1 +0,0 @@
-DELETE FROM options WHERE opt_name IN ('is_readonly', 'prop_modified', 'doc_title', 'doc_UID', 'format_version', 'flask_secret_key')

db/migrations/0006__date_modified_from_to_in_note_history.sql

@@ -1,3 +0,0 @@
-CREATE TABLE notes_history_mig AS SELECT id, note_id, note_title, note_text, date_modified AS date_modified_from, date_modified AS date_modified_to FROM notes_history;
-DROP TABLE notes_history;
-ALTER TABLE notes_history_mig RENAME TO notes_history;

db/migrations/0007__readd_encryption_to_note_history.sql

@@ -1 +0,0 @@
-ALTER TABLE notes_history ADD COLUMN encryption INTEGER DEFAULT 0

db/migrations/0008__fix_note_history.sql

@@ -1,15 +0,0 @@
-CREATE TABLE `notes_history_mig` (
-	`id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
-	`note_id`	INT,
-	`note_title`	TEXT,
-	`note_text`	TEXT,
-	`date_modified_from`	INT,
-	`date_modified_to`	INT,
-	`encryption`	INTEGER DEFAULT 0
-);
-
-INSERT INTO notes_history (id, note_id, note_title, note_text, date_modified_from, date_modified_to, encryption)
-    SELECT id, note_id, note_title, note_text, date_modified_from, date_modified_to, encryption FROM notes_history;
-
-DROP TABLE notes_history;
-ALTER TABLE notes_history_mig RENAME TO notes_history;

db/migrations/0009__indexes.sql

@@ -1,41 +0,0 @@
-CREATE INDEX `IDX_notes_history_note_id` ON `notes_history` (
-	`note_id`
-);
-
-CREATE INDEX `IDX_images_note_id` ON `images` (
-	`note_id`
-);
-
-CREATE INDEX `IDX_links_note_id` ON `links` (
-	`note_id`
-);
-
-CREATE INDEX `IDX_audit_log_note_id` ON `audit_log` (
-	`note_id`
-);
-
-CREATE INDEX `IDX_audit_log_date_modified` ON `audit_log` (
-	`date_modified`
-);
-
-CREATE TABLE `notes_mig` (
-	`note_id`	TEXT NOT NULL,
-	`note_title`	TEXT,
-	`note_text`	TEXT,
-	`note_clone_id`	TEXT,
-	`date_created`	INT,
-	`date_modified`	INT,
-	`encryption`	INT,
-	`is_deleted`	INTEGER NOT NULL DEFAULT 0,
-	PRIMARY KEY(`note_id`)
-);
-
-INSERT INTO notes_mig (note_id, note_title, note_text, note_clone_id, date_created, date_modified, encryption)
-    SELECT note_id, note_title, note_text, note_clone_id, date_created, date_modified, encryption FROM notes;
-
-DROP TABLE notes;
-ALTER TABLE notes_mig RENAME TO notes;
-
-CREATE INDEX `IDX_notes_is_deleted` ON `notes` (
-	`is_deleted`
-);

db/migrations/0010__add_is_deleted_to_notes_tree.sql

@@ -1,5 +0,0 @@
-ALTER TABLE notes_tree ADD COLUMN is_deleted INTEGER NOT NULL DEFAULT 0;
-
-CREATE INDEX `IDX_notes_tree_is_deleted` ON `notes_tree` (
-	`is_deleted`
-);

db/migrations/0011__add_last_synced_option.sql

@@ -1 +0,0 @@
-INSERT INTO options (opt_name, opt_value) VALUES ('last_synced', 0)

db/migrations/0012__create_index_on_notes_history.sql

@@ -1,5 +0,0 @@
-CREATE UNIQUE INDEX `IDX_notes_history_note_from_to` ON `notes_history` (
-	`note_id`,
-	`date_modified_from`,
-	`date_modified_to`
-);

db/migrations/0013__last_sync_pulled_pushed.sql

@@ -1,3 +0,0 @@
-UPDATE options SET opt_name = 'last_synced_pull' WHERE opt_name = 'last_synced';
-
-INSERT INTO options (opt_name, opt_value) VALUES ('last_synced_push', 0);

db/migrations/0014__change_audit_log_id.sql

@@ -1,16 +0,0 @@
-CREATE TABLE `audit_log_mig` (
-	`id`	TEXT NOT NULL PRIMARY KEY,
-	`date_modified`	INTEGER NOT NULL,
-	`category`	TEXT NOT NULL,
-	`browser_id`	TEXT,
-	`note_id`	TEXT,
-	`change_from`	TEXT,
-	`change_to`	TEXT,
-	`comment`	TEXT
-);
-
-INSERT INTO audit_log_mig (id, date_modified, category, browser_id, note_id, change_from, change_to)
-    SELECT id, date_modified, category, browser_id, note_id, change_from, change_to FROM audit_log;
-
-DROP TABLE audit_log;
-ALTER TABLE audit_log_mig RENAME TO audit_log;

db/migrations/0015__trim_note_ids.sql

@@ -1,6 +0,0 @@
-UPDATE notes SET note_id = substr(note_id, 0, 22);
-UPDATE notes_tree SET note_id = substr(note_id, 0, 22), note_pid = substr(note_pid, 0, 22);
-UPDATE notes_history SET note_id = substr(note_id, 0, 22);
-UPDATE audit_log SET note_id = substr(note_id, 0, 22);
-UPDATE links SET note_id = substr(note_id, 0, 22);
-UPDATE images SET note_id = substr(note_id, 0, 22);

db/migrations/0016__trim_note_ids2.sql

@@ -1,6 +0,0 @@
-UPDATE notes SET note_id = substr(note_id, 0, 13);
-UPDATE notes_tree SET note_id = substr(note_id, 0, 13), note_pid = substr(note_pid, 0, 13);
-UPDATE notes_history SET note_id = substr(note_id, 0, 13);
-UPDATE audit_log SET note_id = substr(note_id, 0, 13);
-UPDATE links SET note_id = substr(note_id, 0, 13);
-UPDATE images SET note_id = substr(note_id, 0, 13);

db/migrations/0017__document_id.sql

@@ -1 +0,0 @@
-INSERT INTO options (opt_name, opt_value) VALUES ('document_id', '');

db/migrations/0018__document_secret.sql

@@ -1 +0,0 @@
-INSERT INTO options (opt_name, opt_value) VALUES ('document_secret', '');

db/migrations/0019__date_modified_for_options.sql

@@ -1 +0,0 @@
-ALTER TABLE options ADD COLUMN date_modified INTEGER NOT NULL DEFAULT 0

db/migrations/0020__sync.sql

@@ -1,15 +0,0 @@
-CREATE TABLE `sync` (
-	`id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	`entity_name`	TEXT NOT NULL,
-	`entity_id`	TEXT NOT NULL,
-	`sync_date`	INTEGER NOT NULL
-);
-
-CREATE UNIQUE INDEX `IDX_sync_entity_name_id` ON `sync` (
-	`entity_name`,
-	`entity_id`
-);
-
-CREATE INDEX `IDX_sync_sync_date` ON `sync` (
-	`sync_date`
-);

db/migrations/0021__sync_add_source_id.sql

@@ -1 +0,0 @@
-ALTER TABLE sync ADD COLUMN source_id TEXT

db/migrations/0022__add_note_history_id.sql

@@ -1,7 +0,0 @@
-ALTER TABLE notes_history ADD COLUMN note_history_id TEXT;
-
-UPDATE notes_history SET note_history_id = id;
-
-CREATE UNIQUE INDEX `IDX_note_history_note_history_id` ON `notes_history` (
-	`note_history_id`
-);

db/migrations/0023__remove_id_from_note_history.sql

@@ -1,27 +0,0 @@
-CREATE TABLE `notes_history_mig` (
-	`note_history_id`	TEXT NOT NULL PRIMARY KEY,
-	`note_id`	TEXT NOT NULL,
-	`note_title`	TEXT,
-	`note_text`	TEXT,
-	`encryption`	INT,
-	`date_modified_from` INT,
-	`date_modified_to` INT
-);
-
-INSERT INTO notes_history_mig (note_history_id, note_id, note_title, note_text, encryption, date_modified_from, date_modified_to)
-    SELECT note_history_id, note_id, note_title, note_text, encryption, date_modified_from, date_modified_to FROM notes_history;
-
-DROP TABLE notes_history;
-ALTER TABLE notes_history_mig RENAME TO notes_history;
-
-CREATE INDEX `IDX_notes_history_note_id` ON `notes_history` (
-	`note_id`
-);
-
-CREATE INDEX `IDX_notes_history_note_date_modified_from` ON `notes_history` (
-	`date_modified_from`
-);
-
-CREATE INDEX `IDX_notes_history_note_date_modified_to` ON `notes_history` (
-	`date_modified_to`
-);

db/migrations/0024__remove_id_from_options.sql

@@ -1,11 +0,0 @@
-CREATE TABLE `options_mig` (
-	`opt_name`	TEXT NOT NULL PRIMARY KEY,
-	`opt_value`	TEXT,
-	`date_modified` INT
-);
-
-INSERT INTO options_mig (opt_name, opt_value, date_modified)
-    SELECT opt_name, opt_value, date_modified FROM options;
-
-DROP TABLE options;
-ALTER TABLE options_mig RENAME TO options;

db/migrations/0025__create_event_log.sql

@@ -1,10 +0,0 @@
-CREATE TABLE `event_log` (
-	`id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	`note_id`	TEXT,
-	`comment`	TEXT,
-	`date_added`	INTEGER NOT NULL
-);
-
-CREATE INDEX `IDX_event_log_date_added` ON `event_log` (
-	`date_added`
-);

db/migrations/0026__recent_notes_table.sql

@@ -1,4 +0,0 @@
-CREATE TABLE `recent_notes` (
-	`note_id`	TEXT NOT NULL PRIMARY KEY,
-	`date_accessed`	INTEGER NOT NULL
-);

db/migrations/0027__is_deleted_in_recent_notes.sql

@@ -1 +0,0 @@
-ALTER TABLE recent_notes ADD COLUMN is_deleted INT;

db/migrations/0028__rename_encryption_to_protected.sql

@@ -1,52 +0,0 @@
-UPDATE audit_log SET category = 'PROTECTED' WHERE category = 'ENCRYPTION';
-
-DELETE FROM notes WHERE note_clone_id IS NOT NULL AND note_clone_id != '';
-
-CREATE TABLE `notes_mig` (
-	`note_id`	TEXT NOT NULL,
-	`note_title`	TEXT,
-	`note_text`	TEXT,
-	`date_created`	INT,
-	`date_modified`	INT,
-	`is_protected`	INT NOT NULL DEFAULT 0,
-	`is_deleted`	INT NOT NULL DEFAULT 0,
-	PRIMARY KEY(`note_id`)
-);
-
-INSERT INTO notes_mig (note_id, note_title, note_text, date_created, date_modified, is_protected, is_deleted)
-    SELECT note_id, note_title, note_text, date_created, date_modified, encryption, is_deleted FROM notes;
-
-DROP TABLE notes;
-ALTER TABLE notes_mig RENAME TO notes;
-
-CREATE INDEX `IDX_notes_is_deleted` ON `notes` (
-	`is_deleted`
-);
-
-CREATE TABLE `notes_history_mig` (
-	`note_history_id`	TEXT NOT NULL PRIMARY KEY,
-	`note_id`	TEXT NOT NULL,
-	`note_title`	TEXT,
-	`note_text`	TEXT,
-	`is_protected`	INT,
-	`date_modified_from` INT,
-	`date_modified_to` INT
-);
-
-INSERT INTO notes_history_mig (note_history_id, note_id, note_title, note_text, is_protected, date_modified_from, date_modified_to)
-                        SELECT note_history_id, note_id, note_title, note_text, encryption, date_modified_from, date_modified_to FROM notes_history;
-
-DROP TABLE notes_history;
-ALTER TABLE notes_history_mig RENAME TO notes_history;
-
-CREATE INDEX `IDX_notes_history_note_id` ON `notes_history` (
-	`note_id`
-);
-
-CREATE INDEX `IDX_notes_history_note_date_modified_from` ON `notes_history` (
-	`date_modified_from`
-);
-
-CREATE INDEX `IDX_notes_history_note_date_modified_to` ON `notes_history` (
-	`date_modified_to`
-);

db/migrations/0029__rename_encryption_session_timeout_to_protected_session_timeout.sql

@@ -1 +0,0 @@
-UPDATE options SET opt_name = 'protected_session_timeout' WHERE opt_name = 'encryption_session_timeout';

db/migrations/0030__hello_world.js

@@ -1 +0,0 @@
-module.exports = async () => console.log("heeeelllooo!!!");

db/migrations/0031__change_encryption_to_CBC.js

@@ -1,44 +0,0 @@
-const sql = require('../services/sql');
-const data_encryption = require('../services/data_encryption');
-const password_encryption = require('../services/password_encryption');
-const readline = require('readline');
-
-const cl = readline.createInterface(process.stdin, process.stdout);
-
-function question(q) {
-    return new Promise( (res, rej) => {
-        cl.question( q, answer => {
-            res(answer);
-        })
-    });
-}
-
-module.exports = async () => {
-    const password = await question("Enter password: ");
-    const dataKey = await password_encryption.getDecryptedDataKey(password);
-
-    const protectedNotes = await sql.getRows("SELECT * FROM notes WHERE is_protected = 1");
-
-    for (const note of protectedNotes) {
-        const decryptedTitle = data_encryption.decrypt(dataKey, note.note_title);
-
-        note.note_title = data_encryption.encrypt(dataKey, "0" + note.note_id, decryptedTitle);
-
-        const decryptedText = data_encryption.decrypt(dataKey, note.note_text);
-        note.note_text = data_encryption.encrypt(dataKey, "1" + note.note_id, decryptedText);
-
-        await sql.execute("UPDATE notes SET note_title = ?, note_text = ? WHERE note_id = ?", [note.note_title, note.note_text, note.note_id]);
-    }
-
-    const protectedNotesHistory = await sql.getRows("SELECT * FROM notes_history WHERE is_protected = 1");
-
-    for (const noteHistory of protectedNotesHistory) {
-        const decryptedTitle = data_encryption.decrypt(dataKey, noteHistory.note_title);
-        noteHistory.note_title = data_encryption.encrypt(dataKey, "0" + noteHistory.note_history_id, decryptedTitle);
-
-        const decryptedText = data_encryption.decrypt(dataKey, noteHistory.note_text);
-        noteHistory.note_text = data_encryption.encrypt(dataKey, "1" + noteHistory.note_history_id, decryptedText);
-
-        await sql.execute("UPDATE notes SET note_title = ?, note_text = ? WHERE note_id = ?", [noteHistory.note_title, noteHistory.note_text, noteHistory.note_history_id]);
-    }
-};

db/migrations/0032__add_option_for_encrypted_data_key_iv.sql

@@ -1 +0,0 @@
-INSERT INTO options (opt_name, opt_value) VALUES ('encrypted_data_key_iv', '')

db/migrations/0033__change_data_key_encryption_to_cbc.js

@@ -1,25 +0,0 @@
-const password_encryption = require('../services/password_encryption');
-const readline = require('readline');
-
-const cl = readline.createInterface(process.stdin, process.stdout);
-
-function question(q) {
-    return new Promise( (res, rej) => {
-        cl.question( q, answer => {
-            res(answer);
-        })
-    });
-}
-
-module.exports = async () => {
-    const password = await question("Enter password: ");
-    let dataKey = await password_encryption.getDecryptedDataKey(password);
-
-    console.log("Original data key: ", dataKey);
-
-    dataKey = dataKey.slice(0, 16);
-
-    console.log("Trimmed data key: ", dataKey);
-
-    await password_encryption.setDataKey(password, dataKey);
-};

db/migrations/0034__source_ids.sql

@@ -1,5 +0,0 @@
-CREATE TABLE `source_ids` (
-	`source_id`	TEXT NOT NULL,
-	`date_created`	INTEGER NOT NULL,
-	PRIMARY KEY(`source_id`)
-);

db/migrations/0035__root_notes_will_have_note_id_root.sql

@@ -1 +0,0 @@
-UPDATE notes_tree SET note_pid = 'root' WHERE note_pid = ''

db/migrations/0036__clear_sync_table.sql

@@ -1 +0,0 @@
-DELETE FROM sync;

db/migrations/0037__add_note_tree_id.sql

@@ -1,21 +0,0 @@
-CREATE TABLE [notes_tree_mig] (
-    [note_tree_id] VARCHAR(30) PRIMARY KEY NOT NULL,
-    [note_id] VARCHAR(30) UNIQUE NOT NULL,
-    [note_pid] VARCHAR(30) NOT NULL,
-    [note_pos] INTEGER NOT NULL,
-    [is_expanded] BOOLEAN NULL ,
-    date_modified INTEGER NOT NULL DEFAULT 0,
-    is_deleted INTEGER NOT NULL DEFAULT 0
-);
-
-INSERT INTO notes_tree_mig (note_tree_id, note_id, note_pid, note_pos, is_expanded, date_modified, is_deleted)
-    SELECT 'TT' || SUBSTR(note_id, 3), note_id, note_pid, note_pos, is_expanded, date_modified, is_deleted FROM notes_tree;
-
-UPDATE notes_tree_mig SET note_pid = 'TT' || SUBSTR(note_pid, 3) WHERE note_pid != 'root';
-
-DROP TABLE notes_tree;
-ALTER TABLE notes_tree_mig RENAME TO notes_tree;
-
-CREATE INDEX `IDX_notes_tree_note_id` ON `notes_tree` (
-	`note_tree_id`
-);

db/migrations/0038__rename_start_node.sql

@@ -1 +0,0 @@
-UPDATE options SET opt_name = 'start_note_tree_id' WHERE opt_name = 'start_node';

db/migrations/0039__recent_notes_should_point_to_note_tree_id.sql

@@ -1,7 +0,0 @@
-DROP TABLE recent_notes;
-
-CREATE TABLE `recent_notes` (
-    `note_tree_id` TEXT NOT NULL PRIMARY KEY,
-    `date_accessed` INTEGER NOT NULL ,
-    is_deleted INT
-);

db/migrations/0040__fix_note_pid.sql

@@ -1,6 +0,0 @@
-UPDATE
-    notes_tree
-SET
-    note_pid = (SELECT parent.note_id FROM notes_tree parent WHERE notes_tree.note_pid = parent.note_tree_id)
-WHERE
-    note_pid != 'root'

db/migrations/0041__recent_notes_with_note_path.sql

@@ -1,7 +0,0 @@
-DROP TABLE recent_notes;
-
-CREATE TABLE `recent_notes` (
-    `note_path` TEXT NOT NULL PRIMARY KEY,
-    `date_accessed` INTEGER NOT NULL ,
-    is_deleted INT
-);

db/migrations/0042__remove_unique_index_on_note_id.sql

@@ -1,24 +0,0 @@
-CREATE TABLE "notes_tree_mig" (
-    [note_tree_id] VARCHAR(30) PRIMARY KEY NOT NULL,
-    [note_id] VARCHAR(30) NOT NULL,
-    [note_pid] VARCHAR(30) NOT NULL,
-    [note_pos] INTEGER NOT NULL,
-    [is_expanded] BOOLEAN NULL ,
-    date_modified INTEGER NOT NULL DEFAULT 0,
-    is_deleted INTEGER NOT NULL DEFAULT 0
-);
-
-INSERT INTO notes_tree_mig (note_tree_id, note_id, note_pid, note_pos, is_expanded, date_modified, is_deleted)
-    SELECT note_tree_id, note_id, note_pid, note_pos, is_expanded, date_modified, is_deleted FROM notes_tree;
-
-DROP TABLE notes_tree;
-ALTER TABLE notes_tree_mig RENAME TO notes_tree;
-
-CREATE INDEX `IDX_notes_tree_note_tree_id` ON `notes_tree` (
-	`note_tree_id`
-);
-
-CREATE INDEX `IDX_notes_tree_note_id_note_pid` ON `notes_tree` (
-	`note_id`,
-	`note_pid`
-);

db/migrations/0043__clear_sync_table.sql

@@ -1,3 +0,0 @@
-DELETE FROM sync;
-
-UPDATE options SET opt_value = 0 WHERE opt_name IN ('last_synced_push', 'last_synced_pull');

db/migrations/0044__drop_audit_log.sql

@@ -1 +0,0 @@
-DROP TABLE audit_log;

db/migrations/0045__add_prefix_to_notes_tree.sql

@@ -1 +0,0 @@
-ALTER TABLE notes_tree ADD COLUMN `prefix` TEXT

db/migrations/0046__drop_links_and_images.sql

@@ -1,2 +0,0 @@
-DROP TABLE IF EXISTS links;
-DROP TABLE IF EXISTS images;

db/migrations/0047__test.sql

@@ -1 +0,0 @@
-SELECT 1;

db/migrations/0048__add_note_tree_id_to_recent_notes.sql

@@ -1,10 +0,0 @@
-DROP TABLE recent_notes;
-
-CREATE TABLE `recent_notes` (
-  'note_tree_id'TEXT NOT NULL PRIMARY KEY,
-  `note_path` TEXT NOT NULL,
-  `date_accessed` INTEGER NOT NULL ,
-  is_deleted INT
-);
-
-DELETE FROM sync WHERE entity_name = 'recent_notes';

db/migrations/0049__rename_start_note_tree_id_to_note_path.sql

@@ -1 +0,0 @@
-UPDATE options SET opt_name = 'start_note_path' WHERE opt_name = 'start_note_tree_id';

db/migrations/0050__string_dates.sql

@@ -1,156 +0,0 @@
-DROP TABLE migrations;
-
--- Sync
-CREATE TABLE `sync_mig` (
-    `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    `entity_name`	TEXT NOT NULL,
-    `entity_id`	TEXT NOT NULL,
-    `source_id` TEXT NOT NULL,
-    `sync_date`	TEXT NOT NULL);
-
-INSERT INTO sync_mig (id, entity_name, entity_id, source_id, sync_date)
-               SELECT id, entity_name, entity_id, source_id, strftime('%Y-%m-%dT%H:%M:%S.000Z', sync_date, 'unixepoch') FROM sync;
-
-DROP TABLE sync;
-ALTER TABLE sync_mig RENAME TO sync;
-
-CREATE UNIQUE INDEX `IDX_sync_entity_name_id` ON `sync` (
-  `entity_name`,
-  `entity_id`
-);
-
-CREATE INDEX `IDX_sync_sync_date` ON `sync` (
-  `sync_date`
-);
-
--- Options
-
-UPDATE options SET opt_value = strftime('%Y-%m-%dT%H:%M:%S.000Z', opt_value, 'unixepoch') WHERE opt_name IN ('last_backup_date');
-UPDATE options SET date_modified = strftime('%Y-%m-%dT%H:%M:%S.000Z', date_modified, 'unixepoch');
-
--- Event log
-
-CREATE TABLE `event_log_mig` (
-  `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  `note_id`	TEXT,
-  `comment`	TEXT,
-  `date_added`	TEXT NOT NULL
-);
-
-INSERT INTO event_log_mig (id, note_id, comment, date_added)
-                    SELECT id, note_id, comment, strftime('%Y-%m-%dT%H:%M:%S.000Z', date_added, 'unixepoch') FROM event_log;
-
-DROP TABLE event_log;
-ALTER TABLE event_log_mig RENAME TO event_log;
-
-CREATE INDEX `IDX_event_log_date_added` ON `event_log` (
-  `date_added`
-);
-
--- Notes
-
-CREATE TABLE IF NOT EXISTS "notes_mig" (
-  `note_id`	TEXT NOT NULL,
-  `note_title`	TEXT,
-  `note_text`	TEXT,
-  `is_protected`	INT NOT NULL DEFAULT 0,
-  `is_deleted`	INT NOT NULL DEFAULT 0,
-  `date_created`	TEXT NOT NULL,
-  `date_modified`	TEXT NOT NULL,
-  PRIMARY KEY(`note_id`)
-);
-
-INSERT INTO notes_mig (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified)
-                SELECT note_id, note_title, note_text, is_protected, is_deleted,
-                  strftime('%Y-%m-%dT%H:%M:%S.000Z', date_created, 'unixepoch'),
-                  strftime('%Y-%m-%dT%H:%M:%S.000Z', date_modified, 'unixepoch')
-                FROM notes;
-
-DROP TABLE notes;
-ALTER TABLE notes_mig RENAME TO notes;
-
-CREATE INDEX `IDX_notes_is_deleted` ON `notes` (
-  `is_deleted`
-);
-
--- note history
-
-CREATE TABLE IF NOT EXISTS "notes_history_mig" (
-  `note_history_id`	TEXT NOT NULL PRIMARY KEY,
-  `note_id`	TEXT NOT NULL,
-  `note_title`	TEXT,
-  `note_text`	TEXT,
-  `is_protected`	INT NOT NULL DEFAULT 0,
-  `date_modified_from` TEXT NOT NULL,
-  `date_modified_to` TEXT NOT NULL
-);
-
-INSERT INTO notes_history_mig (note_history_id, note_id, note_title, note_text, is_protected, date_modified_from, date_modified_to)
-  SELECT note_history_id, note_id, note_title, note_text, is_protected,
-    strftime('%Y-%m-%dT%H:%M:%S.000Z', date_modified_from, 'unixepoch'),
-    strftime('%Y-%m-%dT%H:%M:%S.000Z', date_modified_to, 'unixepoch')
-  FROM notes_history;
-
-DROP TABLE notes_history;
-ALTER TABLE notes_history_mig RENAME TO notes_history;
-
-CREATE INDEX `IDX_notes_history_note_id` ON `notes_history` (
-  `note_id`
-);
-CREATE INDEX `IDX_notes_history_note_date_modified_from` ON `notes_history` (
-  `date_modified_from`
-);
-CREATE INDEX `IDX_notes_history_note_date_modified_to` ON `notes_history` (
-  `date_modified_to`
-);
-
--- Source IDs
-
-DROP TABLE source_ids;
-
-CREATE TABLE `source_ids` (
-  `source_id`	TEXT NOT NULL,
-  `date_created`	TEXT NOT NULL,
-  PRIMARY KEY(`source_id`)
-);
-
--- Recent notes
-
-DROP TABLE recent_notes;
-
-CREATE TABLE `recent_notes` (
-  `note_tree_id` TEXT NOT NULL PRIMARY KEY,
-  `note_path` TEXT NOT NULL,
-  `date_accessed` TEXT NOT NULL,
-  is_deleted INT
-);
-
--- Notes tree
-
-CREATE TABLE IF NOT EXISTS "notes_tree_mig" (
-  `note_tree_id`	TEXT NOT NULL,
-  `note_id`	TEXT NOT NULL,
-  `note_pid`	TEXT NOT NULL,
-  `note_pos`	INTEGER NOT NULL,
-  `prefix`	TEXT,
-  `is_expanded`	BOOLEAN,
-  `is_deleted`	INTEGER NOT NULL DEFAULT 0,
-  `date_modified`	TEXT NOT NULL,
-  PRIMARY KEY(`note_tree_id`)
-);
-
-INSERT INTO notes_tree_mig (note_tree_id, note_id, note_pid, note_pos, prefix, is_expanded, is_deleted, date_modified)
-                     SELECT note_tree_id, note_id, note_pid, note_pos, prefix, is_expanded, is_deleted,
-                            strftime('%Y-%m-%dT%H:%M:%S.000Z', date_modified, 'unixepoch')
-                     FROM notes_tree;
-
-DROP TABLE notes_tree;
-ALTER TABLE notes_tree_mig RENAME TO notes_tree;
-
-CREATE INDEX `IDX_notes_tree_note_tree_id` ON `notes_tree` (
-  `note_tree_id`
-);
-CREATE INDEX `IDX_notes_tree_note_id_note_pid` ON `notes_tree` (
-  `note_id`,
-  `note_pid`
-);

db/migrations/0051__note_id_index_on_notes_tree.sql

@@ -1,5 +0,0 @@
-DROP index IDX_notes_tree_note_tree_id;
-
-CREATE INDEX `IDX_notes_tree_note_id` ON `notes_tree` (
-  `note_id`
-);

db/migrations/0052__fill_sync_table.sql

@@ -1,8 +0,0 @@
-INSERT OR IGNORE INTO sync (entity_name, entity_id, sync_date, source_id)
-  SELECT 'notes', note_id, strftime('%Y-%m-%dT%H:%M:%S.000Z', 'now'), 'IMPORT' FROM notes;
-
-INSERT OR IGNORE INTO sync (entity_name, entity_id, sync_date, source_id)
-  SELECT 'notes_tree', note_tree_id, strftime('%Y-%m-%dT%H:%M:%S.000Z', 'now'), 'IMPORT' FROM notes_tree;
-
-INSERT OR IGNORE INTO sync (entity_name, entity_id, sync_date, source_id)
-  SELECT 'notes_history', note_history_id, strftime('%Y-%m-%dT%H:%M:%S.000Z', 'now'), 'IMPORT' FROM notes_history;

db/migrations/0053__cleanup_inconsistencies.sql

@@ -1,18 +0,0 @@
-delete from notes where note_id in ('FfZylYxt','HqzAEsR2fFEZ','KgTQDh67+1Mh','TKMbAYl0AFyQ','W+bGM185c6gw',
-                                    'YXBdhv4dYKMy','aF4/6p1zTpIS','nsLnrrDktl/s','wkhFImoPuxky');
-
-delete from notes_tree where note_tree_id in ('TTy5N2y2S6JP','TTkL3rWDexpp','TTEhtomZekUk','TTvP7zW01zwg','TTuYmMTZyKRt'
-  ,'TToaClamxbBF','TTKvNCe5X2dj','TTE7jFx5A0zW','TTc79bscyrHX','TTcw8ZyDy2Cc','TTdFzAOWA9hZ','TTUyVLqyIvVg','TTy85NKSBDyO'
-  ,'TTCyuireAWBv','TTDpVyuzbj1a','TTYznrYvAeIs','TTocvv15VMyu','TTjtxQkBT5vj','TToyyRzbBF0T','TTFt8NE9vSyZ','TTfzFZOuuDqv'
-  ,'TT2e2oUYcxG6','TToXselUpPAy','TTEM68gGukg0','TTkZxxwtUOzW','TTAZNxBtgmmh','TTK1YErdBE3x','TTzjKiEf54o6','TTPWd5Ou1xET'
-  ,'TTxQtjf22rTL','TTJAGaI4c89V','TTUQmsxSTdV3','TTGAOf5Lvr6b','TTECSDRN4ZPW','TTZZXLiGNWv4','TTxSLphulRct','TT8vld7x0qWF'
-  ,'TTuuxXnv2Kpw','TT3RkLZ9AI6t','TTuEbI4Cj3qC','TT4CXXRyWRqm','TTQCuFgnMqxX','TTxnDEMz1bd4','TTMOnqhBesjs','TTHblx55gRHN'
-  ,'TTMHW8HIGCjR','TTxzg3qqyLjw','TTluvD7yS8Rv','TT88qK2j3ggk','TTF7oHhS5ANF','TTOH275JiUSy','TToIt2dQ5tYH','TTBPgixQgbAq'
-  ,'TTeN46707CJl','TTDb3GC2y6nN','TTlIXFwpICko','TTE6M9AxLh2U','TTjqhB8zXjD6','TT9NPeLg4FjK','TTj12jDX7TM3','TTPRjf7EdvDX'
-  ,'TTBnu09pxOmn','TTZxyAkJQ9Cf','TTlvqeof2IBS','TT5R5xtIqRQf','TTiiD6hFjlVH','TTNVjGHSqNgo','TTrORSHCsAVQ','TT5Ei5fngqkv'
-  ,'TTQ4hdpcIX3C','TTQgxq4CoiHU','TTJayLjI6BSE','TTYyraNy0CVT','TTnAJ3AK3wHz','TTJwKcgs1s0X','TT4FiatgbLEs','TTEdp5Zx1n5F');
-
-update notes_tree set is_deleted = 1 where note_tree_id in ('TTiaU9xqnrca','TTQAy9c1vDId','TTHXWBJB2Y24','TTDV8DUK2IZA'
-  ,'TTI5JHODZYV5','TTBEZ8TMSJV4','TT1MDWZXE8ZI','TTJV7ZOA8907','TTUGE6N99QSO','TTN0OS17T0KM');
-
-delete from notes_history where note_history_id in ('KHAp5viTrrOfugzQ', 'xmhaS76piZn0QGzn', '25aL96ke8xmud9Bt');

db/migrations/0054__more_cleanup_inconsistencies.sql

@@ -1,3 +0,0 @@
-DELETE FROM notes_tree WHERE note_tree_id IN ('cb94QGgnCwOD', 'c3FWKhcVYyaQ');
-
-DELETE FROM notes_history WHERE note_history_id IN ('cdUD6ycs3l9h', 'OW4uh0HLtXaw');

db/migrations/0055__set_last_synced_push.sql

@@ -1 +0,0 @@
-UPDATE options SET opt_value = (SELECT MAX(id) FROM sync) WHERE opt_name = 'last_synced_push';

db/migrations/0056__fill_sync_again.sql

@@ -1,13 +0,0 @@
-DELETE FROM recent_notes;
-DELETE FROM sync;
-
-INSERT OR IGNORE INTO sync (entity_name, entity_id, sync_date, source_id)
-  SELECT 'notes', note_id, strftime('%Y-%m-%dT%H:%M:%S.000Z', 'now'), 'IMPORT' FROM notes;
-
-INSERT OR IGNORE INTO sync (entity_name, entity_id, sync_date, source_id)
-  SELECT 'notes_tree', note_tree_id, strftime('%Y-%m-%dT%H:%M:%S.000Z', 'now'), 'IMPORT' FROM notes_tree;
-
-INSERT OR IGNORE INTO sync (entity_name, entity_id, sync_date, source_id)
-  SELECT 'notes_history', note_history_id, strftime('%Y-%m-%dT%H:%M:%S.000Z', 'now'), 'IMPORT' FROM notes_history;
-
-UPDATE options SET opt_value = (SELECT MAX(id) FROM sync) WHERE opt_name IN ('last_synced_push', 'last_synced_pull');

db/migrations/0057__add_foreign_keys.sql

@@ -1,101 +0,0 @@
-INSERT INTO notes (note_id, note_title, note_text, date_created, date_modified)
-    VALUES ('root', 'root', 'root', strftime('%Y-%m-%dT%H:%M:%S.000Z', 'now'), strftime('%Y-%m-%dT%H:%M:%S.000Z', 'now'));
-
-CREATE TABLE IF NOT EXISTS "notes_mig" (
-    `note_id`	TEXT NOT NULL,
-    `note_title`	TEXT,
-    `note_text`	TEXT,
-    `is_protected`	INT NOT NULL DEFAULT 0,
-    `is_deleted`	INT NOT NULL DEFAULT 0,
-    `date_created`	TEXT NOT NULL,
-    `date_modified`	TEXT NOT NULL,
-    PRIMARY KEY(`note_id`)
-);
-
-INSERT INTO notes_mig (note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified)
-    SELECT note_id, note_title, note_text, is_protected, is_deleted, date_created, date_modified FROM notes;
-
-DROP TABLE notes;
-ALTER TABLE notes_mig RENAME TO notes;
-
-CREATE INDEX `IDX_notes_is_deleted` ON `notes` (
-    `is_deleted`
-);
-
-CREATE TABLE IF NOT EXISTS "notes_tree_mig" (
-    `note_tree_id`	TEXT NOT NULL,
-    `note_id`	TEXT NOT NULL,
-    `parent_note_id`	TEXT NOT NULL,
-    `note_position`	INTEGER NOT NULL,
-    `prefix`	TEXT,
-    `is_expanded`	BOOLEAN,
-    `is_deleted`	INTEGER NOT NULL DEFAULT 0,
-    `date_modified`	TEXT NOT NULL,
-    FOREIGN KEY(note_id) REFERENCES notes(note_id),
-    FOREIGN KEY(parent_note_id) REFERENCES notes(note_id),
-    PRIMARY KEY(`note_tree_id`)
-);
-
-INSERT INTO notes_tree_mig (note_tree_id, note_id, parent_note_id, note_position, prefix, is_expanded, is_deleted, date_modified)
-    SELECT note_tree_id, note_id, note_pid, note_pos, prefix, is_expanded, is_deleted, date_modified FROM notes_tree;
-
-DROP TABLE notes_tree;
-ALTER TABLE notes_tree_mig RENAME TO notes_tree;
-
-CREATE INDEX `IDX_notes_tree_note_tree_id` ON `notes_tree` (
-    `note_tree_id`
-);
-CREATE INDEX `IDX_notes_tree_note_id_parent_note_id` ON `notes_tree` (
-    `note_id`,
-    `parent_note_id`
-);
-CREATE INDEX `IDX_notes_tree_note_id` ON `notes_tree` (
-    `note_id`
-);
-
-CREATE TABLE IF NOT EXISTS "notes_history_mig" (
-    `note_history_id`	TEXT NOT NULL PRIMARY KEY,
-    `note_id`	TEXT NOT NULL,
-    `note_title`	TEXT,
-    `note_text`	TEXT,
-    `is_protected`	INT NOT NULL DEFAULT 0,
-    `date_modified_from` TEXT NOT NULL,
-    `date_modified_to` TEXT NOT NULL,
-    FOREIGN KEY(note_id) REFERENCES notes(note_id)
-);
-
-INSERT INTO notes_history_mig (note_history_id, note_id, note_title, note_text, is_protected, date_modified_from, date_modified_to)
-    SELECT note_history_id, note_id, note_title, note_text, is_protected, date_modified_from, date_modified_to FROM notes_history;
-
-DROP TABLE notes_history;
-ALTER TABLE notes_history_mig RENAME TO notes_history;
-
-CREATE INDEX `IDX_notes_history_note_id` ON `notes_history` (
-    `note_id`
-);
-CREATE INDEX `IDX_notes_history_note_date_modified_from` ON `notes_history` (
-    `date_modified_from`
-);
-CREATE INDEX `IDX_notes_history_note_date_modified_to` ON `notes_history` (
-    `date_modified_to`
-);
-
-DROP TABLE recent_notes;
-
-CREATE TABLE `recent_notes` (
-    `note_tree_id` TEXT NOT NULL PRIMARY KEY,
-    `note_path` TEXT NOT NULL,
-    `date_accessed` TEXT NOT NULL,
-    is_deleted INT,
-    FOREIGN KEY(note_tree_id) REFERENCES notes_tree(note_tree_id)
-);
-
-DROP TABLE event_log;
-
-CREATE TABLE `event_log` (
-    `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    `note_id`	TEXT,
-    `comment`	TEXT,
-    `date_added`	TEXT NOT NULL,
-    FOREIGN KEY(note_id) REFERENCES notes(note_id)
-);