2025-06-06 18:08:33 +02:00
1162 changed files with 114260 additions and 134203 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -1,4 +1,3 @@
 # These are supported funding model platforms

 github: [zadam]
-custom: ["https://paypal.me/za4am"]
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -1,52 +0,0 @@
-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
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@ -1,15 +0,0 @@
-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.
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@ -1,71 +0,0 @@
-# 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
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@ -1,53 +0,0 @@
-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 }}
--- a/.gitignore
+++ b/.gitignore
@ -8,9 +8,4 @@ yarn-error.log
 config.ini
 cert.key
 cert.crt
-server-package.json
-.idea/httpRequests/
-data/
-data-test/
-tmp/
-.eslintcache
+server-package.json
--- a/.gitpod.yml
+++ b/.gitpod.yml
@ -2,10 +2,10 @@ image:
  file: .gitpod.dockerfile

 tasks:
-    - before: nvm install 18.18.2 && nvm use 18.18.2
+    - before: nvm install 10 && nvm use 10
      init: npm install
      command: npm run start-server

 ports:
    - port: 8080
-      onOpen: open-preview
+      onOpen: open-preview
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@ -1,12 +1,11 @@
 <?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="2a4ac1e6-b828-4a2a-8e4a-3f59f10aff26">
+    <data-source source="LOCAL" name="document.db" uuid="4e69c96a-8a2b-43f5-9b40-d1608f75f7a4">
      <driver-ref>sqlite.xerial</driver-ref>
      <synchronize>true</synchronize>
      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/data/document.db</jdbc-url>
-      <working-dir>$ProjectFileDir$</working-dir>
+      <jdbc-url>jdbc:sqlite:$USER_HOME$/trilium-data/document.db</jdbc-url>
    </data-source>
  </component>
 </project>
--- a/.idea/git_toolbox_prj.xml
+++ b/.idea/git_toolbox_prj.xml
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GitToolBoxProjectSettings">
-    <option name="commitMessageIssueKeyValidationOverride">
-      <BoolValueOverride>
-        <option name="enabled" value="true" />
-      </BoolValueOverride>
-    </option>
-    <option name="commitMessageValidationEnabledOverride">
-      <BoolValueOverride>
-        <option name="enabled" value="true" />
-      </BoolValueOverride>
-    </option>
-  </component>
-</project>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@ -1,7 +1,7 @@
 <component name="InspectionProjectProfileManager">
  <profile version="1.0">
    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="JSUnfilteredForInLoop" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
      <option name="processCode" value="true" />
      <option name="processLiterals" value="true" />
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -1,8 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="JavaScriptSettings">
    <option name="languageLevel" value="ES6" />
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_16" default="true" project-jdk-name="openjdk-16" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_16" project-jdk-name="openjdk-16" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
 </project>
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@ -1,24 +1,18 @@
 {
    "version": "0.2.0",
    "configurations": [
-        // nodemon should be installed globally, use npm i -g nodemon
        {
-            "console": "integratedTerminal",
-            "internalConsoleOptions": "neverOpen",
-            "name": "nodemon start-server",
-            "program": "${workspaceFolder}/src/www",
+            "type": "node",
            "request": "launch",
-            "restart": true,
-            "runtimeExecutable": "nodemon",
-            "env": {
-                "TRILIUM_ENV": "dev",
-                "TRILIUM_DATA_DIR": "./data"
-            },
+            "name": "start-server",
            "skipFiles": [
                "<node_internals>/**"
            ],
-            "type": "node",
+            "env": {
+                "TRILIUM_ENV": "dev"
+            },
            "outputCapture": "std",
-        },
+            "program": "${workspaceFolder}/src/www"
+        }
    ]
 }
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,4 +0,0 @@
-{
-  "editor.formatOnSave": true,
-  "files.eol": "\n"
-}
--- a/1
+++ b/1
@ -1 +0,0 @@
-Please treat each other with respect and understanding.
--- a/29
+++ b/29
@ -1,12 +1,8 @@
-# !!! Don't try to build this Dockerfile directly, run it through bin/build-docker.sh script !!!
-FROM node:18.18.2-alpine
+FROM node:12.19.0-alpine

 # Create app directory
 WORKDIR /usr/src/app

-# Bundle app source
-COPY . .
-
 COPY server-package.json package.json

 # Install app dependencies
@ -20,23 +16,14 @@ RUN set -x \
        make \
        nasm \
        libpng-dev \
-        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
+        python \
+    && npm install --production \
+    && apk del .build-dependencies

-# Some setup tools need to be kept
-RUN apk add --no-cache su-exec shadow
+# Bundle app source
+COPY . .

-# Add application user and setup proper volume permissions
-RUN adduser -s /bin/false node; exit 0
+USER node

-# Start the application
 EXPOSE 8080
-CMD [ "./start-docker.sh" ]
-
-HEALTHCHECK --start-period=10s CMD exec su-exec node node docker_healthcheck.js
+CMD [ "node", "./src/www" ]
--- a/README-ZH_CN.md
+++ b/README-ZH_CN.md
@ -1,57 +1,43 @@
-# Trilium Notes
+# Trilium注意事项

-[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) | [Japanese](https://github.com/zadam/trilium/blob/master/README.ja.md) | [Italian](https://github.com/zadam/trilium/blob/master/README.it.md)
+[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"/>
-<img src="https://signmyrocket.com//uploads/2b2a523cd0c0e76cdbba95a89a9636b2_1676971281.jpg" alt="Trilium Notes supports Ukraine!" 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)功能
-* 使用[网页剪藏](https://github.com/zadam/trilium/wiki/Web-clipper)轻松保存互联网上的内容
+* [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内容

 ## 构建

-Trilium 可以用作桌面应用程序（Linux 和 Windows）或服务器（Linux）上托管的 Web 应用程序。虽然有 macOS 版本的桌面应用程序，但它[不受支持](https://github.com/zadam/trilium/wiki/FAQ#mac-os-support)。
+Trilium是作为桌面应用程序（Linux和Windows）或服务器上托管的Web应用程序（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 浏览器。
-
-Trilium 也提供 Flatpak：
-
-[<img width="240" src="https://flathub.org/assets/badges/flathub-badge-en.png">](https://flathub.org/apps/details/com.github.zadam.trilium)
+* 如果要在桌面上使用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浏览器。

 ## 文档

-[有关文档页面的完整列表，请参见 Wiki。](https://github.com/zadam/trilium/wiki/)
+[有关文档页面的完整列表，请参见Wiki。](https://github.com/zadam/trilium/wiki/)

-* [Wiki 的中文翻译版本](https://github.com/baddate/trilium/wiki/)
-
-您还可以阅读[个人知识库模式](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base)，以获取有关如何使用 Trilium 的灵感。
+您还可以阅读[个人知识库模式](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base)，以获取有关如何使用Trilium的灵感。

 ## 贡献

@ -59,7 +45,7 @@ Trilium 也提供 Flatpak：

 [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/zadam/trilium)

-或者克隆本仓库到本地，并运行
+或在本地克隆并运行

 ```
 npm install
@ -68,15 +54,7 @@ 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)
-
-## 捐赠
-
-你可以通过 GitHub Sponsors，[PayPal](https://paypal.me/za4am) 或者比特币 (bitcoin:bc1qv3svjn40v89mnkre5vyvs2xw6y8phaltl385d2) 来捐赠。
-
-## 许可证
-
-本程序是自由软件：你可以再发布本软件和/或修改本软件，只要你遵循 Free Software Foundation 发布的 GNU Affero General Public License 的第三版或者任何（由你选择）更晚的版本。
+* [jsPlumb](https://github.com/jsplumb/jsplumb)强大的可视化连接库。- 用于[关系图](https://github.com/zadam/trilium/wiki/Relation-map)和[链接图](https://github.com/zadam/trilium/wiki/Link-map)
--- a/README.it.md
+++ b/README.it.md
@ -1,93 +0,0 @@
-# Trilium Notes
-
-## Trilium è in manutenzione - vedi i dettagli in https://github.com/zadam/trilium/issues/4620
-
-Le discussioni preliminari sull'organizzazione si stanno svolgendo in [Trilium Next discussions](https://github.com/orgs/TriliumNext/discussions). 
-
-[![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) [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) | [Japanese](https://github.com/zadam/trilium/blob/master/README.ja.md) | [Italian](https://github.com/zadam/trilium/blob/master/README.it.md)
-
-
-Trilium Notes è un'applicazione per appunti ad organizzazione gerarchica, studiata per la costruzione di archivi di conoscenza personali di grandi dimensioni.
-
-Vedi [fotografie](https://github.com/zadam/trilium/wiki/Screenshot-tour) per una panoramica veloce:
-
-<a href="https://github.com/zadam/trilium/wiki/Screenshot-tour"><img src="https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png" alt="Trilium Screenshot" width="1000"></a>
-
-L'Ucraina si sta difendendo dall'aggressione russa, considera [donare all'esercito ucraino o a organizzazioni umanitarie](https://standforukraine.com/).
-
-<p float="left">
-  <img src="https://upload.wikimedia.org/wikipedia/commons/4/49/Flag_of_Ukraine.svg" alt="drawing" width="400"/>
-  <img src="https://signmyrocket.com//uploads/2b2a523cd0c0e76cdbba95a89a9636b2_1676971281.jpg" alt="Trilium Notes supports Ukraine!" width="570"/>
-</p>
-
-## 🎁 Funzionalità
-
-
-* Gli appunti possono essere organizzati in un albero di profondità arbitraria. Un singolo appunto può essere collocato in più posti nell'albero (vedi [clonazione](https://github.com/zadam/trilium/wiki/Cloning-notes))
-* Ricco editor visuale (WYSIWYG), con supporto -tra l'altro- per tabelle, immagini ed [espressioni matematiche](https://github.com/zadam/trilium/wiki/Text-notes#math-support) e con [formattazione automatica](https://github.com/zadam/trilium/wiki/Text-notes#autoformat) per markdown
-* Supporto per la modifica di [appunti con codice sorgente](https://github.com/zadam/trilium/wiki/Code-notes), con evidenziazione della sintassi
-* [Navigazione veloce](https://github.com/zadam/trilium/wiki/Note-navigation) tra gli appunti, ricerca testuale completa e [fissaggio degli appunti](https://github.com/zadam/trilium/wiki/Note-hoisting)
-* Supporto integrato ed automatico per le [revisioni degli appunti](https://github.com/zadam/trilium/wiki/Note-revisions)
-* Gli [attributi](https://github.com/zadam/trilium/wiki/Attributes) degli appunti possono essere utilizzati per l'organizzazione, per l'interrogazione e per lo scripting avanzato (prorgrammazione).
-* [Sincronizzazione](https://github.com/zadam/trilium/wiki/Synchronization) con un server di sincronizzazione auto-ospitato
-  * c'è un [servizio di terze parti per ospitare server di sincronizzazione](https://trilium.cc/paid-hosting)
-* [Condivisione](https://github.com/zadam/trilium/wiki/Sharing)  (pubblicazione) di appunti sull'internet pubblico
-* Robusta [crittografia](https://github.com/zadam/trilium/wiki/Protected-notes) configurabile singolarmente per ogni appunto
-* Disegno di diagrammi con Excalidraw (tipo di appunto "canvas")
-* [Mappe relazionali](https://github.com/zadam/trilium/wiki/Relation-map) e [mappe di collegamenti](https://github.com/zadam/trilium/wiki/Link-map) per visualizzare gli appunti e le loro relazioni
-* [Scripting](https://github.com/zadam/trilium/wiki/Scripts) - vedi [Esempi avanzati](https://github.com/zadam/trilium/wiki/Advanced-showcases)
-* [API REST](https://github.com/zadam/trilium/wiki/ETAPI) per l'automazione
-* Si adatta bene sia in termini di usabilità che di prestazioni fino ad oltre 100 000 appunti
-* Interfaccia utente ottimizzata per il [mobile](https://github.com/zadam/trilium/wiki/Mobile-frontend) (smartphone e tablet)
-* [Tema Notturno](https://github.com/zadam/trilium/wiki/Themes)
-* Supporto per importazione ed esportazione da e per [Evernote](https://github.com/zadam/trilium/wiki/Evernote-import) e [Markdown import](https://github.com/zadam/trilium/wiki/Markdown)
-* [Web Clipper](https://github.com/zadam/trilium/wiki/Web-clipper) per il salvataggio facile di contenuti web
-
-
-Dai un'occhiata a [awesome-trilium](https://github.com/Nriver/awesome-trilium) per temi, script, plugin e altro di terze parti.
-
-## 🏗 Rilasci
-
-
-Trilium è fornito come applicazione desktop (Linux e Windows) o come applicazione web ospitata sul tuo server (Linux). La versione desktop per Mac OS è disponibile, ma [non è supportata](https://github.com/zadam/trilium/wiki/FAQ#mac-os-support).
-
-* Se vuoi usare Trilium sul tuo desktop, scarica il rilascio binario per la tua piattaforma dall'[ultimo rilascio](https://github.com/zadam/trilium/releases/latest), decomprimi l'archivio e avvia l'eseguibile ```trilium```.
-* Se vuoi installare Trilium su un server, segui [questa pagina](https://github.com/zadam/trilium/wiki/Server-installation).
-  * Per ora solo Chrome e Firefox sono i browser supportati (testati).
-
-Trilium è anche disponibile su Flatpak:
-
-[<img width="240" src="https://flathub.org/assets/badges/flathub-badge-en.png">](https://flathub.org/apps/details/com.github.zadam.trilium)
-
-## 📝 Documentazione
-
-[Vedi la wiki per una lista completa delle pagine di documentazione.](https://github.com/zadam/trilium/wiki/)
-
-Puoi anche leggere ["Patterns of personal knowledge base"](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base) per avere un'ispirazione su come potresti utilizzare Trilium.
-
-## 💻 Contribuire
-
-Usa un ambiente di sviluppo basato su browser
-
-[![Apri in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/zadam/trilium)
-
-O clona localmente ed esegui
-```
-npm install
-npm run start-server
-```
-
-## 📢 Riconoscimenti
-
-* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - miglior editor visuale (WYSIWYG) sul mercato, squadra di sviluppo attenta e reattiva
-* [FancyTree](https://github.com/mar10/fancytree) -  libreria per alberi molto ricca di funzionalità, senza pari. Trilium Notes non sarebbe lo stesso senza di essa.
-* [CodeMirror](https://github.com/codemirror/CodeMirror) - editor di codice con supporto per un'enorme quantità di linguaggi.
-* [jsPlumb](https://github.com/jsplumb/jsplumb) - libreria per la  connettività visuale senza pari. Utilizzata per [mappe relazionali](https://github.com/zadam/trilium/wiki/Relation-map) e [mappe di collegamenti](https://github.com/zadam/trilium/wiki/Link-map).
-
-## 🤝 Supporto
-
-È possibile supportare Trilium attraverso Github Sponsors, [PayPal](https://paypal.me/za4am) o Bitcoin (bitcoin:bc1qv3svjn40v89mnkre5vyvs2xw6y8phaltl385d2).
-
-## 🔑 Licenza
-
-Questo programma è software libero: è possibile redistribuirlo e/o modificarlo nei termini della GNU Affero General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della Licenza, o (a propria scelta) qualsiasi versione successiva.
--- a/README.ja.md
+++ b/README.ja.md
@ -1,83 +0,0 @@
-# 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) | [Japanese](https://github.com/zadam/trilium/blob/master/README.ja.md) | [Italian](https://github.com/zadam/trilium/blob/master/README.it.md)
-
-Trilium Notes は、大規模な個人知識ベースの構築に焦点を当てた、階層型ノートアプリケーションです。概要は[スクリーンショット](https://github.com/zadam/trilium/wiki/Screenshot-tour)をご覧ください：
-
-<a href="https://github.com/zadam/trilium/wiki/Screenshot-tour"><img src="https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png" alt="Trilium Screenshot" width="1000"></a>
-
-ウクライナは現在、ロシアの侵略から自国を守っています。[ウクライナ軍や人道的な慈善団体への寄付](https://standforukraine.com/)をご検討ください。
-
-<p float="left">
-  <img src="https://upload.wikimedia.org/wikipedia/commons/4/49/Flag_of_Ukraine.svg" alt="drawing" width="400"/>
-  <img src="https://signmyrocket.com//uploads/2b2a523cd0c0e76cdbba95a89a9636b2_1676971281.jpg" alt="Trilium Notes supports Ukraine!" width="570"/>
-</p>
-
-## 🎁 特徴
-
-* ノートは、任意の深さのツリーに配置できます。単一のノートをツリー内の複数の場所に配置できます ([cloning](https://github.com/zadam/trilium/wiki/Cloning-notes) を参照)
-* マークダウン[オートフォーマット](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)による、表、画像、[数学](https://github.com/zadam/trilium/wiki/Text-notes#math-support)などの豊富な WYSIWYG ノート編集機能
-* シンタックスハイライトを含む[ソースコード付きノート](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://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)を参照
-* 自動化のための [REST API](https://github.com/zadam/trilium/wiki/ETAPI)
-* ユーザビリティとパフォーマンスの両方で 100 000 ノート以上に拡張可能
-* スマートフォンとタブレット向けのタッチ最適化[モバイルフロントエンド](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 コンテンツを簡単に保存するための [Web クリッパー](https://github.com/zadam/trilium/wiki/Web-clipper)
-
-サードパーティのテーマ、スクリプト、プラグインなどは、 [awesome-trilium](https://github.com/Nriver/awesome-trilium) をチェックしてください。
-
-## 🏗 ビルド
-
-Trilium は、デスクトップアプリケーション（Linux、Windows）またはサーバー上でホストされるウェブアプリケーション（Linux）として提供されます。 Mac OS のデスクトップビルドも利用可能ですが、 [unsupported](https://github.com/zadam/trilium/wiki/FAQ#mac-os-support) となっています。
-
-* デスクトップで Trilium を使用したい場合は、 [latest release](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/)
-
-また、[個人的な知識基盤のパターン](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base)を読むと、 Trilium の使い方のヒントを得ることができます。
-
-## 💻 コントリビュート
-
-ブラウザベースの開発環境を使用
-
-[![Open in 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)で使用。
-
-## 🤝 サポート
-
-GitHub スポンサー、[PayPal](https://paypal.me/za4am)もしくは Bitcoin (bitcoin:bc1qv3svjn40v89mnkre5vyvs2xw6y8phaltl385d2) にて Trilium をサポートすることができます。
-
-## 🔑 ライセンス
-
-このプログラムはフリーソフトウェアです：フリーソフトウェア財団が発行した GNU Affero General Public License のバージョン3、またはそれ以降のバージョンのいずれかに従って、再配布および/または改変することができます。
--- a/README.md
+++ b/README.md
@ -1,29 +1,13 @@
-> [!IMPORTANT]
-> The TriliumNext team has received the original Trilium Notes repository (`zadam/trilium`). We will soon enter the process in which TriliumNext will become the original Trilium Notes again.
-> 
-> For now, we invite you to have a look at the [TriliumNext](https://github.com/TriliumNext/Notes) repo. You should be able to migrate to TriliumNext without any problems from the original Trilium.
-> 
-> Thanks to @zadam for his original work and for allowing us to continue using the Trilium Notes name once again.
-
 # Trilium Notes

-[![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) [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) | [Japanese](https://github.com/zadam/trilium/blob/master/README.ja.md) | [Italian](https://github.com/zadam/trilium/blob/master/README.it.md)
+[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:

-Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases. 
+![](https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png)

-See [screenshots](https://github.com/zadam/trilium/wiki/Screenshot-tour) for quick overview:
-
-<a href="https://github.com/zadam/trilium/wiki/Screenshot-tour"><img src="https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png" alt="Trilium Screenshot" width="1000"></a>
-
-Ukraine is currently defending itself from Russian aggression, please consider [donating to Ukrainian Army or humanitarian charities](https://standforukraine.com/).
-
-<p float="left">
-  <img src="https://upload.wikimedia.org/wikipedia/commons/4/49/Flag_of_Ukraine.svg" alt="drawing" width="400"/>
-  <img src="https://signmyrocket.com//uploads/2b2a523cd0c0e76cdbba95a89a9636b2_1676971281.jpg" alt="Trilium Notes supports Ukraine!" width="570"/>
-</p>
-
-## 🎁 Features
+## 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))
 * Rich WYSIWYG note editing including e.g. tables, images and [math](https://github.com/zadam/trilium/wiki/Text-notes#math-support) with markdown [autoformat](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)
@ -32,22 +16,16 @@ Ukraine is currently defending itself from Russian aggression, please consider [
 * 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)
 * [Evernote](https://github.com/zadam/trilium/wiki/Evernote-import) and [Markdown import & export](https://github.com/zadam/trilium/wiki/Markdown)
 * [Web Clipper](https://github.com/zadam/trilium/wiki/Web-clipper) for easy saving of web content

-Check out [awesome-trilium](https://github.com/Nriver/awesome-trilium) for 3rd party themes, scripts, plugins and more.
-
-## 🏗 Builds
+## Builds

 Trilium is provided as either desktop application (Linux and Windows) or web application hosted on your server (Linux). Mac OS desktop build is available, but it is [unsupported](https://github.com/zadam/trilium/wiki/FAQ#mac-os-support).

@ -55,17 +33,13 @@ 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
+## Documentation

 [See wiki for complete list of documentation pages.](https://github.com/zadam/trilium/wiki/)

 You can also read [Patterns of personal knowledge base](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base) to get some inspiration on how you might use Trilium.

-## 💻 Contribute
+## Contribute

 Use a browser based dev environment

@ -77,17 +51,13 @@ npm install
 npm run start-server
 ```

-## 📢 Shoutouts
+## Shoutouts

 * [CKEditor 5](https://github.com/ckeditor/ckeditor5) - best WYSIWYG editor on the market, very interactive and listening team
 * [FancyTree](https://github.com/mar10/fancytree) - very feature rich tree library without real competition. Trilium Notes would not be the same without it.
 * [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)

-## 🤝 Support
-
-You can support Trilium using GitHub Sponsors, [PayPal](https://paypal.me/za4am) or Bitcoin (bitcoin:bc1qv3svjn40v89mnkre5vyvs2xw6y8phaltl385d2).
-
-## 🔑 License
+## 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.
--- a/README.ru.md
+++ b/README.ru.md
@ -1,17 +1,12 @@
 # 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) | [Japanese](https://github.com/zadam/trilium/blob/master/README.ja.md) | [Italian](https://github.com/zadam/trilium/blob/master/README.it.md)
+[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"/>
-<img src="https://signmyrocket.com//uploads/2b2a523cd0c0e76cdbba95a89a9636b2_1676971281.jpg" alt="Trilium Notes supports Ukraine!" width="600"/>
-
 ## Возможности

 * Заметки можно расположить в виде дерева произвольной глубины. Отдельную заметку можно разместить в нескольких местах дерева (см. [клонирование](https://github.com/zadam/trilium/wiki/Cloning-notes))
--- a/bin/better-sqlite3/linux-desktop-better_sqlite3.node
+++ b/bin/better-sqlite3/linux-desktop-better_sqlite3.node
--- a/bin/better-sqlite3/linux-server-better_sqlite3.node
+++ b/bin/better-sqlite3/linux-server-better_sqlite3.node
--- a/bin/better-sqlite3/mac-arm64-better_sqlite3.node
+++ b/bin/better-sqlite3/mac-arm64-better_sqlite3.node
--- a/bin/better-sqlite3/mac-better_sqlite3.node
+++ b/bin/better-sqlite3/mac-better_sqlite3.node
--- a/bin/better-sqlite3/mac-x64-better_sqlite3.node
+++ b/bin/better-sqlite3/mac-x64-better_sqlite3.node
--- a/bin/better-sqlite3/win-better_sqlite3.node
+++ b/bin/better-sqlite3/win-better_sqlite3.node
--- a/bin/build-debian.sh
+++ b/bin/build-debian.sh
@ -4,4 +4,4 @@ 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
+./node_modules/.bin/electron-installer-debian --config bin/deb-options.json --options.version=${VERSION} --arch amd64
--- a/bin/build-linux-x64.sh
+++ b/bin/build-linux-x64.sh
@ -2,37 +2,44 @@

 SRC_DIR=./dist/trilium-linux-x64-src

-[ "$1" != "DONTCOPY" ] && ./bin/copy-trilium.sh "$SRC_DIR"
+if [ "$1" != "DONTCOPY" ]
+then
+    ./bin/copy-trilium.sh $SRC_DIR
+fi

-rm -r "$SRC_DIR"/src/public/app-dist/*.mobile.*
+rm -r $SRC_DIR/src/public/app-dist/*.mobile.*

 echo "Copying required linux-x64 binaries"
-cp -r bin/better-sqlite3/linux-desktop-better_sqlite3.node "$SRC_DIR"/node_modules/better-sqlite3/build/Release/better_sqlite3.node
+
+cp -r bin/better-sqlite3/linux-desktop-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node

 echo "Packaging linux x64 electron build"
-./node_modules/.bin/electron-packager "$SRC_DIR" --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
+
+./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite

 BUILD_DIR=./dist/trilium-linux-x64
-rm -rf "$BUILD_DIR"
+rm -rf $BUILD_DIR

-mv "./dist/Trilium Notes-linux-x64" "$BUILD_DIR"
+mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR

-cp images/app-icons/png/128x128.png "$BUILD_DIR"/icon.png
-cp bin/tpl/anonymize-database.sql "$BUILD_DIR"/
+cp images/app-icons/png/128x128.png $BUILD_DIR/icon.png

-cp -r dump-db "$BUILD_DIR"/
-rm -rf "$BUILD_DIR"/dump-db/node_modules
+# removing software WebGL binaries because they are pretty huge and not necessary
+rm -r $BUILD_DIR/swiftshader

-for f in 'trilium-portable' 'trilium-safe-mode' 'trilium-no-cert-check'; do
-    cp bin/tpl/"$f".sh "$BUILD_DIR"/
-    chmod 755 "$BUILD_DIR"/"$f".sh
-done
+cp bin/tpl/trilium-portable.sh $BUILD_DIR/
+chmod 755 $BUILD_DIR/trilium-portable.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`

-pushd dist
-    tar cJf "trilium-linux-x64-${VERSION}.tar.xz" trilium-linux-x64
-popd
+cd dist
+
+tar cJf trilium-linux-x64-${VERSION}.tar.xz trilium-linux-x64
+
+cd ..

 bin/build-debian.sh
--- a/bin/build-mac-arm64.sh
+++ b/bin/build-mac-arm64.sh
@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-SRC_DIR=./dist/trilium-mac-arm64-src
-
-if [ "$1" != "DONTCOPY" ]
-then
-    ./bin/copy-trilium.sh $SRC_DIR
-fi
-
-echo "Copying required mac arm64 binaries"
-
-cp -r bin/better-sqlite3/mac-arm64-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
-
-rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
-
-echo "Packaging mac arm64 electron build"
-
-./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=darwin --arch=arm64 --overwrite --icon=images/app-icons/mac/icon.icns
-
-BUILD_DIR=./dist/trilium-mac-arm64
-rm -rf $BUILD_DIR
-
-# Mac build has by default useless directory level
-mv "./dist/Trilium Notes-darwin-arm64" $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 arm64 electron distribution..."
-
-VERSION=`jq -r ".version" package.json`
-
-cd dist
-
-rm trilium-mac-arm64-${VERSION}.zip
-zip -r9 --symlinks trilium-mac-arm64-${VERSION}.zip trilium-mac-arm64
--- a/bin/build-mac-x64.sh
+++ b/bin/build-mac-x64.sh
@ -7,9 +7,9 @@ then
    ./bin/copy-trilium.sh $SRC_DIR
 fi

-echo "Copying required mac x64 binaries"
+echo "Copying required mac binaries"

-cp -r bin/better-sqlite3/mac-x64-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
+cp -r bin/better-sqlite3/mac-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node

 rm -r $SRC_DIR/src/public/app-dist/*.mobile.*

@ -23,11 +23,6 @@ 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`
--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@ -1,7 +1,7 @@
 #!/usr/bin/env bash

 PKG_DIR=dist/trilium-linux-x64-server
-NODE_VERSION=18.18.2
+NODE_VERSION=14.16.1

 if [ "$1" != "DONTCOPY" ]
 then
@ -20,19 +20,12 @@ 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
--- a/bin/build-win-x64.sh
+++ b/bin/build-win-x64.sh
@ -22,12 +22,11 @@ rm -rf $BUILD_DIR

 mv "./dist/Trilium Notes-win32-x64" $BUILD_DIR

-cp bin/tpl/anonymize-database.sql $BUILD_DIR/
+# removing software WebGL binaries because they are pretty huge and not necessary
+rm -r $BUILD_DIR/swiftshader

-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/
+cp bin/tpl/trilium-portable.bat $BUILD_DIR/
+cp bin/tpl/trilium-no-cert-check.bat $BUILD_DIR/

 echo "Zipping windows x64 electron distribution..."
 VERSION=`jq -r ".version" package.json`
--- a/bin/build.sh
+++ b/bin/build.sh
@ -13,14 +13,11 @@ cp -r $SRC_DIR ./dist/trilium-linux-x64-src
 cp -r $SRC_DIR ./dist/trilium-linux-x64-server
 cp -r $SRC_DIR ./dist/trilium-windows-x64-src
 cp -r $SRC_DIR ./dist/trilium-mac-x64-src
-cp -r $SRC_DIR ./dist/trilium-mac-arm64-src

 bin/build-win-x64.sh DONTCOPY

 bin/build-mac-x64.sh DONTCOPY

-bin/build-mac-arm64.sh DONTCOPY
-
 bin/build-linux-x64.sh DONTCOPY

 bin/build-server.sh DONTCOPY
--- a/bin/copy-trilium.sh
+++ b/bin/copy-trilium.sh
@ -4,49 +4,48 @@ if [[ $# -eq 0 ]] ; then
    echo "Missing argument of target directory"
    exit 1
 fi
-if ! [[ $(which npm) ]]; then
-    echo "Missing npm"
-    exit 1
-fi

-n exec 18.18.2 npm run webpack || npm run webpack
+n exec 12 npm run webpack

-DIR="$1"
+DIR=$1

-rm -rf "$DIR"
-mkdir -pv "$DIR"
+rm -rf $DIR
+mkdir $DIR

 echo "Copying Trilium to build directory $DIR"

-for d in 'images' 'libraries' 'src' 'db'; do
-    cp -r "$d" "$DIR"/
-done
-for f in 'package.json' 'package-lock.json' 'README.md' 'LICENSE' 'config-sample.ini' 'electron.js'; do
-    cp "$f" "$DIR"/
-done
-cp webpack-* "$DIR"/      # here warning because there is no 'webpack-*', but webpack.config.js only
+cp -r images $DIR/
+cp -r libraries $DIR/
+cp -r src $DIR/
+cp -r db $DIR/
+cp -r package.json $DIR/
+cp -r package-lock.json $DIR/
+cp -r README.md $DIR/
+cp -r LICENSE $DIR/
+cp -r config-sample.ini $DIR/
+cp -r electron.js $DIR/
+cp webpack-* $DIR/

 # run in subshell (so we return to original dir)
-(cd $DIR && n exec 18.18.2 npm install --only=prod)
+(cd $DIR && n exec 12 npm install --only=prod)

-if [[ -d "$DIR"/node_modules ]]; then
 # cleanup of useless files in dependencies
-    for d in 'image-q/demo' 'better-sqlite3/Release' 'better-sqlite3/deps/sqlite3.tar.gz' '@jimp/plugin-print/fonts' 'jimp/browser' 'jimp/fonts'; do
-        [[ -e "$DIR"/node_modules/"$d" ]] && rm -rv "$DIR"/node_modules/"$d"
-    done
+rm -r $DIR/node_modules/image-q/demo
+rm -r $DIR/node_modules/better-sqlite3/Release
+rm -r $DIR/node_modules/better-sqlite3/deps/sqlite3.tar.gz
+rm -r $DIR/node_modules/@jimp/plugin-print/fonts
+rm -r $DIR/node_modules/jimp/browser
+rm -r $DIR/node_modules/jimp/fonts

 # delete all tests (there are often large images as test file for jimp etc.)
-    for d in 'test' 'docs' 'demo'; do
-        find "$DIR"/node_modules -name "$d" -exec rm -rf {} \;
-    done
-fi
+find $DIR/node_modules -name test -exec rm -rf {} \;
+find $DIR/node_modules -name docs -exec rm -rf {} \;
+find $DIR/node_modules -name demo -exec rm -rf {} \;

 find $DIR/libraries -name "*.map" -type f -delete

-d="$DIR"/src/public
-[[ -d "$d"/app-dist ]] || mkdir -pv "$d"/app-dist
-cp "$d"/app/share.js "$d"/app-dist/
-cp -r "$d"/app/doc_notes "$d"/app-dist/
+rm -r $DIR/src/public/app

-rm -rf "$d"/app
-unset f d DIR
+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
--- a/bin/create-anonymization-script.js
+++ b/bin/create-anonymization-script.js
@ -1,7 +0,0 @@
-#!/usr/bin/env node
-
-const anonymizationService = require('../src/services/anonymization.js');
-const fs = require('fs');
-const path = require('path');
-
-fs.writeFileSync(path.resolve(__dirname, 'tpl', 'anonymize-database.sql'), anonymizationService.getFullAnonymizationScript());
--- a/bin/deb-options.json
+++ b/bin/deb-options.json
@ -1,7 +1,6 @@
 {
  "src": "dist/trilium-linux-x64",
  "dest": "dist/",
-  "compression": "xz",
  "name": "trilium",
  "productName": "Trilium Notes",
  "genericName": "Note taker",
@ -12,4 +11,4 @@
  "bin": "trilium",
  "icon": "dist/trilium-linux-x64/icon.png",
  "categories": [ "Office" ]
-}
+}
--- a/bin/export-schema.sh
+++ b/bin/export-schema.sh
@ -2,6 +2,6 @@

 SCHEMA_FILE_PATH=db/schema.sql

-sqlite3 ./data/document.db .schema | grep -v "sqlite_sequence" > "$SCHEMA_FILE_PATH"
+sqlite3 ~/trilium-data/document.db .schema | grep -v "sqlite_sequence" > "$SCHEMA_FILE_PATH"

 echo "DB schema exported to $SCHEMA_FILE_PATH"
--- a/bin/push-docker-image.sh
+++ b/bin/push-docker-image.sh
@ -8,9 +8,9 @@ fi
 VERSION=$1
 SERIES=${VERSION:0:4}-latest

-docker push zadam/trilium:$VERSION
-docker push zadam/trilium:$SERIES
+sudo docker push zadam/trilium:$VERSION
+sudo docker push zadam/trilium:$SERIES

 if [[ $1 != *"beta"* ]]; then
-  docker push zadam/trilium:latest
+  sudo docker push zadam/trilium:latest
 fi
--- a/bin/release-flatpack.sh
+++ b/bin/release-flatpack.sh
@ -1,57 +0,0 @@
-#!/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
--- a/bin/release.sh
+++ b/bin/release.sh
@ -48,7 +48,6 @@ LINUX_X64_BUILD=trilium-linux-x64-$VERSION.tar.xz
 DEBIAN_X64_BUILD=trilium_${VERSION}_amd64.deb
 WINDOWS_X64_BUILD=trilium-windows-x64-$VERSION.zip
 MAC_X64_BUILD=trilium-mac-x64-$VERSION.zip
-MAC_ARM64_BUILD=trilium-mac-arm64-$VERSION.zip
 SERVER_BUILD=trilium-linux-x64-server-$VERSION.tar.xz

 echo "Creating release in GitHub"
@ -63,11 +62,20 @@ echo "$GITHUB_CLI_AUTH_TOKEN" | gh auth login --with-token

 gh release create "$TAG" \
    --title "$TAG release" \
-    --notes "" \
+    --notes ""
    $EXTRA \
    "dist/$DEBIAN_X64_BUILD" \
    "dist/$LINUX_X64_BUILD" \
    "dist/$WINDOWS_X64_BUILD" \
    "dist/$MAC_X64_BUILD" \
-    "dist/$MAC_ARM64_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!"
--- a/bin/tpl/anonymize-database.sql
+++ b/bin/tpl/anonymize-database.sql
@ -1,50 +0,0 @@
-UPDATE etapi_tokens SET tokenHash = 'API token hash value';
-UPDATE notes SET title = 'title'
-             WHERE noteId NOT IN ('root', '_hidden', '_share')
-               AND SUBSTR(noteId, 1, 8) != '_options'
-               AND SUBSTR(noteId, 1, 3) != '_lb';
-UPDATE blobs SET content = 'text' WHERE content IS NOT NULL;
-UPDATE revisions SET title = 'title';
-
-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', 'revisionsWidgetDisabled',
-       'whatLinksHereWidgetDisabled', 'similarNotesWidgetDisabled', 'workspace', 'workspaceIconClass',
-       'workspaceTabBackgroundColor', 'workspaceCalendarRoot', 'workspaceTemplate', 'searchHome', 'workspaceInbox',
-       'workspaceSearchHome', 'sqlConsoleHome', 'datePattern', 'pageSize', 'viewType', 'mapRootNoteId',
-       'bookmarkFolder', 'sorted', 'sortDirection', 'sortFoldersFirst', 'sortNatural', 'sortLocale', 'top',
-       'fullContentWidth', 'shareHiddenFromTree', 'shareExternalLink', 'shareOmitDefaultCss', 'shareRoot', 'shareDescription',
-       'shareRaw', 'shareDisallowRobotIndexing', 'shareIndex', 'displayRelations', 'hideRelations', 'titleTemplate',
-       'template', 'toc', 'color', 'keepCurrentHoisting', 'executeButton', 'executeDescription', 'newNotesOnTop',
-       'clipperInbox', 'internalLink', 'imageLink', 'relationMapLink', 'includeMapLink', 'runOnNoteCreation',
-       'runOnNoteTitleChange', 'runOnNoteChange', 'runOnNoteContentChange', 'runOnNoteDeletion', 'runOnBranchCreation', 'runOnBranchChange',
-       'runOnBranchDeletion', 'runOnChildNoteCreation', 'runOnAttributeCreation', 'runOnAttributeChange', 'template',
-       'inherit', 'widget', 'renderNote', 'shareCss', 'shareJs', 'shareTemplate', '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', 'revisionsWidgetDisabled',
-       'whatLinksHereWidgetDisabled', 'similarNotesWidgetDisabled', 'workspace', 'workspaceIconClass',
-       'workspaceTabBackgroundColor', 'workspaceCalendarRoot', 'workspaceTemplate', 'searchHome', 'workspaceInbox',
-       'workspaceSearchHome', 'sqlConsoleHome', 'datePattern', 'pageSize', 'viewType', 'mapRootNoteId',
-       'bookmarkFolder', 'sorted', 'sortDirection', 'sortFoldersFirst', 'sortNatural', 'sortLocale', 'top',
-       'fullContentWidth', 'shareHiddenFromTree', 'shareExternalLink', 'shareOmitDefaultCss', 'shareRoot', 'shareDescription',
-       'shareRaw', 'shareDisallowRobotIndexing', 'shareIndex', 'displayRelations', 'hideRelations', 'titleTemplate',
-       'template', 'toc', 'color', 'keepCurrentHoisting', 'executeButton', 'executeDescription', 'newNotesOnTop',
-       'clipperInbox', 'internalLink', 'imageLink', 'relationMapLink', 'includeMapLink', 'runOnNoteCreation',
-       'runOnNoteTitleChange', 'runOnNoteChange', 'runOnNoteContentChange', 'runOnNoteDeletion', 'runOnBranchCreation', 'runOnBranchChange',
-       'runOnBranchDeletion', 'runOnChildNoteCreation', 'runOnAttributeCreation', 'runOnAttributeChange', 'template',
-       'inherit', 'widget', 'renderNote', 'shareCss', 'shareJs', 'shareTemplate', '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;
--- a/bin/tpl/trilium-no-cert-check.bat
+++ b/bin/tpl/trilium-no-cert-check.bat
@ -1,23 +1,4 @@
-@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
--- a/bin/tpl/trilium-portable.bat
+++ b/bin/tpl/trilium-portable.bat
@ -1,23 +1,4 @@
-@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
+start trilium.exe
--- a/bin/tpl/trilium-safe-mode.bat
+++ b/bin/tpl/trilium-safe-mode.bat
@ -1,23 +0,0 @@
-@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
--- a/bin/tpl/trilium-safe-mode.sh
+++ b/bin/tpl/trilium-safe-mode.sh
@ -1,7 +0,0 @@
-#!/usr/bin/env sh
-
-DIR=`dirname "$0"`
-export TRILIUM_SAFE_MODE=1
-
-"$DIR/trilium" --disable-gpu
-
--- a/config-sample.ini
+++ b/config-sample.ini
@ -16,14 +16,8 @@ noBackup=false
 # host=0.0.0.0
 # port setting is relevant only for web deployments, desktop builds run on a fixed port (changeable with TRILIUM_PORT environment variable)
 port=8080
-# true for TLS/SSL/HTTPS (secure), false for HTTP (insecure).
+# true for TLS/SSL/HTTPS (secure), false for HTTP (unsecure).
 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
--- a/db/TODO.txt
+++ b/db/TODO.txt
@ -1,5 +0,0 @@
- isDeleted = 0 by default
- unify readOnly handling to a single attribute:
-  * readOnly - like now
-  * readOnly=auto - like without readOnly (used to override inherited readOnly)
-  * readOnly=never - like autoReadOnlyDisabled
--- a/db/demo.zip
+++ b/db/demo.zip
--- a/db/migrations/0113__left_pane_size_options.sql
+++ b/db/migrations/0113__left_pane_size_options.sql
@ -0,0 +1,5 @@
+INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
+VALUES ('leftPaneMinWidth', '350', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
+VALUES ('leftPaneWidthPercent', '20', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0114__fix_root_note_cycle.sql
+++ b/db/migrations/0114__fix_root_note_cycle.sql
@ -0,0 +1 @@
+update branches set parentNoteId = 'none' where branchId = 'root'
--- a/db/migrations/0115__images_in_notes.sql
+++ b/db/migrations/0115__images_in_notes.sql
@ -0,0 +1,75 @@
+-- first fix deleted status of existing images
+UPDATE note_images SET isDeleted = 1 WHERE noteId IN (SELECT noteId FROM notes WHERE isDeleted = 1);
+
+-- we don't need set data to null because table is going to be dropped anyway and we want image size into attribute
+UPDATE images SET isDeleted = 1 WHERE imageId NOT IN (SELECT imageId FROM note_images WHERE isDeleted = 0);
+
+-- allow null for note content (for deleted notes)
+CREATE TABLE IF NOT EXISTS "notes_mig" (
+  `noteId`	TEXT NOT NULL,
+  `title`	TEXT NOT NULL DEFAULT "note",
+  `content`	TEXT NULL DEFAULT NULL,
+  `isProtected`	INT NOT NULL DEFAULT 0,
+  `type` TEXT NOT NULL DEFAULT 'text',
+  `mime` TEXT NOT NULL DEFAULT 'text/html',
+  `hash` TEXT DEFAULT "" NOT NULL,
+  `isDeleted`	INT NOT NULL DEFAULT 0,
+  `dateCreated`	TEXT NOT NULL,
+  `dateModified`	TEXT NOT NULL,
+  PRIMARY KEY(`noteId`)
+);
+
+INSERT INTO notes_mig (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified, type, mime, hash)
+SELECT noteId, title, content, isProtected, isDeleted, dateCreated, dateModified, type, mime, hash FROM notes;
+
+DROP TABLE notes;
+
+ALTER TABLE notes_mig RENAME TO notes;
+
+CREATE TABLE "links" (
+  `linkId`	TEXT NOT NULL,
+  `noteId`	TEXT NOT NULL,
+  `targetNoteId`	TEXT NOT NULL,
+  `type` TEXT NOT NULL,
+  `hash` TEXT DEFAULT "" NOT NULL,
+  `isDeleted`	INTEGER NOT NULL DEFAULT 0,
+  `dateCreated`	TEXT NOT NULL,
+  `dateModified`	TEXT NOT NULL,
+  PRIMARY KEY(`linkId`)
+);
+
+INSERT INTO links (linkId, noteId, targetNoteId, type, isDeleted, dateCreated, dateModified)
+  SELECT 'L' || SUBSTR(noteImageId, 2), noteId, imageId, 'image', isDeleted, dateCreated, dateModified FROM note_images;
+
+INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified, hash, dateCreated)
+  SELECT 'B' || SUBSTR(noteImageId, 2), imageId, noteId, 100, '', 0, isDeleted, dateModified, hash, dateCreated FROM note_images;
+
+DROP TABLE note_images;
+
+INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified, type, mime, hash)
+  SELECT imageId, name, data, 0, isDeleted, dateCreated, dateModified, 'image', 'image/' || format, hash FROM images;
+
+INSERT INTO attributes (attributeId, noteId, type, name, value, position, dateCreated, dateModified, isDeleted, hash, isInheritable)
+  SELECT 'O' || SUBSTR(imageId, 2), imageId, 'label', 'originalFileName', name, 0, dateCreated, dateModified, isDeleted, '', 0 FROM images;
+
+INSERT INTO attributes (attributeId, noteId, type, name, value, position, dateCreated, dateModified, isDeleted, hash, isInheritable)
+SELECT 'F' || SUBSTR(imageId, 2), imageId, 'label', 'fileSize', LENGTH(data), 0, dateCreated, dateModified, isDeleted, '', 0 FROM images;
+
+DROP TABLE images;
+
+INSERT INTO sync (entityName, entityId, sourceId, syncDate)
+SELECT 'attributes', 'O' || SUBSTR(entityId, 2), sourceId, syncDate FROM sync WHERE entityName = 'images';
+
+INSERT INTO sync (entityName, entityId, sourceId, syncDate)
+SELECT 'attributes', 'F' || SUBSTR(entityId, 2), sourceId, syncDate FROM sync WHERE entityName = 'images';
+
+UPDATE sync SET entityName = 'notes' WHERE entityName = 'images';
+
+INSERT INTO sync (entityName, entityId, sourceId, syncDate)
+SELECT 'links', 'L' || SUBSTR(entityId, 2), sourceId, syncDate FROM sync WHERE entityName = 'note_images';
+
+INSERT INTO sync (entityName, entityId, sourceId, syncDate)
+  SELECT 'branches', 'B' || SUBSTR(entityId, 2), sourceId, syncDate FROM sync WHERE entityName = 'note_images';
+
+DELETE FROM sync WHERE entityName = 'note_images';
+DELETE FROM sync WHERE entityName = 'images';
--- a/db/migrations/0116__add_indexes.sql
+++ b/db/migrations/0116__add_indexes.sql
@ -0,0 +1,14 @@
+create index IDX_links_noteId_index
+  on links (noteId);
+
+create index IDX_links_targetNoteId_index
+  on links (targetNoteId);
+
+create index IDX_attributes_name_index
+  on attributes (name);
+
+create index IDX_attributes_noteId_index
+  on attributes (noteId);
+
+create index IDX_attributes_value_index
+  on attributes (value);
--- a/db/migrations/0117__fix_attributes_of_deleted_notes.sql
+++ b/db/migrations/0117__fix_attributes_of_deleted_notes.sql
@ -0,0 +1 @@
+UPDATE attributes SET isDeleted = 1 WHERE noteId IN (SELECT noteId FROM notes WHERE isDeleted = 1);
--- a/db/migrations/0118__fix_broken_relations.sql
+++ b/db/migrations/0118__fix_broken_relations.sql
@ -0,0 +1 @@
+UPDATE attributes SET isDeleted = 1 WHERE type = 'relation' AND value NOT IN (SELECT noteId FROM notes WHERE notes.isDeleted = 0);
--- a/db/migrations/0119__rename_mirror_to_inverse.sql
+++ b/db/migrations/0119__rename_mirror_to_inverse.sql
@ -0,0 +1 @@
+UPDATE attributes SET value = replace(value, 'mirrorRelation', 'inverseRelation') WHERE type = 'relation-definition';
--- a/db/migrations/0120__migrate_hideInAutocomplete_to_archived.sql
+++ b/db/migrations/0120__migrate_hideInAutocomplete_to_archived.sql
@ -0,0 +1 @@
+UPDATE attributes SET name = 'archived' where name = 'hideInAutocomplete';
--- a/db/migrations/0121__add_hoisting_option.sql
+++ b/db/migrations/0121__add_hoisting_option.sql
@ -0,0 +1,2 @@
+INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
+VALUES ('hoistedNoteId', 'root', '2018-12-11T18:31:00.874Z', '2018-12-11T18:31:00.874Z', 0);
--- a/db/migrations/0122__add_iv_to_columns.js
+++ b/db/migrations/0122__add_iv_to_columns.js
@ -0,0 +1,62 @@
+const sql = require('../../src/services/sql');
+
+function prependIv(cipherText, ivText) {
+    const arr = ivText.split("").map(c => parseInt(c) || 0);
+    const iv = Buffer.from(arr);
+    const payload = Buffer.from(cipherText, 'base64');
+    const complete = Buffer.concat([iv, payload]);
+
+    return complete.toString('base64');
+}
+
+async function updateEncryptedDataKey() {
+    const encryptedDataKey = await sql.getValue("SELECT value FROM options WHERE name = 'encryptedDataKey'");
+    const encryptedDataKeyIv = await sql.getValue("SELECT value FROM options WHERE name = 'encryptedDataKeyIv'");
+
+    const newEncryptedDataKey = prependIv(encryptedDataKey, encryptedDataKeyIv);
+
+    await sql.execute("UPDATE options SET value = ? WHERE name = 'encryptedDataKey'", [newEncryptedDataKey]);
+
+    await sql.execute("DELETE FROM options WHERE name = 'encryptedDataKeyIv'");
+    await sql.execute("DELETE FROM sync WHERE entityName = 'options' AND entityId = 'encryptedDataKeyIv'");
+}
+
+async function updateNotes() {
+    const protectedNotes = await sql.getRows("SELECT noteId, title, content FROM notes WHERE isProtected = 1");
+
+    for (const note of protectedNotes) {
+        if (note.title !== null) {
+            note.title = prependIv(note.title, "0" + note.noteId);
+        }
+
+        if (note.content !== null) {
+            note.content = prependIv(note.content, "1" + note.noteId);
+        }
+
+        await sql.execute("UPDATE notes SET title = ?, content = ? WHERE noteId = ?", [note.title, note.content, note.noteId]);
+    }
+}
+
+async function updateNoteRevisions() {
+    const protectedNoteRevisions = await sql.getRows("SELECT noteRevisionId, title, content FROM note_revisions WHERE isProtected = 1");
+
+    for (const noteRevision of protectedNoteRevisions) {
+        if (noteRevision.title !== null) {
+            noteRevision.title = prependIv(noteRevision.title, "0" + noteRevision.noteRevisionId);
+        }
+
+        if (noteRevision.content !== null) {
+            noteRevision.content = prependIv(noteRevision.content, "1" + noteRevision.noteRevisionId);
+        }
+
+        await sql.execute("UPDATE note_revisions SET title = ?, content = ? WHERE noteRevisionId = ?", [noteRevision.title, noteRevision.content, noteRevision.noteRevisionId]);
+    }
+}
+
+module.exports = async () => {
+    await updateEncryptedDataKey();
+
+    await updateNotes();
+
+    await updateNoteRevisions();
+};
--- a/db/migrations/0123__add_options_for_font_sizes.sql
+++ b/db/migrations/0123__add_options_for_font_sizes.sql
@ -0,0 +1,8 @@
+INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
+VALUES ('mainFontSize', '100', '2019-01-13T18:31:00.874Z', '2019-01-13T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
+VALUES ('treeFontSize', '100', '2019-01-13T18:31:00.874Z', '2019-01-13T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
+VALUES ('detailFontSize', '110', '2019-01-13T18:31:00.874Z', '2019-01-13T18:31:00.874Z', 0);
--- a/db/migrations/0124__readd_font_sizes.sql
+++ b/db/migrations/0124__readd_font_sizes.sql
@ -0,0 +1,11 @@
+INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
+  SELECT 'mainFontSize', '100', '2019-01-13T18:31:00.874Z', '2019-01-13T18:31:00.874Z', 0
+    WHERE NOT EXISTS (SELECT 1 FROM options WHERE name = 'mainFontSize');
+
+INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
+  SELECT 'treeFontSize', '100', '2019-01-13T18:31:00.874Z', '2019-01-13T18:31:00.874Z', 0
+    WHERE NOT EXISTS (SELECT 1 FROM options WHERE name = 'treeFontSize');
+
+INSERT INTO options (name, value, dateCreated, dateModified, isSynced)
+  SELECT 'detailFontSize', '110', '2019-01-13T18:31:00.874Z', '2019-01-13T18:31:00.874Z', 0
+    WHERE NOT EXISTS (SELECT 1 FROM options WHERE name = 'detailFontSize');
--- a/db/migrations/0125__create_note_content_table.sql
+++ b/db/migrations/0125__create_note_content_table.sql
@ -0,0 +1,35 @@
+CREATE TABLE IF NOT EXISTS "note_contents" (
+  `noteContentId`	TEXT NOT NULL,
+  `noteId`	TEXT NOT NULL,
+  `isProtected`	INT NOT NULL DEFAULT 0,
+  `content`	TEXT NULL DEFAULT NULL,
+  `hash` TEXT DEFAULT "" NOT NULL,
+  `dateCreated`	TEXT NOT NULL,
+  `dateModified` TEXT NOT NULL,
+  PRIMARY KEY(`noteContentId`)
+);
+
+CREATE UNIQUE INDEX `IDX_note_contents_noteId` ON `note_contents` (`noteId`);
+
+INSERT INTO note_contents (noteContentId, noteId, isProtected, content, dateCreated, dateModified)
+  SELECT 'C' || SUBSTR(noteId, 2), noteId, isProtected, content, dateCreated, dateModified FROM notes;
+
+CREATE TABLE IF NOT EXISTS "notes_mig" (
+  `noteId`	TEXT NOT NULL,
+  `title`	TEXT NOT NULL DEFAULT "note",
+  `isProtected`	INT NOT NULL DEFAULT 0,
+  `type` TEXT NOT NULL DEFAULT 'text',
+  `mime` TEXT NOT NULL DEFAULT 'text/html',
+  `hash` TEXT DEFAULT "" NOT NULL,
+  `isDeleted`	INT NOT NULL DEFAULT 0,
+  `dateCreated`	TEXT NOT NULL,
+  `dateModified`	TEXT NOT NULL,
+  PRIMARY KEY(`noteId`)
+);
+
+INSERT INTO notes_mig (noteId, title, isProtected, isDeleted, dateCreated, dateModified, type, mime, hash)
+SELECT noteId, title, isProtected, isDeleted, dateCreated, dateModified, type, mime, hash FROM notes;
+
+DROP TABLE notes;
+
+ALTER TABLE notes_mig RENAME TO notes;
--- a/db/migrations/0126__fill_sync_for_note_contents.sql
+++ b/db/migrations/0126__fill_sync_for_note_contents.sql
@ -0,0 +1,2 @@
+INSERT OR REPLACE INTO sync (entityName, entityId, sourceId, syncDate)
+SELECT 'note_contents', noteContentId, '', '2019-03-02T18:07:29.182Z' FROM note_contents;
--- a/db/migrations/0127__fix_inconsistent_isProtected.sql
+++ b/db/migrations/0127__fix_inconsistent_isProtected.sql
@ -0,0 +1,6 @@
+UPDATE notes SET title = 'Recovered protected note', isProtected = 0 WHERE noteId IN (
+    SELECT noteId FROM notes JOIN note_contents USING(noteId)
+    WHERE notes.isProtected = 1
+      AND note_contents.isProtected = 0
+      AND notes.isDeleted = 0
+)
--- a/db/migrations/0128__add_note_fulltext.sql
+++ b/db/migrations/0128__add_note_fulltext.sql
--- a/db/migrations/0129__fill_note_fulltext.js
+++ b/db/migrations/0129__fill_note_fulltext.js
@ -0,0 +1 @@
+module.exports = async () => {};
--- a/db/migrations/0130__rename_dates_to_utc.sql
+++ b/db/migrations/0130__rename_dates_to_utc.sql
@ -0,0 +1,236 @@
+CREATE TABLE IF NOT EXISTS "sync_mig" (
+                                    `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                    `entityName`	TEXT NOT NULL,
+                                    `entityId`	TEXT NOT NULL,
+                                    `sourceId` TEXT NOT NULL,
+                                    `utcSyncDate`	TEXT NOT NULL);
+
+INSERT INTO sync_mig (id, entityName, entityId, sourceId, utcSyncDate)
+  SELECT id, entityName, entityId, sourceId, REPLACE(syncDate, 'T', ' ') FROM sync;
+
+DROP TABLE sync;
+ALTER TABLE sync_mig RENAME TO sync;
+
+
+CREATE TABLE IF NOT EXISTS "source_ids_mig" (
+                                          `sourceId`	TEXT NOT NULL,
+                                          `utcDateCreated`	TEXT NOT NULL,
+                                          PRIMARY KEY(`sourceId`)
+);
+
+INSERT INTO source_ids_mig (sourceId, utcDateCreated)
+  SELECT sourceId, REPLACE(dateCreated, 'T', ' ') FROM source_ids;
+
+DROP TABLE source_ids;
+ALTER TABLE source_ids_mig RENAME TO source_ids;
+
+CREATE TABLE IF NOT EXISTS "note_revisions_mig" (
+                                              `noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                              `noteId`	TEXT NOT NULL,
+                                              `title`	TEXT,
+                                              `content`	TEXT,
+                                              `isProtected`	INT NOT NULL DEFAULT 0,
+                                              `utcDateModifiedFrom` TEXT NOT NULL,
+                                              `utcDateModifiedTo` TEXT NOT NULL,
+                                              `dateModifiedFrom` TEXT NOT NULL,
+                                              `dateModifiedTo` TEXT NOT NULL,
+                                              type TEXT DEFAULT '' NOT NULL,
+                                              mime TEXT DEFAULT '' NOT NULL,
+                                              hash TEXT DEFAULT "" NOT NULL);
+
+INSERT INTO note_revisions_mig (noteRevisionId, noteId, title, content, isProtected, utcDateModifiedFrom, utcDateModifiedTo, dateModifiedFrom, dateModifiedTo, type, mime, hash)
+SELECT noteRevisionId, noteId, title, content, isProtected, REPLACE(dateModifiedFrom, 'T', ' '), REPLACE(dateModifiedTo, 'T', ' '), REPLACE(REPLACE(dateModifiedFrom, 'T', ' '), 'Z', '+0000'), REPLACE(REPLACE(dateModifiedTo, 'T', ' '), 'Z', '+0000'), type, mime, hash FROM note_revisions;
+
+DROP TABLE note_revisions;
+ALTER TABLE note_revisions_mig RENAME TO note_revisions;
+
+CREATE TABLE IF NOT EXISTS "api_tokens_mig"
+(
+  apiTokenId TEXT PRIMARY KEY NOT NULL,
+  token TEXT NOT NULL,
+  utcDateCreated TEXT NOT NULL,
+  isDeleted INT NOT NULL DEFAULT 0,
+  hash TEXT DEFAULT "" NOT NULL);
+
+INSERT INTO api_tokens_mig (apiTokenId, token, utcDateCreated, isDeleted, hash)
+  SELECT apiTokenId, token, REPLACE(dateCreated, 'T', ' '), isDeleted, hash FROM api_tokens;
+
+DROP TABLE api_tokens;
+ALTER TABLE api_tokens_mig RENAME TO api_tokens;
+
+CREATE TABLE IF NOT EXISTS "branches_mig" (
+                                        `branchId`	TEXT NOT NULL,
+                                        `noteId`	TEXT NOT NULL,
+                                        `parentNoteId`	TEXT NOT NULL,
+                                        `notePosition`	INTEGER NOT NULL,
+                                        `prefix`	TEXT,
+                                        `isExpanded`	BOOLEAN,
+                                        `isDeleted`	INTEGER NOT NULL DEFAULT 0,
+                                        `utcDateModified`	TEXT NOT NULL,
+                                        utcDateCreated TEXT NOT NULL,
+                                        hash TEXT DEFAULT "" NOT NULL,
+                                        PRIMARY KEY(`branchId`)
+);
+
+INSERT INTO branches_mig (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash)
+  SELECT branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, REPLACE(dateModified, 'T', ' '), REPLACE(dateCreated, 'T', ' '), hash FROM branches;
+
+DROP TABLE branches;
+ALTER TABLE branches_mig RENAME TO branches;
+
+CREATE TABLE IF NOT EXISTS "recent_notes_mig" (
+                                            `branchId` TEXT NOT NULL PRIMARY KEY,
+                                            `notePath` TEXT NOT NULL,
+                                            hash TEXT DEFAULT "" NOT NULL,
+                                            `utcDateCreated` TEXT NOT NULL,
+                                            isDeleted INT
+);
+
+INSERT INTO recent_notes_mig (branchId, notePath, hash, utcDateCreated, isDeleted)
+  SELECT branchId, notePath, hash, REPLACE(dateCreated, 'T', ' '), isDeleted FROM recent_notes;
+
+DROP TABLE recent_notes;
+ALTER TABLE recent_notes_mig RENAME TO recent_notes;
+
+CREATE TABLE IF NOT EXISTS "event_log_mig" (
+                                         `eventId`	TEXT NOT NULL PRIMARY KEY,
+                                         `noteId`	TEXT,
+                                         `comment`	TEXT,
+                                         `utcDateCreated`	TEXT NOT NULL
+);
+
+INSERT INTO event_log_mig (eventId, noteId, comment, utcDateCreated)
+  SELECT eventId, noteId, comment, REPLACE(dateCreated, 'T', ' ') FROM event_log;
+
+DROP TABLE event_log;
+ALTER TABLE event_log_mig RENAME TO event_log;
+
+CREATE TABLE IF NOT EXISTS "options_mig"
+(
+  name TEXT not null PRIMARY KEY,
+  value TEXT,
+  isSynced INTEGER default 0 not null,
+  hash TEXT default "" not null,
+  utcDateCreated TEXT not null,
+  utcDateModified TEXT NOT NULL
+);
+
+INSERT INTO options_mig (name, value, isSynced, hash, utcDateCreated, utcDateModified)
+  SELECT name, value, isSynced, hash, REPLACE(dateCreated, 'T', ' '), REPLACE(dateModified, 'T', ' ') FROM options;
+
+DROP TABLE options;
+ALTER TABLE options_mig RENAME TO options;
+
+CREATE TABLE attributes_mig
+(
+  attributeId      TEXT not null primary key,
+  noteId       TEXT not null,
+  type         TEXT not null,
+  name         TEXT not null,
+  value        TEXT default '' not null,
+  position     INT  default 0 not null,
+  utcDateCreated  TEXT not null,
+  utcDateModified TEXT not null,
+  isDeleted    INT  not null,
+  hash         TEXT default "" not null,
+  isInheritable int DEFAULT 0 NULL);
+
+INSERT INTO attributes_mig (attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable)
+  SELECT attributeId, noteId, type, name, value, position, REPLACE(dateCreated, 'T', ' '), REPLACE(dateModified, 'T', ' '), isDeleted, hash, isInheritable FROM attributes;
+
+DROP TABLE attributes;
+ALTER TABLE attributes_mig RENAME TO attributes;
+
+CREATE TABLE IF NOT EXISTS "links_mig" (
+                                     `linkId`	TEXT NOT NULL,
+                                     `noteId`	TEXT NOT NULL,
+                                     `targetNoteId`	TEXT NOT NULL,
+                                     `type` TEXT NOT NULL,
+                                     `hash` TEXT DEFAULT "" NOT NULL,
+                                     `isDeleted`	INTEGER NOT NULL DEFAULT 0,
+                                     `utcDateCreated`	TEXT NOT NULL,
+                                     `utcDateModified`	TEXT NOT NULL,
+                                     PRIMARY KEY(`linkId`)
+);
+
+INSERT INTO links_mig (linkId, noteId, targetNoteId, type, hash, isDeleted, utcDateCreated, utcDateModified)
+  SELECT linkId, noteId, targetNoteId, type, hash, isDeleted, REPLACE(dateCreated, 'T', ' '), REPLACE(dateModified, 'T', ' ') FROM links;
+
+DROP TABLE links;
+ALTER TABLE links_mig RENAME TO links;
+
+CREATE TABLE IF NOT EXISTS "note_contents_mig" (
+                                             `noteContentId`	TEXT NOT NULL,
+                                             `noteId`	TEXT NOT NULL,
+                                             `isProtected`	INT NOT NULL DEFAULT 0,
+                                             `content`	TEXT NULL DEFAULT NULL,
+                                             `hash` TEXT DEFAULT "" NOT NULL,
+                                             `utcDateCreated`	TEXT NOT NULL,
+                                             `utcDateModified` TEXT NOT NULL,
+                                             PRIMARY KEY(`noteContentId`)
+);
+
+INSERT INTO note_contents_mig (noteContentId, noteId, isProtected, content, hash, utcDateCreated, utcDateModified)
+  SELECT noteContentId, noteId, isProtected, content, hash, REPLACE(dateCreated, 'T', ' '), REPLACE(dateModified, 'T', ' ') FROM note_contents;
+
+DROP TABLE note_contents;
+ALTER TABLE note_contents_mig RENAME TO note_contents;
+
+CREATE TABLE IF NOT EXISTS "notes_mig" (
+                                     `noteId`	TEXT NOT NULL,
+                                     `title`	TEXT NOT NULL DEFAULT "note",
+                                     `isProtected`	INT NOT NULL DEFAULT 0,
+                                     `type` TEXT NOT NULL DEFAULT 'text',
+                                     `mime` TEXT NOT NULL DEFAULT 'text/html',
+                                     `hash` TEXT DEFAULT "" NOT NULL,
+                                     `isDeleted`	INT NOT NULL DEFAULT 0,
+                                     `dateCreated`	TEXT NOT NULL,
+                                     `dateModified`	TEXT NOT NULL,
+                                     `utcDateCreated`	TEXT NOT NULL,
+                                     `utcDateModified`	TEXT NOT NULL,
+                                     PRIMARY KEY(`noteId`)
+);
+
+INSERT INTO notes_mig (noteId, title, isProtected, type, mime, hash, isDeleted, dateCreated, dateModified, utcDateCreated, utcDateModified)
+  SELECT noteId, title, isProtected, type, mime, hash, isDeleted, REPLACE(REPLACE(dateCreated, 'T', ' '), 'Z', '+0000'), REPLACE(REPLACE(dateModified, 'T', ' '), 'Z', '+0000'), REPLACE(dateCreated, 'T', ' '), REPLACE(dateModified, 'T', ' ') FROM notes;
+
+DROP TABLE notes;
+ALTER TABLE notes_mig RENAME TO notes;
+
+CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` (
+                                                              `entityName`,
+                                                              `entityId`
+  );
+CREATE INDEX `IDX_sync_utcSyncDate` ON `sync` (
+                                            `utcSyncDate`
+  );
+CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (
+                                                              `noteId`
+  );
+CREATE INDEX `IDX_note_revisions_dateModifiedFrom` ON `note_revisions` (
+                                                                        `utcDateModifiedFrom`
+  );
+CREATE INDEX `IDX_note_revisions_dateModifiedTo` ON `note_revisions` (
+                                                                      `utcDateModifiedTo`
+  );
+CREATE INDEX `IDX_branches_noteId` ON `branches` (
+                                                  `noteId`
+  );
+CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (
+                                                               `noteId`,
+                                                               `parentNoteId`
+  );
+CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
+CREATE INDEX IDX_attributes_name_value
+  on attributes (name, value);
+CREATE INDEX IDX_links_noteId_index
+  on links (noteId);
+CREATE INDEX IDX_links_targetNoteId_index
+  on links (targetNoteId);
+CREATE INDEX IDX_attributes_name_index
+  on attributes (name);
+CREATE INDEX IDX_attributes_noteId_index
+  on attributes (noteId);
+CREATE INDEX IDX_attributes_value_index
+  on attributes (value);
+CREATE UNIQUE INDEX `IDX_note_contents_noteId` ON `note_contents` (`noteId`);
--- a/db/migrations/0131__cleanup_note_contents.sql
+++ b/db/migrations/0131__cleanup_note_contents.sql
@ -0,0 +1,13 @@
+CREATE TABLE IF NOT EXISTS "note_contents_mig" (
+                                                   `noteId`	TEXT NOT NULL,
+                                                   `content`	TEXT NULL DEFAULT NULL,
+                                                   `hash` TEXT DEFAULT "" NOT NULL,
+                                                   `utcDateModified` TEXT NOT NULL,
+                                                   PRIMARY KEY(`noteId`)
+);
+
+INSERT INTO note_contents_mig (noteId, content, hash, utcDateModified)
+SELECT noteId, content, hash, utcDateModified FROM note_contents;
+
+DROP TABLE note_contents;
+ALTER TABLE note_contents_mig RENAME TO note_contents;
--- a/db/migrations/0132__fill_sync.js
+++ b/db/migrations/0132__fill_sync.js
@ -0,0 +1,5 @@
+const syncTableService = require('../../src/services/entity_changes.js');
+
+module.exports = async () => {
+    await syncTableService.fillAllSyncRows();
+};
--- a/db/migrations/0133__drop_note_fulltext.sql
+++ b/db/migrations/0133__drop_note_fulltext.sql
@ -0,0 +1 @@
+DROP TABLE IF EXISTS note_fulltext;
--- a/db/migrations/0134__create_openTabs_option.sql
+++ b/db/migrations/0134__create_openTabs_option.sql
@ -0,0 +1,4 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+    SELECT 'openTabs', '[{"notePath":"' || value || '","active": true,"tabId":"1111"}]', '2019-05-01T18:31:00.874Z', '2019-05-01T18:31:00.874Z', 0 FROM options WHERE name = 'startNotePath';
+
+DELETE FROM options WHERE name = 'startNotePath';
--- a/db/migrations/0135__add_hideTabRowForOneTab_option.sql
+++ b/db/migrations/0135__add_hideTabRowForOneTab_option.sql
@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+    VALUES ('hideTabRowForOneTab', 'false', '2019-05-01T18:31:00.874Z', '2019-05-01T18:31:00.874Z', 0);
--- a/db/migrations/0136__update_recent_notes.sql
+++ b/db/migrations/0136__update_recent_notes.sql
@ -0,0 +1,12 @@
+drop table recent_notes;
+
+create table recent_notes
+(
+    noteId TEXT not null primary key,
+    notePath TEXT not null,
+    hash TEXT default "" not null,
+    utcDateCreated TEXT not null,
+    isDeleted INT
+);
+
+delete from sync where entityName = 'recent_notes';
--- a/db/migrations/0137__links_to_attributes.sql
+++ b/db/migrations/0137__links_to_attributes.sql
@ -0,0 +1,10 @@
+UPDATE links SET type = 'internal-link' WHERE type = 'hyper';
+UPDATE links SET type = 'image-link' WHERE type = 'image';
+UPDATE links SET type = 'relation-map-link' WHERE type = 'relation-map';
+
+INSERT INTO attributes (attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable)
+SELECT linkId, noteId, 'relation', type, targetNoteId, 0, utcDateCreated, utcDateModified, isDeleted, hash, 0 FROM links;
+
+UPDATE sync SET entityName = 'attributes' WHERE entityName = 'links';
+
+DROP TABLE links;
--- a/db/migrations/0138__sidebar_sizing.sql
+++ b/db/migrations/0138__sidebar_sizing.sql
@ -0,0 +1,5 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('sidebarMinWidth', '350', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('sidebarWidthPercent', '25', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0139__show_sidebar_in_new_tab.sql
+++ b/db/migrations/0139__show_sidebar_in_new_tab.sql
@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('showSidebarInNewTab', 'true', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0140__widget_config.sql
+++ b/db/migrations/0140__widget_config.sql
@ -0,0 +1,14 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('noteInfoWidget', '{"enabled":true,"expanded":true,"position":100}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('attributesWidget', '{"enabled":true,"expanded":true,"position":200}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('linkMapWidget', '{"enabled":true,"expanded":true,"position":300}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('noteRevisionsWidget', '{"enabled":true,"expanded":true,"position":400}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('whatLinksHereWidget', '{"enabled":false,"expanded":true,"position":500}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0141__add_code_note_mime_types.sql
+++ b/db/migrations/0141__add_code_note_mime_types.sql
@ -0,0 +1,5 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('codeNotesMimeTypes', '["text/x-csrc","text/x-c++src","text/x-csharp","text/css","text/x-go","text/x-groovy","text/x-haskell","text/html","message/http","text/x-java","application/javascript;env=frontend","application/javascript;env=backend","application/json","text/x-kotlin","text/x-markdown","text/x-perl","text/x-php","text/x-python","text/x-ruby",null,"text/x-sql","text/x-swift","text/xml","text/x-yaml"]', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 1);
+
+INSERT INTO sync (entityName, entityId, sourceId, utcSyncDate)
+VALUES ('options' ,'codeNotesMimeTypes', 'SYNC_FILL', '2018-01-01T00:00:00.000Z');
--- a/db/migrations/0142__similar_notes_widget.sql
+++ b/db/migrations/0142__similar_notes_widget.sql
@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('similarNotesWidget', '{"enabled":true,"expanded":true,"position":600}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0143__drop_event_log.sql
+++ b/db/migrations/0143__drop_event_log.sql
@ -0,0 +1 @@
+DROP TABLE event_log;
--- a/db/migrations/0144__edited_notes_widget.sql
+++ b/db/migrations/0144__edited_notes_widget.sql
@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('editedNotesWidget', '{"enabled":true,"expanded":true,"position":50}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0145__calendar_widget.sql
+++ b/db/migrations/0145__calendar_widget.sql
@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('calendarWidget', '{"enabled":true,"expanded":true,"position":20}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0146__add_spell_check_options.sql
+++ b/db/migrations/0146__add_spell_check_options.sql
@ -0,0 +1,5 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('spellCheckEnabled', 'true', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('spellCheckLanguageCode', 'en-US', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0147__add_hideTabRowForOneTab_if_missing.sql
+++ b/db/migrations/0147__add_hideTabRowForOneTab_if_missing.sql
@ -0,0 +1,3 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+SELECT 'hideTabRowForOneTab', 'false', '2019-05-01T18:31:00.874Z', '2019-05-01T18:31:00.874Z', 0
+WHERE NOT EXISTS(SELECT 1 FROM options WHERE name = 'hideTabRowForOneTab');
--- a/db/migrations/0148__make_isExpanded_not_null.sql
+++ b/db/migrations/0148__make_isExpanded_not_null.sql
@ -0,0 +1,22 @@
+CREATE TABLE IF NOT EXISTS "mig_branches" (
+                                          `branchId`	TEXT NOT NULL,
+                                          `noteId`	TEXT NOT NULL,
+                                          `parentNoteId`	TEXT NOT NULL,
+                                          `notePosition`	INTEGER NOT NULL,
+                                          `prefix`	TEXT,
+                                          `isExpanded`	INTEGER NOT NULL DEFAULT 0,
+                                          `isDeleted`	INTEGER NOT NULL DEFAULT 0,
+                                          `utcDateModified`	TEXT NOT NULL,
+                                          utcDateCreated TEXT NOT NULL,
+                                          hash TEXT DEFAULT "" NOT NULL,
+                                          PRIMARY KEY(`branchId`));
+
+INSERT INTO mig_branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash)
+SELECT branchId, noteId, parentNoteId, notePosition, prefix, COALESCE(isExpanded, 0), isDeleted, utcDateModified, utcDateCreated, hash FROM branches;
+
+DROP TABLE branches;
+ALTER TABLE mig_branches RENAME TO branches;
+
+CREATE INDEX `IDX_branches_noteId` ON `branches` (`noteId`);
+CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
+CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
--- a/db/migrations/0149__space_out_positions.sql
+++ b/db/migrations/0149__space_out_positions.sql
@ -0,0 +1,2 @@
+UPDATE branches SET notePosition = notePosition * 10;
+UPDATE attributes SET position = position * 10;
--- a/db/migrations/0150__note_revision_contents.sql
+++ b/db/migrations/0150__note_revision_contents.sql
@ -0,0 +1,36 @@
+CREATE TABLE IF NOT EXISTS "note_revisions_mig" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                                `noteId`	TEXT NOT NULL,
+                                                `title`	TEXT,
+                                                `contentLength`	INT NOT NULL,
+                                                `isProtected`	INT NOT NULL DEFAULT 0,
+                                                `utcDateLastEdited` TEXT NOT NULL,
+                                                `utcDateCreated` TEXT NOT NULL,
+                                                `utcDateModified` TEXT NOT NULL,
+                                                `dateLastEdited` TEXT NOT NULL,
+                                                `dateCreated` TEXT NOT NULL,
+                                                type TEXT DEFAULT '' NOT NULL,
+                                                mime TEXT DEFAULT '' NOT NULL,
+                                                hash TEXT DEFAULT '' NOT NULL);
+
+CREATE TABLE IF NOT EXISTS "note_revision_contents" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                                 `content`	TEXT,
+                                                 hash TEXT DEFAULT '' NOT NULL,
+                                                 `utcDateModified` TEXT NOT NULL);
+
+INSERT INTO note_revision_contents (noteRevisionId, content, hash, utcDateModified)
+SELECT noteRevisionId, content, hash, utcDateModifiedTo FROM note_revisions;
+
+INSERT INTO note_revisions_mig (noteRevisionId, noteId, title, contentLength, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash)
+SELECT noteRevisionId, noteId, title, COALESCE(LENGTH(content), 0), isProtected, utcDateModifiedFrom, utcDateModifiedTo, utcDateModifiedTo, dateModifiedFrom, dateModifiedTo, type, mime, hash FROM note_revisions;
+
+DROP TABLE note_revisions;
+ALTER TABLE note_revisions_mig RENAME TO note_revisions;
+
+CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (`noteId`);
+CREATE INDEX `IDX_note_revisions_utcDateCreated` ON `note_revisions` (`utcDateCreated`);
+CREATE INDEX `IDX_note_revisions_utcDateLastEdited` ON `note_revisions` (`utcDateLastEdited`);
+CREATE INDEX `IDX_note_revisions_dateCreated` ON `note_revisions` (`dateCreated`);
+CREATE INDEX `IDX_note_revisions_dateLastEdited` ON `note_revisions` (`dateLastEdited`);
+
+INSERT INTO sync (entityName, entityId, sourceId, utcSyncDate)
+SELECT 'note_revision_contents', entityId, sourceId, utcSyncDate FROM sync WHERE entityName = 'note_revisions';
--- a/db/migrations/0151__add_isErased_to_note.sql
+++ b/db/migrations/0151__add_isErased_to_note.sql
@ -0,0 +1,31 @@
+CREATE TABLE IF NOT EXISTS "notes_mig" (
+                                       `noteId`	TEXT NOT NULL,
+                                       `title`	TEXT NOT NULL DEFAULT "note",
+                                       `isProtected`	INT NOT NULL DEFAULT 0,
+                                       `type` TEXT NOT NULL DEFAULT 'text',
+                                       `mime` TEXT NOT NULL DEFAULT 'text/html',
+                                       `hash` TEXT DEFAULT "" NOT NULL,
+                                       `isDeleted`	INT NOT NULL DEFAULT 0,
+                                       `isErased`	INT NOT NULL DEFAULT 0,
+                                       `dateCreated`	TEXT NOT NULL,
+                                       `dateModified`	TEXT NOT NULL,
+                                       `utcDateCreated`	TEXT NOT NULL,
+                                       `utcDateModified`	TEXT NOT NULL,
+                                       PRIMARY KEY(`noteId`));
+
+INSERT INTO notes_mig (noteId, title, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
+SELECT noteId, title, isProtected, type, mime, hash, isDeleted, 0, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes;
+
+DROP TABLE notes;
+ALTER TABLE notes_mig RENAME TO notes;
+
+UPDATE notes SET isErased = 1 WHERE isDeleted = 1
+AND 1=(SELECT CASE WHEN content IS NULL THEN 1 ELSE 0 END FROM note_contents WHERE note_contents.noteId = notes.noteId);
+
+CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
+CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
+CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
+CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
+CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
+CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
+CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
--- a/db/migrations/0152__add_contentLength_to_note.sql
+++ b/db/migrations/0152__add_contentLength_to_note.sql
@ -0,0 +1,34 @@
+CREATE TABLE IF NOT EXISTS "notes_mig" (
+                                           `noteId`	TEXT NOT NULL,
+                                           `title`	TEXT NOT NULL DEFAULT "note",
+                                           `contentLength`	INT NOT NULL,
+                                           `isProtected`	INT NOT NULL DEFAULT 0,
+                                           `type` TEXT NOT NULL DEFAULT 'text',
+                                           `mime` TEXT NOT NULL DEFAULT 'text/html',
+                                           `hash` TEXT DEFAULT "" NOT NULL,
+                                           `isDeleted`	INT NOT NULL DEFAULT 0,
+                                           `isErased`	INT NOT NULL DEFAULT 0,
+                                           `dateCreated`	TEXT NOT NULL,
+                                           `dateModified`	TEXT NOT NULL,
+                                           `utcDateCreated`	TEXT NOT NULL,
+                                           `utcDateModified`	TEXT NOT NULL,
+                                           PRIMARY KEY(`noteId`));
+
+INSERT INTO notes_mig (noteId, title, contentLength, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
+SELECT noteId, title, -1, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes;
+
+DROP TABLE notes;
+ALTER TABLE notes_mig RENAME TO notes;
+
+UPDATE notes SET contentLength = COALESCE((SELECT COALESCE(LENGTH(content), 0) FROM note_contents WHERE note_contents.noteId = notes.noteId), -1);
+
+CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
+CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
+CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
+CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
+CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
+CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
+CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
+
+-- should be OK since sync protocol changes so all instances must upgrade
+UPDATE attributes SET isDeleted = 1 WHERE name = 'fileSize';
--- a/db/migrations/0153__add_isErased_to_note_revision.sql
+++ b/db/migrations/0153__add_isErased_to_note_revision.sql
@ -0,0 +1,28 @@
+CREATE TABLE IF NOT EXISTS "note_revisions_mig" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                                 `noteId`	TEXT NOT NULL,
+                                                 `title`	TEXT,
+                                                 `contentLength`	INT NOT NULL,
+                                                 `isErased`	INT NOT NULL DEFAULT 0,
+                                                 `isProtected`	INT NOT NULL DEFAULT 0,
+                                                 `utcDateLastEdited` TEXT NOT NULL,
+                                                 `utcDateCreated` TEXT NOT NULL,
+                                                 `utcDateModified` TEXT NOT NULL,
+                                                 `dateLastEdited` TEXT NOT NULL,
+                                                 `dateCreated` TEXT NOT NULL,
+                                                 type TEXT DEFAULT '' NOT NULL,
+                                                 mime TEXT DEFAULT '' NOT NULL,
+                                                 hash TEXT DEFAULT '' NOT NULL);
+
+INSERT INTO note_revisions_mig (noteRevisionId, noteId, title, contentLength, isErased, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash)
+SELECT noteRevisionId, noteId, title, contentLength, 0, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash FROM note_revisions;
+
+DROP TABLE note_revisions;
+ALTER TABLE note_revisions_mig RENAME TO note_revisions;
+
+UPDATE note_revisions SET isErased = (SELECT isErased FROM notes WHERE notes.noteId = note_revisions.noteId);
+
+CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (`noteId`);
+CREATE INDEX `IDX_note_revisions_utcDateCreated` ON `note_revisions` (`utcDateCreated`);
+CREATE INDEX `IDX_note_revisions_utcDateLastEdited` ON `note_revisions` (`utcDateLastEdited`);
+CREATE INDEX `IDX_note_revisions_dateCreated` ON `note_revisions` (`dateCreated`);
+CREATE INDEX `IDX_note_revisions_dateLastEdited` ON `note_revisions` (`dateLastEdited`);
--- a/db/migrations/0154__system_links_should_follow_camelCase.sql
+++ b/db/migrations/0154__system_links_should_follow_camelCase.sql
@ -0,0 +1,3 @@
+UPDATE attributes SET name = 'internalLink' WHERE name = 'internal-link';
+UPDATE attributes SET name = 'imageLink' WHERE name = 'image-link';
+UPDATE attributes SET name = 'relationMapLink' WHERE name = 'relation-map-link';
--- a/db/migrations/0155__indexes.sql
+++ b/db/migrations/0155__indexes.sql
@ -0,0 +1,5 @@
+DROP INDEX IF EXISTS IDX_attributes_name_index;
+DROP INDEX IF EXISTS IDX_branches_noteId;
+
+CREATE INDEX IDX_source_ids_utcDateCreated
+    on source_ids (utcDateCreated);
--- a/db/migrations/0156__add_deleteId.sql
+++ b/db/migrations/0156__add_deleteId.sql
@ -0,0 +1,81 @@
+CREATE TABLE IF NOT EXISTS "notes_mig" (
+                                           `noteId`	TEXT NOT NULL,
+                                           `title`	TEXT NOT NULL DEFAULT "note",
+                                           `contentLength`	INT NOT NULL,
+                                           `isProtected`	INT NOT NULL DEFAULT 0,
+                                           `type` TEXT NOT NULL DEFAULT 'text',
+                                           `mime` TEXT NOT NULL DEFAULT 'text/html',
+                                           `hash` TEXT DEFAULT "" NOT NULL,
+                                           `isDeleted`	INT NOT NULL DEFAULT 0,
+                                           `deleteId`   TEXT DEFAULT NULL,
+                                           `isErased`	INT NOT NULL DEFAULT 0,
+                                           `dateCreated`	TEXT NOT NULL,
+                                           `dateModified`	TEXT NOT NULL,
+                                           `utcDateCreated`	TEXT NOT NULL,
+                                           `utcDateModified`	TEXT NOT NULL,
+                                           PRIMARY KEY(`noteId`));
+
+INSERT INTO notes_mig (noteId, title, contentLength, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
+SELECT noteId, title, -1, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes;
+
+DROP TABLE notes;
+ALTER TABLE notes_mig RENAME TO notes;
+
+CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
+CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
+CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
+CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
+CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
+CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
+CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
+
+CREATE TABLE IF NOT EXISTS "branches_mig" (
+                                          `branchId`	TEXT NOT NULL,
+                                          `noteId`	TEXT NOT NULL,
+                                          `parentNoteId`	TEXT NOT NULL,
+                                          `notePosition`	INTEGER NOT NULL,
+                                          `prefix`	TEXT,
+                                          `isExpanded`	INTEGER NOT NULL DEFAULT 0,
+                                          `isDeleted`	INTEGER NOT NULL DEFAULT 0,
+                                          `deleteId`    TEXT DEFAULT NULL,
+                                          `utcDateModified`	TEXT NOT NULL,
+                                          utcDateCreated TEXT NOT NULL,
+                                          hash TEXT DEFAULT "" NOT NULL,
+                                          PRIMARY KEY(`branchId`));
+
+INSERT INTO branches_mig (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash)
+    SELECT branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash FROM branches;
+
+DROP TABLE branches;
+ALTER TABLE branches_mig RENAME TO branches;
+
+CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
+CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
+
+CREATE TABLE IF NOT EXISTS "attributes_mig"
+(
+    attributeId      TEXT not null primary key,
+    noteId       TEXT not null,
+    type         TEXT not null,
+    name         TEXT not null,
+    value        TEXT default '' not null,
+    position     INT  default 0 not null,
+    utcDateCreated  TEXT not null,
+    utcDateModified TEXT not null,
+    isDeleted    INT  not null,
+    `deleteId`    TEXT DEFAULT NULL,
+    hash         TEXT default "" not null,
+    isInheritable int DEFAULT 0 NULL);
+
+INSERT INTO attributes_mig (attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable)
+SELECT attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable FROM attributes;
+
+DROP TABLE attributes;
+ALTER TABLE attributes_mig RENAME TO attributes;
+
+CREATE INDEX IDX_attributes_name_value
+    on attributes (name, value);
+CREATE INDEX IDX_attributes_noteId_index
+    on attributes (noteId);
+CREATE INDEX IDX_attributes_value_index
+    on attributes (value);
--- a/db/migrations/0157__fix_contentLength.sql
+++ b/db/migrations/0157__fix_contentLength.sql
@ -0,0 +1 @@
+UPDATE notes SET contentLength = COALESCE((SELECT COALESCE(LENGTH(content), 0) FROM note_contents WHERE note_contents.noteId = notes.noteId), -1);
--- a/db/migrations/0158__add_isSynced_to_sync.sql
+++ b/db/migrations/0158__add_isSynced_to_sync.sql
@ -0,0 +1,22 @@
+CREATE TABLE IF NOT EXISTS "sync_mig" (
+                                          `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                          `entityName`	TEXT NOT NULL,
+                                          `entityId`	TEXT NOT NULL,
+                                          `sourceId` TEXT NOT NULL,
+                                          `isSynced` INTEGER default 0 not null,
+                                          `utcSyncDate`	TEXT NOT NULL);
+
+INSERT INTO sync_mig (id, entityName, entityId, sourceId, isSynced, utcSyncDate)
+SELECT id, entityName, entityId, sourceId, 1, utcSyncDate FROM sync;
+
+DROP TABLE sync;
+
+ALTER TABLE sync_mig RENAME TO sync;
+
+CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` (
+                                                              `entityName`,
+                                                              `entityId`
+    );
+CREATE INDEX `IDX_sync_utcSyncDate` ON `sync` (
+                                               `utcSyncDate`
+    );
--- a/db/migrations/0159__fix_isSynced_in_sync_rows.sql
+++ b/db/migrations/0159__fix_isSynced_in_sync_rows.sql
@ -0,0 +1,4 @@
+UPDATE sync SET isSynced = 1 WHERE entityName != 'options' OR (
+        entityName = 'options'
+        AND 1 = (SELECT isSynced FROM options WHERE name = sync.entityId)
+    )
--- a/db/migrations/0160__migrate_attr_definitions.sql
+++ b/db/migrations/0160__migrate_attr_definitions.sql
@ -0,0 +1,2 @@
+UPDATE attributes SET type = 'label', name = 'label:' || name WHERE type = 'label-definition';
+UPDATE attributes SET type = 'label', name = 'relation:' || name WHERE type = 'relation-definition';
--- a/db/migrations/0161__attr_def_short.js
+++ b/db/migrations/0161__attr_def_short.js
@ -0,0 +1,79 @@
+const sql = require('../../src/services/sql');
+
+module.exports = () => {
+    for (const attr of sql.getRows("SELECT * FROM attributes WHERE name LIKE 'label:%'")) {
+        let obj;
+
+        try {
+            obj = JSON.parse(attr.value);
+        }
+        catch (e) {
+            console.log(`Parsing attribute definition "${attr.value}" of ${attr.attributeId} failed with error "${e.message}", setting to default value.`);
+
+            sql.execute('UPDATE attributes SET value = ? WHERE attributeId = ?',
+                ["multi,text", attr.attributeId]);
+
+            continue;
+        }
+
+        const tokens = [];
+
+        if (obj.isPromoted) {
+            tokens.push('promoted');
+        }
+
+        if (obj.multiplicityType === 'singlevalue') {
+            tokens.push('single');
+        } else if (obj.multiplicityType === 'multivalue') {
+            tokens.push('multi');
+        }
+
+        if (obj.labelType) {
+            tokens.push(obj.labelType);
+        }
+
+        if (obj.numberPrecision) {
+            tokens.push('precision='+obj.numberPrecision);
+        }
+
+        const newValue = tokens.join(',');
+
+        sql.execute('UPDATE attributes SET value = ? WHERE attributeId = ?', [newValue, attr.attributeId]);
+    }
+
+    for (const attr of sql.getRows("SELECT * FROM attributes WHERE name LIKE 'relation:%'")) {
+        let obj;
+
+        try {
+            obj = JSON.parse(attr.value);
+        }
+        catch (e) {
+            console.log(`Parsing attribute definition "${attr.value}" of ${attr.attributeId} failed with error "${e.message}", setting to default value.`);
+
+            sql.execute('UPDATE attributes SET value = ? WHERE attributeId = ?',
+                ["multi", attr.attributeId]);
+
+            continue;
+        }
+
+        const tokens = [];
+
+        if (obj.isPromoted) {
+            tokens.push('promoted');
+        }
+
+        if (obj.multiplicityType === 'singlevalue') {
+            tokens.push('single');
+        } else if (obj.multiplicityType === 'multivalue') {
+            tokens.push('multi');
+        }
+
+        if (obj.inverseRelation) {
+            tokens.push('inverse=' + obj.inverseRelation);
+        }
+
+        const newValue = tokens.join(',');
+
+        sql.execute('UPDATE attributes SET value = ? WHERE attributeId = ?', [newValue, attr.attributeId]);
+    }
+};
--- a/db/migrations/0162__drop_source_ids.sql
+++ b/db/migrations/0162__drop_source_ids.sql
@ -0,0 +1 @@
+DROP TABLE source_ids;
--- a/db/migrations/0163__rename_sync_to_entity_changes.sql
+++ b/db/migrations/0163__rename_sync_to_entity_changes.sql
@ -0,0 +1 @@
+ALTER TABLE sync RENAME TO entity_changes;
--- a/db/migrations/0164__rename_utcSyncDate.sql
+++ b/db/migrations/0164__rename_utcSyncDate.sql
@ -0,0 +1,22 @@
+CREATE TABLE IF NOT EXISTS "mig_entity_changes" (
+                                                `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                                `entityName`	TEXT NOT NULL,
+                                                `entityId`	TEXT NOT NULL,
+                                                `sourceId` TEXT NOT NULL,
+                                                `isSynced` INTEGER default 0 not null,
+                                                `utcChangedDate`	TEXT NOT NULL);
+
+INSERT INTO mig_entity_changes (id, entityName, entityId, sourceId, isSynced, utcChangedDate)
+    SELECT id, entityName, entityId, sourceId, isSynced, utcSyncDate FROM entity_changes;
+
+DROP TABLE entity_changes;
+
+ALTER TABLE mig_entity_changes RENAME TO entity_changes;
+
+CREATE UNIQUE INDEX `IDX_entityChanges_entityName_entityId` ON "entity_changes" (
+                                                                                 `entityName`,
+                                                                                 `entityId`
+    );
+CREATE INDEX `IDX_entityChanges_utcChangedDate` ON "entity_changes" (
+                                                                  `utcChangedDate`
+    );
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`Please treat each other with respect and understanding.`
				`@ -0,0 +1 @@`
				`update branches set parentNoteId = 'none' where branchId = 'root'`
				`@ -0,0 +1 @@`
				`UPDATE attributes SET isDeleted = 1 WHERE noteId IN (SELECT noteId FROM notes WHERE isDeleted = 1);`
				`@ -0,0 +1 @@`
				`UPDATE attributes SET value = replace(value, 'mirrorRelation', 'inverseRelation') WHERE type = 'relation-definition';`
				`@ -0,0 +1 @@`
				`UPDATE attributes SET name = 'archived' where name = 'hideInAutocomplete';`
				`@ -0,0 +1 @@`
				`UPDATE notes SET contentLength = COALESCE((SELECT COALESCE(LENGTH(content), 0) FROM note_contents WHERE note_contents.noteId = notes.noteId), -1);`