release 0.45.3

electron update
update ckeditor5-math which fixes focus and placeholder issues
2025-10-27 00:06:30 +01:00 · 2020-11-10 22:54:40 +01:00 · 2020-11-10 22:54:03 +01:00 · 2020-11-07 21:28:12 +01:00 · 2020-11-06 21:52:57 +01:00 · 2020-11-05 21:26:24 +01:00
1105 changed files with 208709 additions and 100737 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,7 @@
+.git
+.idea
+/bin
+/dist
+/docs
+/npm-debug.log
 node_modules
-npm-debug.log
-dist
-.idea
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [zadam]
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,11 @@
 .DS_Store
 node_modules/
 dist/
+src/public/app-dist/
 npm-debug.log
 yarn-error.log
 *.db
 config.ini
 cert.key
-cert.crt
+cert.crt
+server-package.json
--- a/.gitpod.dockerfile
+++ b/.gitpod.dockerfile
@@ -0,0 +1,15 @@
+FROM gitpod/workspace-full
+
+RUN sudo apt-get update \
+    && sudo apt-get install -yq --no-install-recommends \
+        libpng16-16 \
+        libpng-dev \
+        pkg-config \
+        autoconf \
+        libtool \
+        build-essential \
+        nasm \
+        libx11-dev \
+        libxkbfile-dev \
+    && sudo rm -rf /var/lib/apt/lists/*
+
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -0,0 +1,11 @@
+image:
+  file: .gitpod.dockerfile
+
+tasks:
+    - before: nvm install 10 && nvm use 10
+      init: npm install
+      command: npm run start-server
+
+ports:
+    - port: 8080
+      onOpen: open-preview
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -0,0 +1,6 @@
+# Default ignored files
+/workspace.xml
+
+# Datasource local storage ignored files
+/dataSources.local.xml
+/dataSources/
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,13 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="OTHER_INDENT_OPTIONS">
+      <value>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </value>
+    </option>
+    <JSCodeStyleSettings version="0">
+      <option name="USE_EXPLICIT_JS_EXTENSION" value="TRUE" />
+    </JSCodeStyleSettings>
+  </code_scheme>
+</component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -1,14 +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="a2c75661-f9e2-478f-a69f-6a9409e69997">
+    <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:$USER_HOME$/trilium-data/document.db</jdbc-url>
-      <driver-properties>
-        <property name="enable_load_extension" value="true" />
-      </driver-properties>
    </data-source>
  </component>
 </project>
--- a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
+++ b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
@@ -1,651 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataSource name="document.db">
-  <database-model serializer="dbm" rdbms="SQLITE" format-version="4.11">
-    <root id="1">
-      <ServerVersion>3.16.1</ServerVersion>
-    </root>
-    <schema id="2" parent="1" name="main">
-      <Current>1</Current>
-      <Visible>1</Visible>
-    </schema>
-    <collation id="3" parent="1" name="BINARY"/>
-    <collation id="4" parent="1" name="NOCASE"/>
-    <collation id="5" parent="1" name="RTRIM"/>
-    <table id="6" parent="2" name="api_tokens"/>
-    <table id="7" parent="2" name="attributes"/>
-    <table id="8" parent="2" name="branches"/>
-    <table id="9" parent="2" name="event_log"/>
-    <table id="10" parent="2" name="images"/>
-    <table id="11" parent="2" name="note_images"/>
-    <table id="12" parent="2" name="note_revisions"/>
-    <table id="13" parent="2" name="notes"/>
-    <table id="14" parent="2" name="options"/>
-    <table id="15" parent="2" name="recent_notes"/>
-    <table id="16" parent="2" name="source_ids"/>
-    <table id="17" parent="2" name="sqlite_master">
-      <System>1</System>
-    </table>
-    <table id="18" parent="2" name="sqlite_sequence">
-      <System>1</System>
-    </table>
-    <table id="19" parent="2" name="sync"/>
-    <column id="20" parent="6" name="apiTokenId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="21" parent="6" name="token">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="22" parent="6" name="dateCreated">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="23" parent="6" name="isDeleted">
-      <Position>4</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="24" parent="6" name="hash">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <index id="25" parent="6" name="sqlite_autoindex_api_tokens_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>apiTokenId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <key id="26" parent="6">
-      <ColNames>apiTokenId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_api_tokens_1</UnderlyingIndexName>
-    </key>
-    <column id="27" parent="7" name="attributeId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="28" parent="7" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="29" parent="7" name="type">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="30" parent="7" name="name">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="31" parent="7" name="value">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;&apos;</DefaultExpression>
-    </column>
-    <column id="32" parent="7" name="position">
-      <Position>6</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="33" parent="7" name="dateCreated">
-      <Position>7</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="34" parent="7" name="dateModified">
-      <Position>8</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="35" parent="7" name="isDeleted">
-      <Position>9</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="36" parent="7" name="hash">
-      <Position>10</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="37" parent="7" name="isInheritable">
-      <Position>11</Position>
-      <DataType>int|0s</DataType>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <index id="38" parent="7" name="sqlite_autoindex_attributes_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>attributeId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <key id="39" parent="7">
-      <ColNames>attributeId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_attributes_1</UnderlyingIndexName>
-    </key>
-    <column id="40" parent="8" name="branchId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="41" parent="8" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="42" parent="8" name="parentNoteId">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="43" parent="8" name="notePosition">
-      <Position>4</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="44" parent="8" name="prefix">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="45" parent="8" name="isExpanded">
-      <Position>6</Position>
-      <DataType>BOOLEAN|0s</DataType>
-    </column>
-    <column id="46" parent="8" name="isDeleted">
-      <Position>7</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="47" parent="8" name="dateModified">
-      <Position>8</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="48" parent="8" name="hash">
-      <Position>9</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="49" parent="8" name="dateCreated">
-      <Position>10</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;1970-01-01T00:00:00.000Z&apos;</DefaultExpression>
-    </column>
-    <index id="50" parent="8" name="sqlite_autoindex_branches_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>branchId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <index id="51" parent="8" name="IDX_branches_noteId_parentNoteId">
-      <ColNames>noteId
-parentNoteId</ColNames>
-    </index>
-    <index id="52" parent="8" name="IDX_branches_noteId">
-      <ColNames>noteId</ColNames>
-    </index>
-    <index id="53" parent="8" name="IDX_branches_parentNoteId">
-      <ColNames>parentNoteId</ColNames>
-    </index>
-    <key id="54" parent="8">
-      <ColNames>branchId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_branches_1</UnderlyingIndexName>
-    </key>
-    <column id="55" parent="9" name="eventId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="56" parent="9" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="57" parent="9" name="comment">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="58" parent="9" name="dateCreated">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="59" parent="9" name="sqlite_autoindex_event_log_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>eventId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <key id="60" parent="9">
-      <ColNames>eventId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_event_log_1</UnderlyingIndexName>
-    </key>
-    <column id="61" parent="10" name="imageId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="62" parent="10" name="format">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="63" parent="10" name="checksum">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="64" parent="10" name="name">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="65" parent="10" name="data">
-      <Position>5</Position>
-      <DataType>BLOB|0s</DataType>
-    </column>
-    <column id="66" parent="10" name="isDeleted">
-      <Position>6</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="67" parent="10" name="dateModified">
-      <Position>7</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="68" parent="10" name="dateCreated">
-      <Position>8</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="69" parent="10" name="hash">
-      <Position>9</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <index id="70" parent="10" name="sqlite_autoindex_images_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>imageId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <key id="71" parent="10">
-      <ColNames>imageId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_images_1</UnderlyingIndexName>
-    </key>
-    <column id="72" parent="11" name="noteImageId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="73" parent="11" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="74" parent="11" name="imageId">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="75" parent="11" name="isDeleted">
-      <Position>4</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="76" parent="11" name="dateModified">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="77" parent="11" name="dateCreated">
-      <Position>6</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="78" parent="11" name="hash">
-      <Position>7</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <index id="79" parent="11" name="sqlite_autoindex_note_images_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>noteImageId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <index id="80" parent="11" name="IDX_note_images_noteId_imageId">
-      <ColNames>noteId
-imageId</ColNames>
-    </index>
-    <index id="81" parent="11" name="IDX_note_images_noteId">
-      <ColNames>noteId</ColNames>
-    </index>
-    <index id="82" parent="11" name="IDX_note_images_imageId">
-      <ColNames>imageId</ColNames>
-    </index>
-    <key id="83" parent="11">
-      <ColNames>noteImageId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_note_images_1</UnderlyingIndexName>
-    </key>
-    <column id="84" parent="12" name="noteRevisionId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="85" parent="12" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="86" parent="12" name="title">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="87" parent="12" name="content">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="88" parent="12" name="isProtected">
-      <Position>5</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="89" parent="12" name="dateModifiedFrom">
-      <Position>6</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="90" parent="12" name="dateModifiedTo">
-      <Position>7</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="91" parent="12" name="type">
-      <Position>8</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;&apos;</DefaultExpression>
-    </column>
-    <column id="92" parent="12" name="mime">
-      <Position>9</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;&apos;</DefaultExpression>
-    </column>
-    <column id="93" parent="12" name="hash">
-      <Position>10</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <index id="94" parent="12" name="sqlite_autoindex_note_revisions_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>noteRevisionId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <index id="95" parent="12" name="IDX_note_revisions_noteId">
-      <ColNames>noteId</ColNames>
-    </index>
-    <index id="96" parent="12" name="IDX_note_revisions_dateModifiedFrom">
-      <ColNames>dateModifiedFrom</ColNames>
-    </index>
-    <index id="97" parent="12" name="IDX_note_revisions_dateModifiedTo">
-      <ColNames>dateModifiedTo</ColNames>
-    </index>
-    <key id="98" parent="12">
-      <ColNames>noteRevisionId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_note_revisions_1</UnderlyingIndexName>
-    </key>
-    <column id="99" parent="13" name="noteId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="100" parent="13" name="title">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;unnamed&quot;</DefaultExpression>
-    </column>
-    <column id="101" parent="13" name="content">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="102" parent="13" name="isProtected">
-      <Position>4</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="103" parent="13" name="isDeleted">
-      <Position>5</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="104" parent="13" name="dateCreated">
-      <Position>6</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="105" parent="13" name="dateModified">
-      <Position>7</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="106" parent="13" name="type">
-      <Position>8</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;text&apos;</DefaultExpression>
-    </column>
-    <column id="107" parent="13" name="mime">
-      <Position>9</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;text/html&apos;</DefaultExpression>
-    </column>
-    <column id="108" parent="13" name="hash">
-      <Position>10</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <index id="109" parent="13" name="sqlite_autoindex_notes_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>noteId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <index id="110" parent="13" name="IDX_notes_type">
-      <ColNames>type</ColNames>
-    </index>
-    <key id="111" parent="13">
-      <ColNames>noteId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_notes_1</UnderlyingIndexName>
-    </key>
-    <column id="112" parent="14" name="name">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="113" parent="14" name="value">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="114" parent="14" name="dateModified">
-      <Position>3</Position>
-      <DataType>INT|0s</DataType>
-    </column>
-    <column id="115" parent="14" name="isSynced">
-      <Position>4</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="116" parent="14" name="hash">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="117" parent="14" name="dateCreated">
-      <Position>6</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;1970-01-01T00:00:00.000Z&apos;</DefaultExpression>
-    </column>
-    <index id="118" parent="14" name="sqlite_autoindex_options_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>name</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <key id="119" parent="14">
-      <ColNames>name</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_options_1</UnderlyingIndexName>
-    </key>
-    <column id="120" parent="15" name="branchId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="121" parent="15" name="notePath">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="122" parent="15" name="hash">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="123" parent="15" name="dateCreated">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="124" parent="15" name="isDeleted">
-      <Position>5</Position>
-      <DataType>INT|0s</DataType>
-    </column>
-    <index id="125" parent="15" name="sqlite_autoindex_recent_notes_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>branchId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <key id="126" parent="15">
-      <ColNames>branchId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_recent_notes_1</UnderlyingIndexName>
-    </key>
-    <column id="127" parent="16" name="sourceId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="128" parent="16" name="dateCreated">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="129" parent="16" name="sqlite_autoindex_source_ids_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>sourceId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <key id="130" parent="16">
-      <ColNames>sourceId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_source_ids_1</UnderlyingIndexName>
-    </key>
-    <column id="131" parent="17" name="type">
-      <Position>1</Position>
-      <DataType>text|0s</DataType>
-    </column>
-    <column id="132" parent="17" name="name">
-      <Position>2</Position>
-      <DataType>text|0s</DataType>
-    </column>
-    <column id="133" parent="17" name="tbl_name">
-      <Position>3</Position>
-      <DataType>text|0s</DataType>
-    </column>
-    <column id="134" parent="17" name="rootpage">
-      <Position>4</Position>
-      <DataType>integer|0s</DataType>
-    </column>
-    <column id="135" parent="17" name="sql">
-      <Position>5</Position>
-      <DataType>text|0s</DataType>
-    </column>
-    <column id="136" parent="18" name="name">
-      <Position>1</Position>
-    </column>
-    <column id="137" parent="18" name="seq">
-      <Position>2</Position>
-    </column>
-    <column id="138" parent="19" name="id">
-      <Position>1</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-      <SequenceIdentity>1</SequenceIdentity>
-    </column>
-    <column id="139" parent="19" name="entityName">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="140" parent="19" name="entityId">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="141" parent="19" name="sourceId">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="142" parent="19" name="syncDate">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="143" parent="19" name="IDX_sync_entityName_entityId">
-      <ColNames>entityName
-entityId</ColNames>
-      <Unique>1</Unique>
-    </index>
-    <index id="144" parent="19" name="IDX_sync_syncDate">
-      <ColNames>syncDate</ColNames>
-    </index>
-    <key id="145" parent="19">
-      <ColNames>id</ColNames>
-      <Primary>1</Primary>
-    </key>
-  </database-model>
-</dataSource>
--- a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997/storage_v2/_src_/schema/main.uQUzAA.meta
+++ b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997/storage_v2/_src_/schema/main.uQUzAA.meta
@@ -1,2 +0,0 @@
-#n:main
-!<md> [0, 0, null, null, -2147483648, -2147483648]
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
  <profile version="1.0">
    <option name="myName" value="Project Default" />
+    <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/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <file url="PROJECT" libraries="{@types/jquery}" />
+  </component>
+</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
  </component>
 </project>
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -0,0 +1,18 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "start-server",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "env": {
+                "TRILIUM_ENV": "dev"
+            },
+            "outputCapture": "std",
+            "program": "${workspaceFolder}/src/www"
+        }
+    ]
+}
--- a/28
+++ b/28
@@ -1,21 +1,27 @@
-FROM node:8.11.2
-
-RUN apt-get update && apt-get install -y nasm
+FROM node:12.19.0-alpine

 # Create app directory
 WORKDIR /usr/src/app

-# Install app dependencies
-# A wildcard is used to ensure both package.json AND package-lock.json are copied
-# where available (npm@5+)
-COPY package*.json ./
+COPY server-package.json package.json

-RUN npm install --production
-# If you are building your code for production
-# RUN npm install --only=production
+# Install app dependencies
+RUN set -x \
+    && apk add --no-cache --virtual .build-dependencies \
+        autoconf \
+        automake \
+        g++ \
+        gcc \
+        libtool \
+        make \
+        nasm \
+        libpng-dev \
+        python \
+    && npm install --production \
+    && apk del .build-dependencies

 # Bundle app source
 COPY . .

 EXPOSE 8080
-CMD [ "node", "src/www" ]
+CMD [ "node", "./src/www" ]
--- a/README.md
+++ b/README.md
@@ -1,48 +1,57 @@
 # 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)
-Trilium Notes is a hierarchical note taking application. Picture tells a thousand words:
+Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases. See [screenshots](https://github.com/zadam/trilium/wiki/Screenshot-tour) for quick overview:

 ![](https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png)

 ## Features

-* Notes can be arranged into arbitrarily deep hierarchy
-   * Notes can have more than 1 parents - see [cloning](https://github.com/zadam/trilium/wiki/Cloning-notes)
-* WYSIWYG (What You See Is What You Get) editing
-* Fast and easy [navigation between notes](https://github.com/zadam/trilium/wiki/Note-navigation)
-* Seamless note versioning
-* Note labels can be used to tag/label notes as an alternative note organization and querying
-* Can be deployed as web application and / or desktop application with offline access (electron based)
-* [Synchronization with](https://github.com/zadam/trilium/wiki/Synchronization) self-hosted sync server
-* Strong [note encryption](https://github.com/zadam/trilium/wiki/Protected-notes)
+* 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 and images with markdown [autoformat](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)
+* Support for editing [notes with source code](https://github.com/zadam/trilium/wiki/Code-notes), including syntax highlighting
+* Fast and easy [navigation between notes](https://github.com/zadam/trilium/wiki/Note-navigation), full text search and [note hoisting](https://github.com/zadam/trilium/wiki/Note-hoisting)
+* 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
+* Strong [note encryption](https://github.com/zadam/trilium/wiki/Protected-notes) with per-note granularity
+* [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)
+* 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

 ## Builds

-* If you want to install Trilium on server, follow [this page](https://github.com/zadam/trilium/wiki/Installation-as-webapp)
+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).
+
 * If you want to use Trilium on the desktop, download binary release for your platform from [latest release](https://github.com/zadam/trilium/releases/latest), unzip the package and run ```trilium``` executable.
-
-## Supported platforms
-
-Desktop (electron-based) 64-bit builds are available for Linux and Windows.
-
-Requirements for web based installation are [outlined here](https://github.com/zadam/trilium/wiki/Installation-as-webapp).
-
-Currently only recent Chrome and Firefox are supported (tested) browsers. Other modern browsers (not IE) might work as well.
+* 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.

 ## Documentation

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

-* [Installation as webapp](https://github.com/zadam/trilium/wiki/Installation-as-webapp)
-* [Note navigation](https://github.com/zadam/trilium/wiki/Note-navigation)
-* [Tree manipulation](https://github.com/zadam/trilium/wiki/Tree-manipulation)
-* [Labels](https://github.com/zadam/trilium/wiki/Labels)
-* [Links](https://github.com/zadam/trilium/wiki/Links)
-* [Cloning notes](https://github.com/zadam/trilium/wiki/Cloning-notes)
-* [Protected notes](https://github.com/zadam/trilium/wiki/Protected-notes)
-* [Synchronization](https://github.com/zadam/trilium/wiki/Synchronization)
-* [Document](https://github.com/zadam/trilium/wiki/Document)
-* [Theming](https://github.com/zadam/trilium/wiki/Theming)
-* [Keyboard shortcuts](https://github.com/zadam/trilium/wiki/Keyboard-shortcuts)
-* [Troubleshooting](https://github.com/zadam/trilium/wiki/Troubleshooting)
+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
+
+Use a browser based dev environment
+
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/zadam/trilium)
+
+Or clone locally and run
+```
+npm install
+npm run start-server
+```
+
+## 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)
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,13 @@
+# Security Policy
+
+## Supported Versions
+
+In the (still active) 0.X phase of the project only the latest stable minor release is getting bugfixes (including security ones).
+
+So e.g. if the latest stable version is 0.42.3 and the latest beta version is 0.43.0-beta, then 0.42 line will still get security fixes but older versions (like 0.41.X) won't get any fixes.
+
+Description above is a general rule and may be altered on case by case basis.
+
+## Reporting a Vulnerability
+
+You can report low severity vulnerabilities as GitHub issues, more severe vulnerabilities should be reported to the email zadam.apps@gmail.com
--- 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-better_sqlite3.node
+++ b/bin/better-sqlite3/mac-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
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+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
--- a/bin/build-docker.sh
+++ b/bin/build-docker.sh
@@ -1,8 +1,12 @@
 #!/usr/bin/env bash

-if [[ $# -eq 0 ]] ; then
-    echo "Missing argument of new version"
-    exit 1
-fi
+VERSION=`jq -r ".version" package.json`
+SERIES=${VERSION:0:4}-latest

-sudo docker build -t zadam/trilium:latest -t zadam/trilium:$1 .
+cat package.json | grep -v electron > server-package.json
+
+sudo docker build -t zadam/trilium:$VERSION --network host -t zadam/trilium:$SERIES .
+
+if [[ $VERSION != *"beta"* ]]; then
+  sudo docker tag zadam/trilium:$VERSION zadam/trilium:latest
+fi
--- a/bin/build-linux-x64.sh
+++ b/bin/build-linux-x64.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+SRC_DIR=./dist/trilium-linux-x64-src
+
+if [ "$1" != "DONTCOPY" ]
+then
+    ./bin/copy-trilium.sh $SRC_DIR
+fi
+
+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
+
+echo "Packaging linux x64 electron build"
+
+./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
+
+mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR
+
+cp images/app-icons/png/128x128.png $BUILD_DIR/icon.png
+
+# removing software WebGL binaries because they are pretty huge and not necessary
+rm -r $BUILD_DIR/swiftshader
+
+cp bin/tpl/portable-trilium.sh $BUILD_DIR/
+chmod 755 $BUILD_DIR/portable-trilium.sh
+
+echo "Packaging linux x64 electron distribution..."
+VERSION=`jq -r ".version" package.json`
+
+cd dist
+
+tar cJf trilium-linux-x64-${VERSION}.tar.xz trilium-linux-x64
+
+cd ..
+
+bin/build-debian.sh
--- a/bin/build-mac-x64.sh
+++ b/bin/build-mac-x64.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+SRC_DIR=./dist/trilium-mac-x64-src
+
+if [ "$1" != "DONTCOPY" ]
+then
+    ./bin/copy-trilium.sh $SRC_DIR
+fi
+
+echo "Copying required mac binaries"
+
+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.*
+
+echo "Packaging mac x64 electron build"
+
+./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns
+
+BUILD_DIR=./dist/trilium-mac-x64
+rm -rf $BUILD_DIR
+
+# Mac build has by default useless directory level
+mv "./dist/Trilium Notes-darwin-x64" $BUILD_DIR
+
+echo "Zipping mac x64 electron distribution..."
+
+VERSION=`jq -r ".version" package.json`
+
+cd dist
+
+rm trilium-mac-x64-${VERSION}.zip
+zip -r9 --symlinks trilium-mac-x64-${VERSION}.zip trilium-mac-x64
--- a/bin/build-pkg.sh
+++ b/bin/build-pkg.sh
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ $# -eq 0 ]] ; then
-    echo "Missing argument of new version"
-    exit 1
-fi
-
-VERSION=$1
-
-PKG_DIR=dist/trilium-linux-x64-server
-
-mkdir $PKG_DIR
-
-pkg . --targets node8-linux-x64 --output ${PKG_DIR}/trilium
-
-chmod +x ${PKG_DIR}/trilium
-
-cp node_modules/sqlite3/lib/binding/node-v57-linux-x64/node_sqlite3.node ${PKG_DIR}/
-cp node_modules/scrypt/build/Release/scrypt.node ${PKG_DIR}/
-
-cd dist
-
-7z a trilium-linux-x64-${VERSION}-server.7z trilium-linux-x64-server
--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+PKG_DIR=dist/trilium-linux-x64-server
+NODE_VERSION=12.19.0
+
+if [ "$1" != "DONTCOPY" ]
+then
+    ./bin/copy-trilium.sh $PKG_DIR
+fi
+
+cd dist
+wget https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz
+tar xvfJ node-v${NODE_VERSION}-linux-x64.tar.xz
+rm node-v${NODE_VERSION}-linux-x64.tar.xz
+cd ..
+
+mv dist/node-v${NODE_VERSION}-linux-x64 $PKG_DIR/node
+
+rm -r $PKG_DIR/node/lib/node_modules/npm
+rm -r $PKG_DIR/node/include/node
+
+rm -r $PKG_DIR/node_modules/electron*
+
+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
+
+VERSION=`jq -r ".version" package.json`
+
+cd dist
+
+tar cJf trilium-linux-x64-server-${VERSION}.tar.xz trilium-linux-x64-server
--- a/bin/build-win-x64.sh
+++ b/bin/build-win-x64.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+SRC_DIR=./dist/trilium-windows-x64-src
+
+if [ "$1" != "DONTCOPY" ]
+then
+    ./bin/copy-trilium.sh $SRC_DIR
+fi
+
+echo "Copying required windows binaries"
+
+cp -r bin/better-sqlite3/win-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 windows x64 electron build"
+
+./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=win32  --arch=x64 --overwrite --icon=images/app-icons/win/icon.ico
+
+BUILD_DIR=./dist/trilium-windows-x64
+rm -rf $BUILD_DIR
+
+mv "./dist/Trilium Notes-win32-x64" $BUILD_DIR
+
+# removing software WebGL binaries because they are pretty huge and not necessary
+rm -r $BUILD_DIR/swiftshader
+
+cp bin/tpl/portable-trilium.bat $BUILD_DIR/
+
+echo "Zipping windows x64 electron distribution..."
+VERSION=`jq -r ".version" package.json`
+
+cd dist
+
+zip -r9 trilium-windows-x64-${VERSION}.zip trilium-windows-x64
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -2,33 +2,22 @@

 echo "Deleting existing builds"

-rm -r dist/*
+rm -rf dist/*

-echo "Rebuilding binaries for linux-ia32"
-./node_modules/.bin/electron-rebuild --arch=ia32
+SRC_DIR=dist/trilium-src

-./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=ia32 --overwrite
+bin/copy-trilium.sh $SRC_DIR

-./node_modules/.bin/electron-packager . --out=dist --platform=win32 --arch=x64 --overwrite
+# we'll just copy the same SRC dir to all the builds so we don't have to do npm install in each separately
+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

-# we build x64 as second so that we keep X64 binaries in node_modules for local development
-echo "Rebuilding binaries for linux-x64"
-./node_modules/.bin/electron-rebuild --arch=x64
+bin/build-win-x64.sh DONTCOPY

-./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=x64 --overwrite
+bin/build-mac-x64.sh DONTCOPY

-echo "Copying required windows binaries"
+bin/build-linux-x64.sh DONTCOPY

-WIN_RES_DIR=./dist/trilium-win32-x64/resources/app
-
-cp -r bin/deps/sqlite/* $WIN_RES_DIR/node_modules/sqlite3/lib/binding/
-cp bin/deps/image/cjpeg.exe $WIN_RES_DIR/node_modules/mozjpeg/vendor/
-cp bin/deps/image/pngquant.exe $WIN_RES_DIR/node_modules/pngquant-bin/vendor/
-cp bin/deps/image/gifsicle.exe $WIN_RES_DIR/node_modules/giflossy/vendor/
-cp bin/deps/scrypt.node $WIN_RES_DIR/node_modules/scrypt/build/Release/
-
-echo "Cleaning up unnecessary binaries from all builds"
-
-rm -r ./dist/trilium-linux-ia32/resources/app/bin/deps
-rm -r ./dist/trilium-linux-x64/resources/app/bin/deps
-rm -r ./dist/trilium-win32-x64/resources/app/bin/deps
+bin/build-server.sh DONTCOPY
--- a/bin/copy-trilium.sh
+++ b/bin/copy-trilium.sh
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+if [[ $# -eq 0 ]] ; then
+    echo "Missing argument of target directory"
+    exit 1
+fi
+
+npm run webpack
+
+DIR=$1
+
+rm -rf $DIR
+mkdir $DIR
+
+echo "Copying Trilium to build directory $DIR"
+
+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 && npm install --only=prod)
+
+# cleanup of useless files in dependencies
+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.)
+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
+
+rm -r $DIR/src/public/app
+
+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/deb-options.json
+++ b/bin/deb-options.json
@@ -0,0 +1,14 @@
+{
+  "src": "dist/trilium-linux-x64",
+  "dest": "dist/",
+  "name": "trilium",
+  "productName": "Trilium Notes",
+  "genericName": "Note taker",
+  "description": "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases.",
+  "sections": "misc",
+  "maintainer": "zadam.apps@gmail.com",
+  "homepage": "https://github.com/zadam/trilium",
+  "bin": "trilium",
+  "icon": "dist/trilium-linux-x64/icon.png",
+  "categories": [ "Office" ]
+}
--- a/bin/deps/image/cjpeg.exe
+++ b/bin/deps/image/cjpeg.exe
--- a/bin/deps/image/gifsicle.exe
+++ b/bin/deps/image/gifsicle.exe
--- a/bin/deps/image/pngquant.exe
+++ b/bin/deps/image/pngquant.exe
--- a/bin/deps/scrypt.node
+++ b/bin/deps/scrypt.node
--- a/bin/deps/sqlite/electron-v2.0-win32-x64/node_sqlite3.node
+++ b/bin/deps/sqlite/electron-v2.0-win32-x64/node_sqlite3.node
--- a/bin/deps/sqlite/node-v57-win32-x64/node_sqlite3.node
+++ b/bin/deps/sqlite/node-v57-win32-x64/node_sqlite3.node
--- a/bin/export-schema.sh
+++ b/bin/export-schema.sh
@@ -2,6 +2,6 @@

 SCHEMA_FILE_PATH=db/schema.sql

-sqlite3 ~/trilium-data/document.db .schema > "$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/generate-cert.sh
+++ b/bin/generate-cert.sh
@@ -12,5 +12,4 @@ fi
 mkdir -p "$DIR"
 cd "$DIR"

-openssl req -x509 -newkey rsa:2048 -keyout key.pem -out cert.pem -days 2000 -nodes
-
+openssl req -newkey rsa:4096 -x509 -sha256 -days 3650 -nodes -out cert.crt -keyout key.key
--- a/bin/package.sh
+++ b/bin/package.sh
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-VERSION=`jq -r ".version" package.json`
-
-cd dist
-
-echo "Packaging linux x64 electron distribution..."
-7z a trilium-linux-x64-${VERSION}.7z trilium-linux-x64
-
-echo "Packaging linux ia32 electron distribution..."
-7z a trilium-linux-ia32-${VERSION}.7z trilium-linux-ia32
-
-echo "Packaging windows x64 electron distribution..."
-7z a trilium-windows-x64-${VERSION}.7z trilium-win32-x64
--- a/bin/push-docker-image.sh
+++ b/bin/push-docker-image.sh
@@ -5,5 +5,12 @@ if [[ $# -eq 0 ]] ; then
    exit 1
 fi

-sudo docker push zadam/trilium:latest
-sudo docker push zadam/trilium:$1
+VERSION=$1
+SERIES=${VERSION:0:4}-latest
+
+sudo docker push zadam/trilium:$VERSION
+sudo docker push zadam/trilium:$SERIES
+
+if [[ $1 != *"beta"* ]]; then
+  sudo docker push zadam/trilium:latest
+fi
--- a/bin/release.sh
+++ b/bin/release.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash

+export GITHUB_REPO=trilium
+
 if [[ $# -eq 0 ]] ; then
    echo "Missing argument of new version"
    exit 1
@@ -42,18 +44,30 @@ git push origin $TAG

 bin/build.sh

-bin/package.sh
-
-LINUX_X64_BUILD=trilium-linux-x64-$VERSION.7z
-LINUX_IA32_BUILD=trilium-linux-ia32-$VERSION.7z
-WINDOWS_X64_BUILD=trilium-windows-x64-$VERSION.7z
-SERVER_BUILD=trilium-linux-x64-server.7z
+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
+SERVER_BUILD=trilium-linux-x64-server-$VERSION.tar.xz

 echo "Creating release in GitHub"

+EXTRA=
+
+if [[ $TAG == *"beta"* ]]; then
+  EXTRA=--pre-release
+fi
+
 github-release release \
    --tag $TAG \
-    --name "$TAG release"
+    --name "$TAG release" $EXTRA
+
+echo "Uploading debian x64 package"
+
+github-release upload \
+    --tag $TAG \
+    --name "$DEBIAN_X64_BUILD" \
+    --file "dist/$DEBIAN_X64_BUILD"

 echo "Uploading linux x64 build"

@@ -62,13 +76,6 @@ github-release upload \
    --name "$LINUX_X64_BUILD" \
    --file "dist/$LINUX_X64_BUILD"

-echo "Uploading linux ia32 build"
-
-github-release upload \
-    --tag $TAG \
-    --name "$LINUX_IA32_BUILD" \
-    --file "dist/$LINUX_IA32_BUILD"
-
 echo "Uploading windows x64 build"

 github-release upload \
@@ -76,9 +83,14 @@ github-release upload \
    --name "$WINDOWS_X64_BUILD" \
    --file "dist/$WINDOWS_X64_BUILD"

-echo "Packaging server version"
+echo "Uploading mac x64 build"

-bin/build-pkg.sh $VERSION
+github-release upload \
+    --tag $TAG \
+    --name "$MAC_X64_BUILD" \
+    --file "dist/$MAC_X64_BUILD"
+
+echo "Uploading linux x64 server build"

 github-release upload \
    --tag $TAG \
--- a/bin/tpl/portable-trilium.bat
+++ b/bin/tpl/portable-trilium.bat
@@ -0,0 +1,4 @@
+SET DIR=%~dp0
+SET TRILIUM_DATA_DIR=%DIR%\trilium-data
+cd %DIR%
+start trilium.exe
--- a/bin/tpl/portable-trilium.sh
+++ b/bin/tpl/portable-trilium.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+DIR=`dirname "$0"`
+export TRILIUM_DATA_DIR="$DIR/trilium-data"
+
+"$DIR/trilium"
+
--- a/config-sample.ini
+++ b/config-sample.ini
@@ -2,11 +2,19 @@
 # Instance name can be used to distinguish between different instances
 instanceName=

+# set to true to allow using Trilium without authentication (makes sense for server build only, desktop build doesn't need password)
+noAuthentication=false
+
+# Disable automatically generating desktop icon
+# noDesktopIcon=true
+
 [Network]
-# port setting is relevant only for web deployments, desktop builds run on random free port
+# host setting is relevant only for web deployments - set the host on which the server will listen
+# 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 (unsecure).
 https=false
-# path to certificate (run "bash generate-cert.sh" to generate self-signed certificate). Relevant only if https=true
+# path to certificate (run "bash bin/generate-cert.sh" to generate self-signed certificate). Relevant only if https=true
 certPath=
 keyPath=
--- a/db/demo.zip
+++ b/db/demo.zip
--- a/db/main_branches.sql
+++ b/db/main_branches.sql
@@ -1,53 +0,0 @@
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('root', 'root', 'none', 0, null, 1, 0, '2018-01-01T00:00:00.000Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('dLgtLUFn3GoN', '1Heh2acXfPNt', 'root', 21, null, 1, 0, '2017-12-23T00:46:39.304Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('QLfS835GSfIh', '3RkyK9LI18dO', '1Heh2acXfPNt', 1, null, 1, 0, '2017-12-23T01:20:04.181Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('QJAcYJ1gGUh9', 'L1Ox40M1aEyy', '3RkyK9LI18dO', 0, null, 0, 0, '2017-12-23T01:20:45.365Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('wLTa2l3lYi83', 'HJusZTbBU494', '3RkyK9LI18dO', 2, null, 1, 0, '2017-12-23T01:20:50.709Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('yMhwsE7uvEij', '3oldoiMUPOlr', 'HJusZTbBU494', 1, null, 1, 0, '2017-12-23T01:20:55.775Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('EjQTcVVHFmmZ', 'MG0wntwILQW6', '3oldoiMUPOlr', 1, null, 1, 0, '2017-12-23T01:21:10.517Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('jvhKcwz4pYTr', 'ZC78NlmdXeC6', 'WdWZFuWNVDZk', 0, null, 1, 0, '2017-12-23T04:06:21.579Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('CarTrwkGVcPz', 'NncfGH8dyNjJ', 'WdWZFuWNVDZk', 1, null, 0, 0, '2017-12-23T04:06:24.012Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('6M7qPlr7at6N', 'eouCLkjbruai', 'NncfGH8dyNjJ', 0, null, 0, 0, '2017-12-23T01:23:28.291Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('tQgognnAH9WI', 'C44aq4mkaX67', 'NncfGH8dyNjJ', 1, null, 0, 0, '2017-12-23T01:23:31.879Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('xyAi7MmgvAgR', 'C44aq4mkaX67', 'ZC78NlmdXeC6', 1, null, 0, 0, '2017-12-23T01:23:47.756Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('xQ3fjRp9yaPq', 'I6Cw88AirBBl', 'C44aq4mkaX67', 0, null, 0, 0, '2017-12-23T01:24:04.681Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('2GOsNT5LsvTP', 'mcEwFMSjhlvL', 'C44aq4mkaX67', 1, null, 0, 0, '2017-12-23T01:29:35.974Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('RxUiraiR655R', 'CF2lUIJAr6Ey', 'NncfGH8dyNjJ', 2, null, 0, 0, '2017-12-23T01:34:37.658Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('mZuSrZ18Zmv0', 'xkXwueRoDNeN', 'MG0wntwILQW6', 0, null, 0, 0, '2017-12-23T01:35:40.306Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('hbcWTnEnXPwF', 'eXHZAKsMYgur', '1Heh2acXfPNt', 3, null, 1, 0, '2017-12-23T03:32:42.868Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('8a3aNxjG0nu7', '2WU27ekfy07E', 'eXHZAKsMYgur', 0, null, 0, 0, '2017-12-23T03:32:49.379Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('4Tu6vaPdCxCM', 'TjWEndYCCg7g', 'eXHZAKsMYgur', 1, null, 0, 0, '2017-12-23T03:33:23.584Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('lBPOmhP12egP', '8nRNDJGyGs2Z', 'TjWEndYCCg7g', 0, null, 0, 0, '2017-12-23T03:33:37.327Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('C5ipVqeDWySp', '9zSwD89vgzNO', '8nRNDJGyGs2Z', 0, null, 0, 0, '2017-12-23T03:37:04.912Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('uSitzbGcSATJ', 'u5t1EvWa3CMO', 'TjWEndYCCg7g', 1, null, 0, 0, '2017-12-23T03:39:21.918Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('GZ6aRI8rdSJt', '8nRNDJGyGs2Z', 'MG0wntwILQW6', 1, '', 0, 0, '2017-12-23T03:42:28.310Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('HsN4600rQoL9', 'Iha4YwchR413', '3oldoiMUPOlr', 0, null, 1, 0, '2017-12-23T03:44:30.945Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('uipfvAfwWRgx', '6ZuXjCSWgjB4', 'HJusZTbBU494', 0, null, 0, 0, '2017-12-23T03:44:54.096Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('nMRpPWWH8WRk', 'GpGnjmcAPeWG', '6ZuXjCSWgjB4', 0, null, 1, 0, '2017-12-23T03:44:57.036Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('c4wt27WNjepw', '21K84UqGhqlt', 'GpGnjmcAPeWG', 0, null, 0, 0, '2017-12-23T03:45:10.933Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('0fpnraUGs9Kl', 'rz5t0r9Qr2WC', 'HJusZTbBU494', 2, null, 1, 0, '2017-12-23T03:45:20.914Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('d8L8zYlLTbym', 'R6pheWjdwmNU', 'rz5t0r9Qr2WC', 0, null, 1, 0, '2017-12-23T03:45:28.002Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('T4USGzfllu5t', '5v5Dx6LMHXIO', 'Iha4YwchR413', 0, null, 0, 0, '2017-12-23T03:45:44.184Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('c4JgFNIobvQW', 'MLQjmREtcnJ3', 'R6pheWjdwmNU', 0, null, 0, 0, '2017-12-23T03:47:48.208Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('nfWjptAU2ZDg', 'pTTjrxgnvURB', 'R6pheWjdwmNU', 1, null, 0, 0, '2017-12-23T03:47:55.932Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('T2ToYBfyPy0g', 'cFK9sGYZaMWs', 'rz5t0r9Qr2WC', 1, null, 0, 0, '2017-12-23T03:49:32.210Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('NG4gbKOnsM3v', '21K84UqGhqlt', 'MLQjmREtcnJ3', 0, '28. 11. 2017', 0, 0, '2017-12-23T03:53:38.110Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('Fstg4tkccO4N', '5v5Dx6LMHXIO', 'MLQjmREtcnJ3', 1, '21. 12. 2017', 0, 0, '2017-12-23T03:53:49.737Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('MN8B7qXDUViO', 'xkXwueRoDNeN', 'MLQjmREtcnJ3', 2, '22. 12. 2017', 0, 0, '2017-12-23T03:53:57.486Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('gSRkHpB7Bu3D', 'pOFVzbXLmzhX', 'R6pheWjdwmNU', 2, null, 0, 0, '2017-12-23T03:54:46.138Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('6brdjeWDOB6w', '0xtvjqrcGiRB', 'ZC78NlmdXeC6', 0, null, 0, 0, '2017-12-23T04:02:06.650Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('AqKUM2zUVFUF', 'Zl69uXBSen0w', 'ZC78NlmdXeC6', 2, null, 1, 0, '2017-12-23T04:02:16.685Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('Ez7NN2WVzRc4', '62BKAQMVP2KW', 'Zl69uXBSen0w', 1, null, 0, 0, '2017-12-23T04:02:39.164Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('t3vVElqMIQVa', 'h4OfLEAYspud', 'WdWZFuWNVDZk', 2, null, 1, 0, '2017-12-23T04:06:25.769Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('O983DHtLpgmr', '1hASbLRDL7oo', 'h4OfLEAYspud', 0, null, 0, 0, '2017-12-23T16:42:26.347Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('RsvL795Mk1bp', '1hASbLRDL7oo', 'GpGnjmcAPeWG', 1, '', 0, 0, '2017-12-23T04:04:56.830Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('79e4hrHLFmx6', 'jyqG9GucsMdn', 'Iha4YwchR413', 1, null, 0, 0, '2017-12-23T04:05:16.439Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('oWO8rctUjf7d', 'WdWZFuWNVDZk', '1Heh2acXfPNt', 5, null, 1, 0, '2017-12-23T04:06:16.179Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('GOxcrZrxalFN', 'yK4SBJfwD3tY', '1Heh2acXfPNt', 8, null, 1, 0, '2017-12-23T04:06:32.833Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('bSPmEvjLzQKU', 'r4BnsmSQeVr1', 'yK4SBJfwD3tY', 0, null, 0, 0, '2017-12-23T04:06:37.427Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('bMtxCD6cwNR9', 'QbL3pTvhgzM8', 'yK4SBJfwD3tY', 2, null, 0, 0, '2017-12-23T04:06:43.841Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('o4ycR7xIi4oI', 'moMbTKwN15Ps', 'yK4SBJfwD3tY', 3, null, 1, 0, '2017-12-23T04:06:49.331Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('abTEhnOsAsSg', 'PEGQGg0In3Ar', 'GpGnjmcAPeWG', 2, null, 0, 0, '2017-12-23T16:44:35.900Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('bryQseMhyzaI', 'IlULcDiOTI4K', '1Heh2acXfPNt', 0, null, 0, 0, '2017-12-23T18:04:26.439Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('ccslPJf3wQV3', 'vBv6ovBupfTj', 'IlULcDiOTI4K', 0, null, 0, 0, '2017-12-23T18:04:50.904Z');
-INSERT INTO branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified) VALUES ('5Dt9YCMn59sY', 'mw4f2xB4J5fV', 'IlULcDiOTI4K', 1, null, 0, 0, '2017-12-23T18:05:24.868Z');
--- a/db/main_images.sql
+++ b/db/main_images.sql
--- a/db/main_note_images.sql
+++ b/db/main_note_images.sql
@@ -1 +0,0 @@
-INSERT INTO note_images (noteImageId, noteId, imageId, isDeleted, dateModified, dateCreated) VALUES ('2EtgRRPfk4Fi', '1Heh2acXfPNt', 'ed64aET6i379', 0, '2018-01-08T04:41:30.663Z', '2018-01-08T04:41:30.663Z');
--- a/db/main_notes.sql
+++ b/db/main_notes.sql
@@ -1,57 +0,0 @@
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('root', 'root', 'root', 0, 0, '2017-12-22T11:41:07.000Z', '2017-12-22T11:41:07.000Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('1Heh2acXfPNt', 'Trilium Demo', '<figure class="image image-style-side"><img src="/api/images/ed64aET6i379/trilium-small.png"></figure><p><strong>Welcome to Trilium Notes!</strong></p><p>&nbsp;</p><p>This is initial document provided by default Trilium to showcase some of its features and also give you some ideas how you might structure your notes. You can play with it, modify note content and tree structure as you wish.</p><p>&nbsp;</p><p>If you need any help, visit Trilium website: <a href="https://github.com/zadam/trilium">https://github.com/zadam/trilium</a></p><h3>Cleanup</h3><p>Once you''re finished with experimenting and want to cleanup these pages, you can simply delete them all.</p><h3>Formatting</h3><p>Trilium supports classic formatting like <i>italic</i>, <strong>bold</strong>, <i><strong>bold and italic</strong></i>. Of course you can add links like this one pointing to <a href="http://www.google.com">google.com</a></p><h4>Lists</h4><p><strong>Ordered:</strong></p><ol><li>First Item</li><li>Second item<ol><li>First sub-item</li><li>Second sub-item</li></ol></li></ol><p>&nbsp;</p><p><strong>Unordered:</strong></p><ul><li>Item</li><li>Another item<ul><li>Sub-item<ul><li>Sub-sub-item</li></ul></li></ul></li></ul><h4>Block quotes</h4><blockquote><p>Whereof one cannot speak, thereof one must be silent”</p><p>– Ludwig Wittgenstein</p></blockquote><p>&nbsp;</p>', 0, 0, '2017-12-23T00:46:39.304Z', '2017-12-23T04:08:45.445Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('3RkyK9LI18dO', 'Journal', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T01:20:04.181Z', '2017-12-23T18:07:55.377Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('L1Ox40M1aEyy', '2016', '<p>No content.</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p><p>&nbsp;</p>', 0, 0, '2017-12-23T01:20:45.365Z', '2017-12-23T16:40:43.129Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('HJusZTbBU494', '2017', '<p>No content.</p>', 0, 0, '2017-12-23T01:20:50.709Z', '2017-12-23T16:41:03.119Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('3oldoiMUPOlr', 'December', '', 0, 0, '2017-12-23T01:20:55.775Z', '2017-12-23T01:21:05.806Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('MG0wntwILQW6', '22 - friday', 'Daily summary', 0, 0, '2017-12-23T01:21:10.517Z', '2017-12-23T01:22:45.814Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('ZC78NlmdXeC6', 'Linux', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T01:22:55.255Z', '2017-12-23T18:08:10.381Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('NncfGH8dyNjJ', 'Programming', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T01:23:02.584Z', '2017-12-23T18:08:20.179Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('eouCLkjbruai', 'Java', '', 0, 0, '2017-12-23T01:23:28.291Z', '2017-12-23T01:23:31.944Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('C44aq4mkaX67', 'Bash scripting', '<p><strong>Bash</strong> is a <a href="https://en.wikipedia.org/wiki/Unix_shell">Unix shell</a> and <a href="https://en.wikipedia.org/wiki/Command_language">command language</a> written by <a href="https://en.wikipedia.org/wiki/Brian_Fox_(computer_programmer)">Brian Fox</a> for the <a href="https://en.wikipedia.org/wiki/GNU_Project">GNU Project</a> as a <a href="https://en.wikipedia.org/wiki/Free_software">free software</a> replacement for the <a href="https://en.wikipedia.org/wiki/Bourne_shell">Bourne shell</a>. First released in 1989, it has been distributed widely as the default <a href="https://en.wikipedia.org/wiki/Login">login</a> shell for most <a href="https://en.wikipedia.org/wiki/Linux">Linux</a> distributions and <a href="https://en.wikipedia.org/wiki/Apple_Inc.">Apple''s</a> <a href="https://en.wikipedia.org/wiki/MacOS">macOS</a> (formerly OS X). A version <a href="https://en.wikipedia.org/wiki/Windows_Subsystem_for_Linux">is also available for Windows 10</a>.</p><p>&nbsp;</p><p><a href="https://en.wikipedia.org/wiki/Bash_(Unix_shell)">Bash on Wikipedia</a></p>', 0, 0, '2017-12-23T01:23:31.879Z', '2017-12-23T04:00:49.098Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('I6Cw88AirBBl', 'While loop', '<p>Documentation: <a href="http://tldp.org/LDP/Bash-Beginners-Guide/html/sect_09_02.html">http://tldp.org/LDP/Bash-Beginners-Guide/html/sect_09_02.html</a></p><p>&nbsp;</p><p>#!/bin/bash
-
-</p><p># This script opens 4 terminal windows.
-
-</p><p>&nbsp;</p><p>i="0"
-
-</p><p>while [ $i -lt 4 ]
-</p><p>do
-</p><p>&nbsp; &nbsp; xterm &amp;
-</p><p>&nbsp; &nbsp; i=$[$i+1]
-</p><p>done</p>', 0, 0, '2017-12-23T01:24:04.681Z', '2017-12-23T01:26:07.786Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('mcEwFMSjhlvL', 'Bash startup modes', '<h3>Login shell</h3><p>As a "login shell", Bash reads and sets (executes) the user''s profile from /etc/profile and one of ~/.bash_profile, ~/.bash_login, or ~/.profile (in that order, using the first one that''s readable!).</p><p>When a login shell exits, Bash reads and executes commands from the file ~/.bash_logout, if it exists.</p><p>Why an extra login shell mode? There are many actions and variable sets that only make sense for the initial user login. That''s why all UNIX® shells have (should have) a "login" mode.</p><p><i><strong>Methods to start Bash as a login shell:</strong></i></p><ul><li>the first character of argv[0] is - (a hyphen): traditional UNIX® shells start from the login binary</li><li>Bash is started with the -l option</li><li>Bash is started with the --login option</li></ul><p><i><strong>Methods to test for login shell mode:</strong></i></p><ul><li>the shell option <a href="http://wiki.bash-hackers.org/internals/shell_options#login_shell">login_shell</a> is set</li></ul><p><i><strong>Related switches:</strong></i></p><ul><li>--noprofile disables reading of all profile files</li></ul><h3>Interactive shell</h3><p>When Bash starts as an interactive non-login shell, it reads and executes commands from ~/.bashrc. This file should contain, for example, aliases, since they need to be defined in every shell as they''re not inherited from the parent shell.</p><p>The feature to have a system-wide /etc/bash.bashrc or a similar system-wide rc-file is specific to vendors and distributors that ship <i>their own, patched variant of Bash</i>. The classic way to have a system-wide rc file is to source /etc/bashrc from every user''s ~/.bashrc.</p><p><i><strong>Methods to test for interactive-shell mode:</strong></i></p><ul><li>the special parameter $- contains the letter i (lowercase I)</li></ul><p><i><strong>Related switches:</strong></i></p><ul><li>-i forces the interactive mode</li><li>--norc disables reading of the startup files (e.g. /etc/bash.bashrc if supported) and ~/.bashrc</li><li>--rcfile defines another startup file (instead of /etc/bash.bashrc and ~/.bashrc)</li></ul><h3>SH mode</h3><p>When Bash starts in SH compatiblity mode, it tries to mimic the startup behaviour of historical versions of sh as closely as possible, while conforming to the POSIX® standard as well. The profile files read are /etc/profile and ~/.profile, if it''s a login shell.</p><p>If it''s not a login shell, the environment variable <a href="http://wiki.bash-hackers.org/syntax/shellvars#env">ENV</a> is evaluated and the resulting filename is used as the name of the startup file.</p><p>After the startup files are read, Bash enters the <a href="http://wiki.bash-hackers.org/scripting/bashbehaviour#posix_run_mode">POSIX(r) compatiblity mode (for running, not for starting!)</a>.</p><p><i><strong>Bash starts in sh compatiblity mode when:</strong></i></p><ul><li>the base filename in argv[0] is sh (<figure class="image"><img></figure>&nbsp;NB: /bin/sh may be linked to /bin/bash, but that doesn''t mean it acts like /bin/bash&nbsp;<figure class="image"><img></figure>)</li></ul>', 0, 0, '2017-12-23T01:29:35.974Z', '2017-12-23T01:34:10.493Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('CF2lUIJAr6Ey', 'Python', '', 0, 0, '2017-12-23T01:34:37.658Z', '2017-12-23T01:34:40.465Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('xkXwueRoDNeN', 'Christmas shopping', '<p>&nbsp;</p>', 0, 0, '2017-12-23T01:35:40.306Z', '2017-12-23T16:43:08.157Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('eXHZAKsMYgur', 'Books', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T03:32:42.868Z', '2017-12-23T18:08:03.857Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('2WU27ekfy07E', 'To read', '<p>Checkout Kindle daily deals: <a href="https://www.amazon.com/gp/feature.html?docId=1000677541">https://www.amazon.com/gp/feature.html?docId=1000677541</a></p><p>&nbsp;</p><ul><li>Cixin Liu - <a href="https://www.amazon.com/Dark-Forest-Remembrance-Earths-Past/dp/0765386690/ref=pd_bxgy_14_img_2?_encoding=UTF8&amp;pd_rd_i=0765386690&amp;pd_rd_r=AB0J179TM9NTEAMHE240&amp;pd_rd_w=FAhxX&amp;pd_rd_wg=pLGK7&amp;psc=1&amp;refRID=AB0J179TM9NTEAMHE240">The Dark Forest</a></li><li>Ann Leckie - <a href="https://www.amazon.com/Ancillary-Sword-Imperial-Radch-Leckie/dp/0316246654/ref=pd_sim_14_1?_encoding=UTF8&amp;pd_rd_i=0316246654&amp;pd_rd_r=D7KDTGZFP7YM1YSYVY4G&amp;pd_rd_w=jkn28&amp;pd_rd_wg=JVhtw&amp;psc=1&amp;refRID=D7KDTGZFP7YM1YSYVY4G">Ancillary Sword</a></li></ul>', 0, 0, '2017-12-23T03:32:49.379Z', '2017-12-23T03:59:01.970Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('TjWEndYCCg7g', 'Reviews', '', 0, 0, '2017-12-23T03:33:23.584Z', '2017-12-23T03:33:35.089Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('8nRNDJGyGs2Z', 'The Mechanical', '<p><strong>Amazon:</strong> <a href="https://www.amazon.com/Mechanical-Alchemy-Wars-Ian-Tregillis/dp/0316248002">https://www.amazon.com/Mechanical-Alchemy-Wars-Ian-Tregillis/dp/0316248002</a></p><p><strong>Author:</strong> Ian Tregillis</p><p><strong>Dates of reading:</strong> 24. 11. 2017 -13. 12. 2017</p><p>&nbsp;</p><p>I enjoyed this book a lot. It''s slow moving at times with the author taking his time with conversations and descriptions of them. The premise is very interesting, but I''m sad that it wasn''t elaborated more deeply - e.g. the history and development of the clakker technology with Huygens and how Spinoza comes into the picture. Maybe the author saves it for the next two parts of the book.</p><p>&nbsp;</p><p>Language can be intimidating at first for non-native english speakers - author uses wide range of vocabulary. Fortunately it gets better after a while as reader adjusts.</p>', 0, 0, '2017-12-23T03:33:37.327Z', '2017-12-23T03:36:51.534Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('9zSwD89vgzNO', 'Highlights', '<blockquote><p>Like a raindrop rolling down dry valleys to the sea, his body sensed the contours of agony and helplessly followed their gradient. Impelled by alchemical compulsion rather than gravity, Jax became an unstoppable boulder careering along gullies of human whim.</p></blockquote><p>&nbsp;</p><blockquote><p>Free Will was a vacuum, a negative space. It was the absence of coercion, the absence of compulsion, the absence of agony.</p></blockquote><p>&nbsp;</p><blockquote><p>Overwhelming: he could do anything he wanted. But the grand sum of anything-at-all was nothing-at-all. The topology of freedom offered no gradients to nudge him, no landmarks to guide him. How did humans guide themselves? How did they know what to do and what not to do? How did they know when to do anything without the benefit of geasa and metageasa to prioritize every single action of their waking lives? How did they order their daily existence without somebody to tell them what to do?</p></blockquote><blockquote><p>Life as a slave was unspeakable; life as a slave who had briefly tasted freedom was unthinkable. Clakkers carried complex geasa by dint of alchemy; humans carried heavy obligations, too, but called them culture. Society.</p></blockquote>', 0, 0, '2017-12-23T03:37:04.912Z', '2017-12-23T03:38:16.533Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('u5t1EvWa3CMO', 'Man''s search for meaning', '<p><strong>Autor</strong>: Viktor Frankl - <a href="https://en.wikipedia.org/wiki/Viktor_Frankl">https://en.wikipedia.org/wiki/Viktor_Frankl</a></p><p><strong>Wiki</strong> - <a href="https://en.wikipedia.org/wiki/Man%27s_Search_for_Meaning">https://en.wikipedia.org/wiki/Man%27s_Search_for_Meaning</a></p><p>&nbsp;</p><p>But I must explain to you how all this mistaken idea of denouncing pleasure and praising pain was born and I will give you a complete account of the system, and expound the actual teachings of the great explorer of the truth, the master-builder of human happiness. No one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but because those who do not know how to pursue pleasure rationally encounter consequences that are extremely painful. Nor again is there anyone who loves or pursues or desires to obtain pain of itself, because it is pain, but because occasionally circumstances occur in which toil and pain can procure him some great pleasure. To take a trivial example, which of us ever undertakes laborious physical exercise, except to obtain some advantage from it? But who has any right to find fault with a man who chooses to enjoy a pleasure that has no annoying consequences, or one who avoids a pain that produces no resultant pleasure?</p><p>&nbsp;</p>', 0, 0, '2017-12-23T03:39:21.918Z', '2017-12-23T03:40:26.692Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('Iha4YwchR413', '21 - thursday', '', 0, 0, '2017-12-23T03:44:21.176Z', '2017-12-23T03:44:28.816Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('6ZuXjCSWgjB4', 'November', '', 0, 0, '2017-12-23T03:44:45.351Z', '2017-12-23T03:44:53.787Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('GpGnjmcAPeWG', '28', '', 0, 0, '2017-12-23T03:44:57.036Z', '2017-12-23T03:45:08.790Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('21K84UqGhqlt', 'Christmas gift ideas', '<ul><li>XBox</li><li>Candles</li><li><a href="https://www.amazon.ca/Anker-SoundCore-Portable-Bluetooth-Resistance/dp/B01MTB55WH?pd_rd_wg=honW8&amp;pd_rd_r=c9bb7c0f-0051-4da7-991f-4ca711a1b3e3&amp;pd_rd_w=ciUpR&amp;ref_=pd_gw_simh&amp;pf_rd_r=K10XKX0NGPDNTYYP4BS4&amp;pf_rd_p=5f1b460b-78c1-580e-929e-2878fe4859e8">Portable speakers</a></li><li>...?</li></ul>', 0, 0, '2017-12-23T03:45:10.933Z', '2017-12-23T16:43:28.160Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('rz5t0r9Qr2WC', 'Epics', '<p>Epic is kind of medium-term events or projects spread over days or months.</p><p>&nbsp;</p><p>Remember that Trilium is all free form so you can organise your stuff in whatever way you''d like</p><p>&nbsp;</p><p>&nbsp;</p>', 0, 0, '2017-12-23T03:45:20.914Z', '2017-12-23T03:52:37.779Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('R6pheWjdwmNU', 'Christmas', '<p>This christmas is going to be awesome!</p>', 0, 0, '2017-12-23T03:45:28.002Z', '2017-12-23T16:42:53.142Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('5v5Dx6LMHXIO', 'Christmas shopping', '<p>Bought a book!</p>', 0, 0, '2017-12-23T03:45:44.184Z', '2017-12-23T04:09:15.442Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('MLQjmREtcnJ3', 'Shopping', '', 0, 0, '2017-12-23T03:47:48.208Z', '2017-12-23T03:47:51.917Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('pTTjrxgnvURB', 'Vacation days', '<p>25. 12., 26. 12., 1. 1. - statutory holidays</p><p>27. 12. - 29. 12., 2. 1. - vacation days</p>', 0, 0, '2017-12-23T03:47:55.932Z', '2017-12-23T03:49:46.419Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('cFK9sGYZaMWs', 'Vacation in Cuba', 'Planning stuff etc.', 0, 0, '2017-12-23T03:49:32.210Z', '2017-12-23T03:55:17.763Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('pOFVzbXLmzhX', 'Christmas dinner', 'Carp of course!', 0, 0, '2017-12-23T03:54:46.138Z', '2017-12-23T03:54:57.762Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('0xtvjqrcGiRB', 'History', '<p>The <strong>history of Linux</strong> began in 1991 with the commencement of a personal project by <a href="https://en.wikipedia.org/wiki/Finland">Finnish</a> student <a href="https://en.wikipedia.org/wiki/Linus_Torvalds">Linus Torvalds</a> to create a new free operating system kernel. Since then, the resulting <a href="https://en.wikipedia.org/wiki/Linux_kernel">Linux kernel</a> has been marked by constant growth throughout its history. Since the initial release of its <a href="https://en.wikipedia.org/wiki/Source_code">source code</a> in 1991, it has grown from a small number of <a href="https://en.wikipedia.org/wiki/C_Programming_Language">C</a> files under a license prohibiting commercial distribution to the 4.2.3 version in 2015 with more than 18 million lines of source code under the <a href="https://en.wikipedia.org/wiki/GNU_General_Public_License">GNU General Public License</a> v2.</p>', 0, 0, '2017-12-23T04:01:51.565Z', '2017-12-23T04:02:05.496Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('Zl69uXBSen0w', 'Ubuntu', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T04:02:16.685Z', '2017-12-23T18:08:15.381Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('62BKAQMVP2KW', 'Unity shortcuts', '<ul><li>Hold Super - Invoke the Launcher and display the shortcuts</li><li>Hold Super, then press 1 or 2 or 3 and so on until 0 to open or focus an application. The number corresponds to the location of the icon on the launcher from top to bottom.<ul><li>Adding Shift will open a new instance of the application if it''s already open.</li><li>Holding the key is also useful when you want to get to the Launcher but do not want to invoke the Dash.</li></ul></li><li>Super + T - Open the rubbish bin/trash can.</li><li>Alt + F1 - Put keyboard focus on the Launcher, use arrow keys to navigate, Enter launches an application, Right arrow exposes the quicklists if an application has them.</li><li>Ctrl + Alt + T - Launch a terminal window.</li></ul>', 0, 0, '2017-12-23T04:02:39.164Z', '2017-12-23T04:03:09.867Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('h4OfLEAYspud', 'Security', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T04:04:00.715Z', '2017-12-23T18:08:25.474Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('1hASbLRDL7oo', 'Trusted timestamping', '<p>Wiki: <a href="https://en.wikipedia.org/wiki/Trusted_timestamping">https://en.wikipedia.org/wiki/Trusted_timestamping</a></p><p>Bozho: <a href="https://techblog.bozho.net/using-trusted-timestamping-java/">https://techblog.bozho.net/using-trusted-timestamping-java/</a></p><p>&nbsp;</p><p><strong>Trusted timestamping</strong> is the process of <a href="https://en.wikipedia.org/wiki/Computer_security">securely</a> keeping track of the creation and modification time of a document. Security here means that no one—not even the owner of the document—should be able to change it once it has been recorded provided that the timestamper''s integrity is never compromised.</p><p>The administrative aspect involves setting up a publicly available, trusted timestamp management infrastructure to collect, process and renew timestamps.</p>', 0, 0, '2017-12-23T04:04:08.155Z', '2017-12-23T04:04:30.386Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('jyqG9GucsMdn', 'Office party', 'That was fun!', 0, 0, '2017-12-23T04:05:16.439Z', '2017-12-23T04:05:30.373Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('WdWZFuWNVDZk', 'Tech', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T04:06:16.179Z', '2017-12-23T18:08:05.376Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('yK4SBJfwD3tY', 'Work', '<p>Expand note on the left pane to see content.</p>', 0, 0, '2017-12-23T04:06:32.833Z', '2017-12-23T18:08:30.573Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('r4BnsmSQeVr1', 'HR', '<p>HR stuff&nbsp;</p>', 0, 0, '2017-12-23T04:06:37.427Z', '2017-12-23T16:42:23.145Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('QbL3pTvhgzM8', 'Processes', '<p>No content.</p><p>&nbsp;</p>', 0, 0, '2017-12-23T04:06:43.841Z', '2017-12-23T16:42:15.893Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('moMbTKwN15Ps', 'Projects', '<p>Here I''d keep various notes related to my work''s projects etc.</p>', 0, 0, '2017-12-23T04:06:49.331Z', '2017-12-23T04:07:25.429Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('PEGQGg0In3Ar', 'Phone call about work project', '<p>Bla bla bla ....</p>', 0, 0, '2017-12-23T16:44:35.900Z', '2017-12-23T16:44:53.174Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('IlULcDiOTI4K', 'Inbox', '<p>This is a place I use to put notes waiting for better categorization</p><p>&nbsp;</p>', 0, 0, '2017-12-23T16:45:11.047Z', '2017-12-23T18:04:49.545Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('vBv6ovBupfTj', 'Grocery list for today', '<ul><li>cucumber</li><li>cheese</li><li>beer</li></ul><p>&nbsp;</p>', 0, 0, '2017-12-23T18:04:50.904Z', '2017-12-23T18:05:19.574Z');
-INSERT INTO notes (noteId, title, content, isProtected, isDeleted, dateCreated, dateModified) VALUES ('mw4f2xB4J5fV', 'Book to read', '<p>How to be a stoic from Massimo Pigliuci:</p><p>&nbsp;</p><p><a href="https://www.amazon.com/gp/product/B01K3WN1BY?pf_rd_m=A2R2RITDJNW1Q6&amp;storeType=ebooks&amp;pageType=STOREFRONT&amp;pf_rd_p=8e2a96d9-c848-435b-92bd-0856850ad544&amp;pf_rd_r=4J6CT15BS4X8062XNGDF&amp;pf_rd_s=merchandised-search-5&amp;pf_rd_t=40901&amp;ref_=dbs_f_ebk_rwt_scns_mwl_ms5_kmw_8e2a96d9-c848-435b-92bd-0856850ad544_2&amp;pf_rd_i=154606011">https://www.amazon.com/gp/product/B01K3WN1BY?pf_rd_m=A2R2RITDJNW1Q6&amp;storeType=ebooks&amp;pageType=STOREFRONT&amp;pf_rd_p=8e2a96d9-c848-435b-92bd-0856850ad544&amp;pf_rd_r=4J6CT15BS4X8062XNGDF&amp;pf_rd_s=merchandised-search-5&amp;pf_rd_t=40901&amp;ref_=dbs_f_ebk_rwt_scns_mwl_ms5_kmw_8e2a96d9-c848-435b-92bd-0856850ad544_2&amp;pf_rd_i=154606011</a></p>', 0, 0, '2017-12-23T18:05:24.868Z', '2017-12-23T18:06:55.320Z');
--- a/db/migrations/0104__fill_sync_rows_for_options.js
+++ b/db/migrations/0104__fill_sync_rows_for_options.js
@@ -1,4 +1,4 @@
-const syncTableService = require('../../src/services/sync_table');
+const syncTableService = require('../../src/services/entity_changes.js');

 // options has not been filled so far which caused problems with clean-slate sync.
-module.exports = async () => await syncTableService.fillAllSyncRows();
+module.exports = async () => await syncTableService.fillAllSyncRows();
--- a/db/migrations/0112__rename_inheritAttributes.sql
+++ b/db/migrations/0112__rename_inheritAttributes.sql
@@ -0,0 +1 @@
+UPDATE attributes SET name = 'template' WHERE name = 'inheritAttributes';
--- 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/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`INSERT INTO note_images (noteImageId, noteId, imageId, isDeleted, dateModified, dateCreated) VALUES ('2EtgRRPfk4Fi', '1Heh2acXfPNt', 'ed64aET6i379', 0, '2018-01-08T04:41:30.663Z', '2018-01-08T04:41:30.663Z');`
				`@@ -0,0 +1 @@`
				`UPDATE attributes SET name = 'template' WHERE name = 'inheritAttributes';`
				`@@ -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);`