release 0.42.5

fix moving/cloning notes broken in 0.42.4, closes #1066
release 0.42.4
2025-10-31 18:36:30 +01:00 · 2020-05-31 23:33:30 +02:00 · 2020-05-31 22:33:02 +02:00 · 2020-05-31 10:33:12 +02:00 · 2020-05-31 10:32:35 +02:00 · 2020-05-31 10:24:59 +02:00
880 changed files with 109352 additions and 97314 deletions
--- 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
+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
@@ -6,5 +6,8 @@
        <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/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="b0b03187-36c8-4ec1-bdab-fd4273cd692e">
      <driver-ref>sqlite.xerial</driver-ref>
      <synchronize>true</synchronize>
      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/../trilium-data/document.db</jdbc-url>
-      <driver-properties>
-        <property name="enable_load_extension" value="true" />
-      </driver-properties>
+      <jdbc-url>jdbc:sqlite:$USER_HOME$/trilium-data/document.db</jdbc-url>
    </data-source>
  </component>
 </project>
--- a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
+++ b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
@@ -1,603 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dataSource name="document.db">
-  <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.14">
-    <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="links"/>
-    <table id="11" parent="2" name="note_revisions"/>
-    <table id="12" parent="2" name="notes"/>
-    <table id="13" parent="2" name="options"/>
-    <table id="14" parent="2" name="recent_notes"/>
-    <table id="15" parent="2" name="source_ids"/>
-    <table id="16" parent="2" name="sqlite_master">
-      <System>1</System>
-    </table>
-    <table id="17" parent="2" name="sqlite_sequence">
-      <System>1</System>
-    </table>
-    <table id="18" parent="2" name="sync"/>
-    <column id="19" parent="6" name="apiTokenId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="20" parent="6" name="token">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="21" parent="6" name="dateCreated">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="22" parent="6" name="isDeleted">
-      <Position>4</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="23" parent="6" name="hash">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <index id="24" parent="6" name="sqlite_autoindex_api_tokens_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>apiTokenId</ColNames>
-      <ColumnCollations></ColumnCollations>
-      <Unique>1</Unique>
-    </index>
-    <key id="25" parent="6">
-      <ColNames>apiTokenId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_api_tokens_1</UnderlyingIndexName>
-    </key>
-    <column id="26" parent="7" name="attributeId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="27" parent="7" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="28" parent="7" name="type">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="29" parent="7" name="name">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="30" parent="7" name="value">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;&apos;</DefaultExpression>
-    </column>
-    <column id="31" parent="7" name="position">
-      <Position>6</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="32" parent="7" name="dateCreated">
-      <Position>7</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="33" parent="7" name="dateModified">
-      <Position>8</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="34" parent="7" name="isDeleted">
-      <Position>9</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="35" parent="7" name="hash">
-      <Position>10</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="36" parent="7" name="isInheritable">
-      <Position>11</Position>
-      <DataType>int|0s</DataType>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <index id="37" parent="7" name="sqlite_autoindex_attributes_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>attributeId</ColNames>
-      <ColumnCollations></ColumnCollations>
-      <Unique>1</Unique>
-    </index>
-    <key id="38" parent="7">
-      <ColNames>attributeId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_attributes_1</UnderlyingIndexName>
-    </key>
-    <column id="39" parent="8" name="branchId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="40" parent="8" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="41" parent="8" name="parentNoteId">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="42" parent="8" name="notePosition">
-      <Position>4</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="43" parent="8" name="prefix">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="44" parent="8" name="isExpanded">
-      <Position>6</Position>
-      <DataType>BOOLEAN|0s</DataType>
-    </column>
-    <column id="45" parent="8" name="isDeleted">
-      <Position>7</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="46" parent="8" name="dateModified">
-      <Position>8</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="47" parent="8" name="hash">
-      <Position>9</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="48" 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="49" parent="8" name="sqlite_autoindex_branches_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>branchId</ColNames>
-      <ColumnCollations></ColumnCollations>
-      <Unique>1</Unique>
-    </index>
-    <index id="50" parent="8" name="IDX_branches_noteId_parentNoteId">
-      <ColNames>noteId
-parentNoteId</ColNames>
-      <ColumnCollations></ColumnCollations>
-    </index>
-    <index id="51" parent="8" name="IDX_branches_noteId">
-      <ColNames>noteId</ColNames>
-      <ColumnCollations></ColumnCollations>
-    </index>
-    <index id="52" parent="8" name="IDX_branches_parentNoteId">
-      <ColNames>parentNoteId</ColNames>
-      <ColumnCollations></ColumnCollations>
-    </index>
-    <key id="53" parent="8">
-      <ColNames>branchId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_branches_1</UnderlyingIndexName>
-    </key>
-    <column id="54" parent="9" name="eventId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="55" parent="9" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="56" parent="9" name="comment">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="57" parent="9" name="dateCreated">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="58" parent="9" name="sqlite_autoindex_event_log_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>eventId</ColNames>
-      <ColumnCollations></ColumnCollations>
-      <Unique>1</Unique>
-    </index>
-    <key id="59" parent="9">
-      <ColNames>eventId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_event_log_1</UnderlyingIndexName>
-    </key>
-    <column id="60" parent="10" name="linkId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="61" parent="10" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="62" parent="10" name="targetNoteId">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="63" parent="10" name="type">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="64" parent="10" name="isDeleted">
-      <Position>5</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="65" parent="10" name="dateCreated">
-      <Position>6</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="66" parent="10" name="dateModified">
-      <Position>7</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="67" parent="10" name="hash">
-      <Position>8</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <index id="68" parent="10" name="sqlite_autoindex_links_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>linkId</ColNames>
-      <ColumnCollations></ColumnCollations>
-      <Unique>1</Unique>
-    </index>
-    <key id="69" parent="10">
-      <ColNames>linkId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_links_1</UnderlyingIndexName>
-    </key>
-    <column id="70" parent="11" name="noteRevisionId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="71" parent="11" name="noteId">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="72" parent="11" name="title">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="73" parent="11" name="content">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="74" parent="11" name="isProtected">
-      <Position>5</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="75" parent="11" name="dateModifiedFrom">
-      <Position>6</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="76" parent="11" name="dateModifiedTo">
-      <Position>7</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="77" parent="11" name="type">
-      <Position>8</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;&apos;</DefaultExpression>
-    </column>
-    <column id="78" parent="11" name="mime">
-      <Position>9</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;&apos;</DefaultExpression>
-    </column>
-    <column id="79" parent="11" name="hash">
-      <Position>10</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <index id="80" parent="11" name="sqlite_autoindex_note_revisions_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>noteRevisionId</ColNames>
-      <ColumnCollations></ColumnCollations>
-      <Unique>1</Unique>
-    </index>
-    <index id="81" parent="11" name="IDX_note_revisions_noteId">
-      <ColNames>noteId</ColNames>
-      <ColumnCollations></ColumnCollations>
-    </index>
-    <index id="82" parent="11" name="IDX_note_revisions_dateModifiedFrom">
-      <ColNames>dateModifiedFrom</ColNames>
-      <ColumnCollations></ColumnCollations>
-    </index>
-    <index id="83" parent="11" name="IDX_note_revisions_dateModifiedTo">
-      <ColNames>dateModifiedTo</ColNames>
-      <ColumnCollations></ColumnCollations>
-    </index>
-    <key id="84" parent="11">
-      <ColNames>noteRevisionId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_note_revisions_1</UnderlyingIndexName>
-    </key>
-    <column id="85" parent="12" name="noteId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="86" parent="12" name="title">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;note&quot;</DefaultExpression>
-    </column>
-    <column id="87" parent="12" name="content">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <DefaultExpression>NULL</DefaultExpression>
-    </column>
-    <column id="88" parent="12" name="isProtected">
-      <Position>4</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="89" parent="12" name="type">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;text&apos;</DefaultExpression>
-    </column>
-    <column id="90" parent="12" name="mime">
-      <Position>6</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&apos;text/html&apos;</DefaultExpression>
-    </column>
-    <column id="91" parent="12" name="hash">
-      <Position>7</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="92" parent="12" name="isDeleted">
-      <Position>8</Position>
-      <DataType>INT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="93" parent="12" name="dateCreated">
-      <Position>9</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="94" parent="12" name="dateModified">
-      <Position>10</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="95" parent="12" name="sqlite_autoindex_notes_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>noteId</ColNames>
-      <ColumnCollations></ColumnCollations>
-      <Unique>1</Unique>
-    </index>
-    <key id="96" parent="12">
-      <ColNames>noteId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_notes_1</UnderlyingIndexName>
-    </key>
-    <column id="97" parent="13" name="name">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="98" parent="13" name="value">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-    </column>
-    <column id="99" parent="13" name="dateModified">
-      <Position>3</Position>
-      <DataType>INT|0s</DataType>
-    </column>
-    <column id="100" parent="13" name="isSynced">
-      <Position>4</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>0</DefaultExpression>
-    </column>
-    <column id="101" parent="13" name="hash">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="102" parent="13" 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="103" parent="13" name="sqlite_autoindex_options_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>name</ColNames>
-      <ColumnCollations></ColumnCollations>
-      <Unique>1</Unique>
-    </index>
-    <key id="104" parent="13">
-      <ColNames>name</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_options_1</UnderlyingIndexName>
-    </key>
-    <column id="105" parent="14" name="branchId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="106" parent="14" name="notePath">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="107" parent="14" name="hash">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-      <DefaultExpression>&quot;&quot;</DefaultExpression>
-    </column>
-    <column id="108" parent="14" name="dateCreated">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="109" parent="14" name="isDeleted">
-      <Position>5</Position>
-      <DataType>INT|0s</DataType>
-    </column>
-    <index id="110" parent="14" name="sqlite_autoindex_recent_notes_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>branchId</ColNames>
-      <ColumnCollations></ColumnCollations>
-      <Unique>1</Unique>
-    </index>
-    <key id="111" parent="14">
-      <ColNames>branchId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_recent_notes_1</UnderlyingIndexName>
-    </key>
-    <column id="112" parent="15" name="sourceId">
-      <Position>1</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="113" parent="15" name="dateCreated">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="114" parent="15" name="sqlite_autoindex_source_ids_1">
-      <NameSurrogate>1</NameSurrogate>
-      <ColNames>sourceId</ColNames>
-      <ColumnCollations></ColumnCollations>
-      <Unique>1</Unique>
-    </index>
-    <key id="115" parent="15">
-      <ColNames>sourceId</ColNames>
-      <Primary>1</Primary>
-      <UnderlyingIndexName>sqlite_autoindex_source_ids_1</UnderlyingIndexName>
-    </key>
-    <column id="116" parent="16" name="type">
-      <Position>1</Position>
-      <DataType>text|0s</DataType>
-    </column>
-    <column id="117" parent="16" name="name">
-      <Position>2</Position>
-      <DataType>text|0s</DataType>
-    </column>
-    <column id="118" parent="16" name="tbl_name">
-      <Position>3</Position>
-      <DataType>text|0s</DataType>
-    </column>
-    <column id="119" parent="16" name="rootpage">
-      <Position>4</Position>
-      <DataType>integer|0s</DataType>
-    </column>
-    <column id="120" parent="16" name="sql">
-      <Position>5</Position>
-      <DataType>text|0s</DataType>
-    </column>
-    <column id="121" parent="17" name="name">
-      <Position>1</Position>
-    </column>
-    <column id="122" parent="17" name="seq">
-      <Position>2</Position>
-    </column>
-    <column id="123" parent="18" name="id">
-      <Position>1</Position>
-      <DataType>INTEGER|0s</DataType>
-      <NotNull>1</NotNull>
-      <SequenceIdentity>1</SequenceIdentity>
-    </column>
-    <column id="124" parent="18" name="entityName">
-      <Position>2</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="125" parent="18" name="entityId">
-      <Position>3</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="126" parent="18" name="sourceId">
-      <Position>4</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <column id="127" parent="18" name="syncDate">
-      <Position>5</Position>
-      <DataType>TEXT|0s</DataType>
-      <NotNull>1</NotNull>
-    </column>
-    <index id="128" parent="18" name="IDX_sync_entityName_entityId">
-      <ColNames>entityName
-entityId</ColNames>
-      <ColumnCollations></ColumnCollations>
-      <Unique>1</Unique>
-    </index>
-    <index id="129" parent="18" name="IDX_sync_syncDate">
-      <ColNames>syncDate</ColNames>
-      <ColumnCollations></ColumnCollations>
-    </index>
-    <key id="130" parent="18">
-      <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/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/8
+++ b/8
@@ -1,11 +1,9 @@
-FROM node:10.15.0-alpine
+FROM node:12.16.3-alpine

 # Create app directory
 WORKDIR /usr/src/app

-# Copy both package.json and package-lock.json
-# where available (npm@5+)
-COPY package.json package-lock.json ./
+COPY server-package.json package.json

 # Install app dependencies
 RUN set -x \
@@ -17,6 +15,8 @@ RUN set -x \
        libtool \
        make \
        nasm \
+        libpng-dev \
+        python \
    && npm install --production \
    && apk del .build-dependencies

--- a/README.md
+++ b/README.md
@@ -1,29 +1,31 @@
 # 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 with focus on building large personal knowledge bases. See [screenshots](https://github.com/zadam/trilium/wiki/Screenshot-tour) for quick overview: 
+Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases. 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 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-editor#autoformat)
+* 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) for visualizing notes and their relations
+* [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

-Trilium is provided as either desktop application (Linux, Windows, Mac) or web application hosted on your server (Linux).
+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.
 * If you want to install Trilium on server, follow [this page](https://github.com/zadam/trilium/wiki/Server-installation).
@@ -33,4 +35,23 @@ Trilium is provided as either desktop application (Linux, Windows, Mac) or web a

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

-You can also read [Patterns of personal knowledge base](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base) to get some inspiration on how you might use Trilium.
+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/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,5 +1,12 @@
 #!/usr/bin/env bash

 VERSION=`jq -r ".version" package.json`
+SERIES=${VERSION:0:4}-latest

-sudo docker build -t zadam/trilium:latest -t zadam/trilium:$VERSION .
+cat package.json | grep -v electron > server-package.json
+
+sudo docker build -t zadam/trilium:$VERSION -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
@@ -1,24 +1,44 @@
 #!/usr/bin/env bash

+SRC_DIR=./dist/trilium-linux-x64-src
+
+if [ "$1" != "DONTCOPY" ]
+then
+    ./bin/copy-trilium.sh $SRC_DIR
+fi
+
+echo "Copying required linux-x64 binaries"
+
+rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
+rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
+
+rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
+
+cp -r bin/deps/linux-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
+cp bin/deps/linux-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
+
+./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

-# we build x64 as second so that we keep X64 binaries in node_modules for local development and server build
-echo "Rebuilding binaries for linux-x64"
-./node_modules/.bin/electron-rebuild --arch=x64
-
-./node_modules/.bin/electron-packager . --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
-
 mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR

-rm -r "$BUILD_DIR/resources/app/node_modules/sqlite3/lib/binding/*"
+cp images/app-icons/png/128x128.png $BUILD_DIR/icon.png

-cp -r bin/deps/linux-x64/sqlite/electron* "$BUILD_DIR/resources/app/node_modules/sqlite3/lib/binding/"
-
-rm -r $BUILD_DIR/resources/app/bin/deps
 # removing software WebGL binaries because they are pretty huge and not necessary
 rm -r $BUILD_DIR/swiftshader

+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`
-7z a $BUILD_DIR-${VERSION}.7z $BUILD_DIR
+
+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
@@ -1,27 +1,39 @@
 #!/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"
+
+rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
+rm -r $SRC_DIR/node_modules/mozjpeg/vendor/*
+rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
+rm -r $SRC_DIR/node_modules/giflossy/vendor/*
+
+cp -r bin/deps/mac-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
+cp bin/deps/mac-x64/image/cjpeg $SRC_DIR/node_modules/mozjpeg/vendor/
+cp bin/deps/mac-x64/image/pngquant $SRC_DIR/node_modules/pngquant-bin/vendor/
+cp bin/deps/mac-x64/image/gifsicle $SRC_DIR/node_modules/giflossy/vendor/
+
+rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
+
+./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

-./node_modules/.bin/electron-packager . --out=dist --executable-name=trilium --platform=darwin  --arch=x64 --overwrite --icon=src/public/images/app-icons/mac/icon.icns
-
 # Mac build has by default useless directory level
 mv "./dist/Trilium Notes-darwin-x64" $BUILD_DIR

-echo "Copying required mac binaries"
-
-MAC_RES_DIR=$BUILD_DIR/Trilium\ Notes.app/Contents/Resources/app
-
-rm -r "$MAC_RES_DIR/node_modules/sqlite3/lib/binding/*"
-
-cp -r bin/deps/mac-x64/sqlite/* "$MAC_RES_DIR/node_modules/sqlite3/lib/binding/"
-cp bin/deps/mac-x64/image/cjpeg "$MAC_RES_DIR/node_modules/mozjpeg/vendor/"
-cp bin/deps/mac-x64/image/pngquant "$MAC_RES_DIR/node_modules/pngquant-bin/vendor/"
-cp bin/deps/mac-x64/image/gifsicle "$MAC_RES_DIR/node_modules/giflossy/vendor/"
-
-rm -r "$MAC_RES_DIR/bin/deps"
-
-echo "Packaging mac x64 electron distribution..."
+echo "Zipping mac x64 electron distribution..."

 VERSION=`jq -r ".version" package.json`
-7z a $BUILD_DIR-${VERSION}.7z $BUILD_DIR
+
+cd dist
+
+rm trilium-mac-x64-${VERSION}.zip
+zip -r9 --symlinks trilium-mac-x64-${VERSION}.zip trilium-mac-x64
--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@@ -1,37 +1,32 @@
 #!/usr/bin/env bash

 PKG_DIR=dist/trilium-linux-x64-server
-NODE_VERSION=10.15.0
+NODE_VERSION=12.16.3

-rm -r $PKG_DIR
-mkdir $PKG_DIR
-cd $PKG_DIR
+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
-
-mv node-v${NODE_VERSION}-linux-x64 node
-
-cp -r ../../node_modules/ ./
-cp -r ../../src/ ./
-cp -r ../../db/ ./
-cp -r ../../package.json ./
-cp -r ../../package-lock.json ./
-cp -r ../../README.md ./
-cp -r ../../LICENSE ./
-cp -r ../../config-sample.ini ./
-
-rm -r ./node_modules/electron*
-
-rm -r ./node_modules/sqlite3/lib/binding/*
-
-cp -r ../../bin/deps/linux-x64/sqlite/node* ./node_modules/sqlite3/lib/binding/
-
-printf "#/bin/sh\n./node/bin/node src/www" > trilium.sh
-chmod 755 trilium.sh
-
 cd ..

-VERSION=`jq -r ".version" ../package.json`
-7z a trilium-linux-x64-server-${VERSION}.7z trilium-linux-x64-server
+mv dist/node-v${NODE_VERSION}-linux-x64 $PKG_DIR/node
+
+rm -r $PKG_DIR/node_modules/electron*
+
+rm -r $PKG_DIR/node_modules/sqlite3/lib/binding/*
+
+cp -r ./bin/deps/linux-x64/sqlite/node* $PKG_DIR/node_modules/sqlite3/lib/binding/
+
+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
@@ -1,25 +1,41 @@
 #!/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"
+
+rm -r $SRC_DIR/node_modules/sqlite3/lib/binding/*
+rm -r $SRC_DIR/node_modules/mozjpeg/vendor/*
+rm -r $SRC_DIR/node_modules/pngquant-bin/vendor/*
+rm -r $SRC_DIR/node_modules/giflossy/vendor/*
+
+cp -r bin/deps/win-x64/sqlite/* $SRC_DIR/node_modules/sqlite3/lib/binding/
+cp bin/deps/win-x64/image/cjpeg.exe $SRC_DIR/node_modules/mozjpeg/vendor/
+cp bin/deps/win-x64/image/pngquant.exe $SRC_DIR/node_modules/pngquant-bin/vendor/
+cp bin/deps/win-x64/image/gifsicle.exe $SRC_DIR/node_modules/giflossy/vendor/
+
+rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
+
+./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

-./node_modules/.bin/electron-packager . --out=dist --executable-name=trilium --platform=win32  --arch=x64 --overwrite --icon=src/public/images/app-icons/win/icon.ico
-
 mv "./dist/Trilium Notes-win32-x64" $BUILD_DIR

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

-echo "Packaging windows x64 electron distribution..."
+cp bin/tpl/portable-trilium.bat $BUILD_DIR/
+
+echo "Zipping windows x64 electron distribution..."
 VERSION=`jq -r ".version" package.json`
-7z a $BUILD_DIR-${VERSION}.7z $BUILD_DIR
+
+cd dist
+
+zip -r9 trilium-windows-x64-${VERSION}.zip trilium-windows-x64
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -1,18 +1,23 @@
 #!/usr/bin/env bash

-rm -r node_modules
-
-npm install
-
 echo "Deleting existing builds"

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

-bin/build-win-x64.sh
+SRC_DIR=dist/trilium-src

-bin/build-mac-x64.sh
+bin/copy-trilium.sh $SRC_DIR

-# building X64 linux as the last so electron-rebuild will prepare X64 binaries for local development
-bin/build-linux-x64.sh
+# 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

-bin/build-server.sh
+bin/build-win-x64.sh DONTCOPY
+
+bin/build-mac-x64.sh DONTCOPY
+
+bin/build-linux-x64.sh DONTCOPY
+
+bin/build-server.sh DONTCOPY
--- a/bin/copy-trilium.sh
+++ b/bin/copy-trilium.sh
@@ -0,0 +1,38 @@
+#!/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)
+
+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/linux-x64/image/pngquant
+++ b/bin/deps/linux-x64/image/pngquant
--- a/bin/deps/linux-x64/sqlite/electron-v4.0-linux-x64/node_sqlite3.node
+++ b/bin/deps/linux-x64/sqlite/electron-v4.0-linux-x64/node_sqlite3.node
--- a/bin/deps/linux-x64/sqlite/electron-v9.0-linux-x64/node_sqlite3.node
+++ b/bin/deps/linux-x64/sqlite/electron-v9.0-linux-x64/node_sqlite3.node
--- a/bin/deps/linux-x64/sqlite/node-v64-linux-x64/node_sqlite3.node
+++ b/bin/deps/linux-x64/sqlite/node-v64-linux-x64/node_sqlite3.node
--- a/bin/deps/linux-x64/sqlite/node-v72-linux-x64/node_sqlite3.node
+++ b/bin/deps/linux-x64/sqlite/node-v72-linux-x64/node_sqlite3.node
--- a/bin/deps/mac-x64/image/cjpeg
+++ b/bin/deps/mac-x64/image/cjpeg
--- a/bin/deps/mac-x64/image/pngquant
+++ b/bin/deps/mac-x64/image/pngquant
--- a/bin/deps/mac-x64/sqlite/electron-v4.0-darwin-x64/node_sqlite3.node
+++ b/bin/deps/mac-x64/sqlite/electron-v4.0-darwin-x64/node_sqlite3.node
--- a/bin/deps/mac-x64/sqlite/electron-v9.0-darwin-x64/node_sqlite3.node
+++ b/bin/deps/mac-x64/sqlite/electron-v9.0-darwin-x64/node_sqlite3.node
--- a/bin/deps/win-x64/image/cjpeg.exe
+++ b/bin/deps/win-x64/image/cjpeg.exe
--- a/bin/deps/win-x64/image/pngquant.exe
+++ b/bin/deps/win-x64/image/pngquant.exe
--- a/bin/deps/win-x64/sqlite/electron-v4.0-win32-x64/node_sqlite3.node
+++ b/bin/deps/win-x64/sqlite/electron-v4.0-win32-x64/node_sqlite3.node
--- a/bin/deps/win-x64/sqlite/electron-v9.0-win32-x64/node_sqlite3.node
+++ b/bin/deps/win-x64/sqlite/electron-v9.0-win32-x64/node_sqlite3.node
--- 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/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,10 +44,11 @@ git push origin $TAG

 bin/build.sh

-LINUX_X64_BUILD=trilium-linux-x64-$VERSION.7z
-WINDOWS_X64_BUILD=trilium-windows-x64-$VERSION.7z
-MAC_X64_BUILD=trilium-mac-x64-$VERSION.7z
-SERVER_BUILD=trilium-linux-x64-server-$VERSION.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"

@@ -59,6 +62,13 @@ github-release release \
    --tag $TAG \
    --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"

 github-release upload \
--- 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,8 +2,13 @@
 # Instance name can be used to distinguish between different instances
 instanceName=

+# 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
--- a/db/demo.tar
+++ b/db/demo.tar
--- a/db/demo.zip
+++ b/db/demo.zip
--- 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/sync_table');
+
+module.exports = async () => {
+    await syncTableService.fillAllSyncRows();
+};
--- a/db/migrations/0133__drop_note_fulltext.sql
+++ b/db/migrations/0133__drop_note_fulltext.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS note_fulltext;
--- a/db/migrations/0134__create_openTabs_option.sql
+++ b/db/migrations/0134__create_openTabs_option.sql
@@ -0,0 +1,4 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+    SELECT 'openTabs', '[{"notePath":"' || value || '","active": true,"tabId":"1111"}]', '2019-05-01T18:31:00.874Z', '2019-05-01T18:31:00.874Z', 0 FROM options WHERE name = 'startNotePath';
+
+DELETE FROM options WHERE name = 'startNotePath';
--- a/db/migrations/0135__add_hideTabRowForOneTab_option.sql
+++ b/db/migrations/0135__add_hideTabRowForOneTab_option.sql
@@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+    VALUES ('hideTabRowForOneTab', 'false', '2019-05-01T18:31:00.874Z', '2019-05-01T18:31:00.874Z', 0);
--- a/db/migrations/0136__update_recent_notes.sql
+++ b/db/migrations/0136__update_recent_notes.sql
@@ -0,0 +1,12 @@
+drop table recent_notes;
+
+create table recent_notes
+(
+    noteId TEXT not null primary key,
+    notePath TEXT not null,
+    hash TEXT default "" not null,
+    utcDateCreated TEXT not null,
+    isDeleted INT
+);
+
+delete from sync where entityName = 'recent_notes';
--- a/db/migrations/0137__links_to_attributes.sql
+++ b/db/migrations/0137__links_to_attributes.sql
@@ -0,0 +1,10 @@
+UPDATE links SET type = 'internal-link' WHERE type = 'hyper';
+UPDATE links SET type = 'image-link' WHERE type = 'image';
+UPDATE links SET type = 'relation-map-link' WHERE type = 'relation-map';
+
+INSERT INTO attributes (attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable)
+SELECT linkId, noteId, 'relation', type, targetNoteId, 0, utcDateCreated, utcDateModified, isDeleted, hash, 0 FROM links;
+
+UPDATE sync SET entityName = 'attributes' WHERE entityName = 'links';
+
+DROP TABLE links;
--- a/db/migrations/0138__sidebar_sizing.sql
+++ b/db/migrations/0138__sidebar_sizing.sql
@@ -0,0 +1,5 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('sidebarMinWidth', '350', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('sidebarWidthPercent', '25', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0139__show_sidebar_in_new_tab.sql
+++ b/db/migrations/0139__show_sidebar_in_new_tab.sql
@@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('showSidebarInNewTab', 'true', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0140__widget_config.sql
+++ b/db/migrations/0140__widget_config.sql
@@ -0,0 +1,14 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('noteInfoWidget', '{"enabled":true,"expanded":true,"position":100}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('attributesWidget', '{"enabled":true,"expanded":true,"position":200}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('linkMapWidget', '{"enabled":true,"expanded":true,"position":300}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('noteRevisionsWidget', '{"enabled":true,"expanded":true,"position":400}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('whatLinksHereWidget', '{"enabled":false,"expanded":true,"position":500}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0141__add_code_note_mime_types.sql
+++ b/db/migrations/0141__add_code_note_mime_types.sql
@@ -0,0 +1,5 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('codeNotesMimeTypes', '["text/x-csrc","text/x-c++src","text/x-csharp","text/css","text/x-go","text/x-groovy","text/x-haskell","text/html","message/http","text/x-java","application/javascript;env=frontend","application/javascript;env=backend","application/json","text/x-kotlin","text/x-markdown","text/x-perl","text/x-php","text/x-python","text/x-ruby",null,"text/x-sql","text/x-swift","text/xml","text/x-yaml"]', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 1);
+
+INSERT INTO sync (entityName, entityId, sourceId, utcSyncDate)
+VALUES ('options' ,'codeNotesMimeTypes', 'SYNC_FILL', '2018-01-01T00:00:00.000Z');
--- a/db/migrations/0142__similar_notes_widget.sql
+++ b/db/migrations/0142__similar_notes_widget.sql
@@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('similarNotesWidget', '{"enabled":true,"expanded":true,"position":600}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0143__drop_event_log.sql
+++ b/db/migrations/0143__drop_event_log.sql
@@ -0,0 +1 @@
+DROP TABLE event_log;
--- a/db/migrations/0144__edited_notes_widget.sql
+++ b/db/migrations/0144__edited_notes_widget.sql
@@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('editedNotesWidget', '{"enabled":true,"expanded":true,"position":50}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0145__calendar_widget.sql
+++ b/db/migrations/0145__calendar_widget.sql
@@ -0,0 +1,2 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('calendarWidget', '{"enabled":true,"expanded":true,"position":20}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0146__add_spell_check_options.sql
+++ b/db/migrations/0146__add_spell_check_options.sql
@@ -0,0 +1,5 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('spellCheckEnabled', 'true', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
+
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+VALUES ('spellCheckLanguageCode', 'en-US', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0147__add_hideTabRowForOneTab_if_missing.sql
+++ b/db/migrations/0147__add_hideTabRowForOneTab_if_missing.sql
@@ -0,0 +1,3 @@
+INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
+SELECT 'hideTabRowForOneTab', 'false', '2019-05-01T18:31:00.874Z', '2019-05-01T18:31:00.874Z', 0
+WHERE NOT EXISTS(SELECT 1 FROM options WHERE name = 'hideTabRowForOneTab');
--- a/db/migrations/0148__make_isExpanded_not_null.sql
+++ b/db/migrations/0148__make_isExpanded_not_null.sql
@@ -0,0 +1,22 @@
+CREATE TABLE IF NOT EXISTS "mig_branches" (
+                                          `branchId`	TEXT NOT NULL,
+                                          `noteId`	TEXT NOT NULL,
+                                          `parentNoteId`	TEXT NOT NULL,
+                                          `notePosition`	INTEGER NOT NULL,
+                                          `prefix`	TEXT,
+                                          `isExpanded`	INTEGER NOT NULL DEFAULT 0,
+                                          `isDeleted`	INTEGER NOT NULL DEFAULT 0,
+                                          `utcDateModified`	TEXT NOT NULL,
+                                          utcDateCreated TEXT NOT NULL,
+                                          hash TEXT DEFAULT "" NOT NULL,
+                                          PRIMARY KEY(`branchId`));
+
+INSERT INTO mig_branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash)
+SELECT branchId, noteId, parentNoteId, notePosition, prefix, COALESCE(isExpanded, 0), isDeleted, utcDateModified, utcDateCreated, hash FROM branches;
+
+DROP TABLE branches;
+ALTER TABLE mig_branches RENAME TO branches;
+
+CREATE INDEX `IDX_branches_noteId` ON `branches` (`noteId`);
+CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
+CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
--- a/db/migrations/0149__space_out_positions.sql
+++ b/db/migrations/0149__space_out_positions.sql
@@ -0,0 +1,2 @@
+UPDATE branches SET notePosition = notePosition * 10;
+UPDATE attributes SET position = position * 10;
--- a/db/migrations/0150__note_revision_contents.sql
+++ b/db/migrations/0150__note_revision_contents.sql
@@ -0,0 +1,36 @@
+CREATE TABLE IF NOT EXISTS "note_revisions_mig" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                                `noteId`	TEXT NOT NULL,
+                                                `title`	TEXT,
+                                                `contentLength`	INT NOT NULL,
+                                                `isProtected`	INT NOT NULL DEFAULT 0,
+                                                `utcDateLastEdited` TEXT NOT NULL,
+                                                `utcDateCreated` TEXT NOT NULL,
+                                                `utcDateModified` TEXT NOT NULL,
+                                                `dateLastEdited` TEXT NOT NULL,
+                                                `dateCreated` TEXT NOT NULL,
+                                                type TEXT DEFAULT '' NOT NULL,
+                                                mime TEXT DEFAULT '' NOT NULL,
+                                                hash TEXT DEFAULT '' NOT NULL);
+
+CREATE TABLE IF NOT EXISTS "note_revision_contents" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                                 `content`	TEXT,
+                                                 hash TEXT DEFAULT '' NOT NULL,
+                                                 `utcDateModified` TEXT NOT NULL);
+
+INSERT INTO note_revision_contents (noteRevisionId, content, hash, utcDateModified)
+SELECT noteRevisionId, content, hash, utcDateModifiedTo FROM note_revisions;
+
+INSERT INTO note_revisions_mig (noteRevisionId, noteId, title, contentLength, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash)
+SELECT noteRevisionId, noteId, title, COALESCE(LENGTH(content), 0), isProtected, utcDateModifiedFrom, utcDateModifiedTo, utcDateModifiedTo, dateModifiedFrom, dateModifiedTo, type, mime, hash FROM note_revisions;
+
+DROP TABLE note_revisions;
+ALTER TABLE note_revisions_mig RENAME TO note_revisions;
+
+CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (`noteId`);
+CREATE INDEX `IDX_note_revisions_utcDateCreated` ON `note_revisions` (`utcDateCreated`);
+CREATE INDEX `IDX_note_revisions_utcDateLastEdited` ON `note_revisions` (`utcDateLastEdited`);
+CREATE INDEX `IDX_note_revisions_dateCreated` ON `note_revisions` (`dateCreated`);
+CREATE INDEX `IDX_note_revisions_dateLastEdited` ON `note_revisions` (`dateLastEdited`);
+
+INSERT INTO sync (entityName, entityId, sourceId, utcSyncDate)
+SELECT 'note_revision_contents', entityId, sourceId, utcSyncDate FROM sync WHERE entityName = 'note_revisions';
--- a/db/migrations/0151__add_isErased_to_note.sql
+++ b/db/migrations/0151__add_isErased_to_note.sql
@@ -0,0 +1,31 @@
+CREATE TABLE IF NOT EXISTS "notes_mig" (
+                                       `noteId`	TEXT NOT NULL,
+                                       `title`	TEXT NOT NULL DEFAULT "note",
+                                       `isProtected`	INT NOT NULL DEFAULT 0,
+                                       `type` TEXT NOT NULL DEFAULT 'text',
+                                       `mime` TEXT NOT NULL DEFAULT 'text/html',
+                                       `hash` TEXT DEFAULT "" NOT NULL,
+                                       `isDeleted`	INT NOT NULL DEFAULT 0,
+                                       `isErased`	INT NOT NULL DEFAULT 0,
+                                       `dateCreated`	TEXT NOT NULL,
+                                       `dateModified`	TEXT NOT NULL,
+                                       `utcDateCreated`	TEXT NOT NULL,
+                                       `utcDateModified`	TEXT NOT NULL,
+                                       PRIMARY KEY(`noteId`));
+
+INSERT INTO notes_mig (noteId, title, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
+SELECT noteId, title, isProtected, type, mime, hash, isDeleted, 0, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes;
+
+DROP TABLE notes;
+ALTER TABLE notes_mig RENAME TO notes;
+
+UPDATE notes SET isErased = 1 WHERE isDeleted = 1
+AND 1=(SELECT CASE WHEN content IS NULL THEN 1 ELSE 0 END FROM note_contents WHERE note_contents.noteId = notes.noteId);
+
+CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
+CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
+CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
+CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
+CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
+CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
+CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
--- a/db/migrations/0152__add_contentLength_to_note.sql
+++ b/db/migrations/0152__add_contentLength_to_note.sql
@@ -0,0 +1,34 @@
+CREATE TABLE IF NOT EXISTS "notes_mig" (
+                                           `noteId`	TEXT NOT NULL,
+                                           `title`	TEXT NOT NULL DEFAULT "note",
+                                           `contentLength`	INT NOT NULL,
+                                           `isProtected`	INT NOT NULL DEFAULT 0,
+                                           `type` TEXT NOT NULL DEFAULT 'text',
+                                           `mime` TEXT NOT NULL DEFAULT 'text/html',
+                                           `hash` TEXT DEFAULT "" NOT NULL,
+                                           `isDeleted`	INT NOT NULL DEFAULT 0,
+                                           `isErased`	INT NOT NULL DEFAULT 0,
+                                           `dateCreated`	TEXT NOT NULL,
+                                           `dateModified`	TEXT NOT NULL,
+                                           `utcDateCreated`	TEXT NOT NULL,
+                                           `utcDateModified`	TEXT NOT NULL,
+                                           PRIMARY KEY(`noteId`));
+
+INSERT INTO notes_mig (noteId, title, contentLength, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
+SELECT noteId, title, -1, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes;
+
+DROP TABLE notes;
+ALTER TABLE notes_mig RENAME TO notes;
+
+UPDATE notes SET contentLength = COALESCE((SELECT COALESCE(LENGTH(content), 0) FROM note_contents WHERE note_contents.noteId = notes.noteId), -1);
+
+CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
+CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
+CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
+CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
+CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
+CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
+CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
+
+-- should be OK since sync protocol changes so all instances must upgrade
+UPDATE attributes SET isDeleted = 1 WHERE name = 'fileSize';
--- a/db/migrations/0153__add_isErased_to_note_revision.sql
+++ b/db/migrations/0153__add_isErased_to_note_revision.sql
@@ -0,0 +1,28 @@
+CREATE TABLE IF NOT EXISTS "note_revisions_mig" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                                 `noteId`	TEXT NOT NULL,
+                                                 `title`	TEXT,
+                                                 `contentLength`	INT NOT NULL,
+                                                 `isErased`	INT NOT NULL DEFAULT 0,
+                                                 `isProtected`	INT NOT NULL DEFAULT 0,
+                                                 `utcDateLastEdited` TEXT NOT NULL,
+                                                 `utcDateCreated` TEXT NOT NULL,
+                                                 `utcDateModified` TEXT NOT NULL,
+                                                 `dateLastEdited` TEXT NOT NULL,
+                                                 `dateCreated` TEXT NOT NULL,
+                                                 type TEXT DEFAULT '' NOT NULL,
+                                                 mime TEXT DEFAULT '' NOT NULL,
+                                                 hash TEXT DEFAULT '' NOT NULL);
+
+INSERT INTO note_revisions_mig (noteRevisionId, noteId, title, contentLength, isErased, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash)
+SELECT noteRevisionId, noteId, title, contentLength, 0, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash FROM note_revisions;
+
+DROP TABLE note_revisions;
+ALTER TABLE note_revisions_mig RENAME TO note_revisions;
+
+UPDATE note_revisions SET isErased = (SELECT isErased FROM notes WHERE notes.noteId = note_revisions.noteId);
+
+CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (`noteId`);
+CREATE INDEX `IDX_note_revisions_utcDateCreated` ON `note_revisions` (`utcDateCreated`);
+CREATE INDEX `IDX_note_revisions_utcDateLastEdited` ON `note_revisions` (`utcDateLastEdited`);
+CREATE INDEX `IDX_note_revisions_dateCreated` ON `note_revisions` (`dateCreated`);
+CREATE INDEX `IDX_note_revisions_dateLastEdited` ON `note_revisions` (`dateLastEdited`);
--- a/db/migrations/0154__system_links_should_follow_camelCase.sql
+++ b/db/migrations/0154__system_links_should_follow_camelCase.sql
@@ -0,0 +1,3 @@
+UPDATE attributes SET name = 'internalLink' WHERE name = 'internal-link';
+UPDATE attributes SET name = 'imageLink' WHERE name = 'image-link';
+UPDATE attributes SET name = 'relationMapLink' WHERE name = 'relation-map-link';
--- a/db/migrations/0155__indexes.sql
+++ b/db/migrations/0155__indexes.sql
@@ -0,0 +1,5 @@
+DROP INDEX IF EXISTS IDX_attributes_name_index;
+DROP INDEX IF EXISTS IDX_branches_noteId;
+
+CREATE INDEX IDX_source_ids_utcDateCreated
+    on source_ids (utcDateCreated);
--- a/db/migrations/0156__add_deleteId.sql
+++ b/db/migrations/0156__add_deleteId.sql
@@ -0,0 +1,81 @@
+CREATE TABLE IF NOT EXISTS "notes_mig" (
+                                           `noteId`	TEXT NOT NULL,
+                                           `title`	TEXT NOT NULL DEFAULT "note",
+                                           `contentLength`	INT NOT NULL,
+                                           `isProtected`	INT NOT NULL DEFAULT 0,
+                                           `type` TEXT NOT NULL DEFAULT 'text',
+                                           `mime` TEXT NOT NULL DEFAULT 'text/html',
+                                           `hash` TEXT DEFAULT "" NOT NULL,
+                                           `isDeleted`	INT NOT NULL DEFAULT 0,
+                                           `deleteId`   TEXT DEFAULT NULL,
+                                           `isErased`	INT NOT NULL DEFAULT 0,
+                                           `dateCreated`	TEXT NOT NULL,
+                                           `dateModified`	TEXT NOT NULL,
+                                           `utcDateCreated`	TEXT NOT NULL,
+                                           `utcDateModified`	TEXT NOT NULL,
+                                           PRIMARY KEY(`noteId`));
+
+INSERT INTO notes_mig (noteId, title, contentLength, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
+SELECT noteId, title, -1, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes;
+
+DROP TABLE notes;
+ALTER TABLE notes_mig RENAME TO notes;
+
+CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
+CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
+CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
+CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
+CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
+CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
+CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
+
+CREATE TABLE IF NOT EXISTS "branches_mig" (
+                                          `branchId`	TEXT NOT NULL,
+                                          `noteId`	TEXT NOT NULL,
+                                          `parentNoteId`	TEXT NOT NULL,
+                                          `notePosition`	INTEGER NOT NULL,
+                                          `prefix`	TEXT,
+                                          `isExpanded`	INTEGER NOT NULL DEFAULT 0,
+                                          `isDeleted`	INTEGER NOT NULL DEFAULT 0,
+                                          `deleteId`    TEXT DEFAULT NULL,
+                                          `utcDateModified`	TEXT NOT NULL,
+                                          utcDateCreated TEXT NOT NULL,
+                                          hash TEXT DEFAULT "" NOT NULL,
+                                          PRIMARY KEY(`branchId`));
+
+INSERT INTO branches_mig (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash)
+    SELECT branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash FROM branches;
+
+DROP TABLE branches;
+ALTER TABLE branches_mig RENAME TO branches;
+
+CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
+CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
+
+CREATE TABLE IF NOT EXISTS "attributes_mig"
+(
+    attributeId      TEXT not null primary key,
+    noteId       TEXT not null,
+    type         TEXT not null,
+    name         TEXT not null,
+    value        TEXT default '' not null,
+    position     INT  default 0 not null,
+    utcDateCreated  TEXT not null,
+    utcDateModified TEXT not null,
+    isDeleted    INT  not null,
+    `deleteId`    TEXT DEFAULT NULL,
+    hash         TEXT default "" not null,
+    isInheritable int DEFAULT 0 NULL);
+
+INSERT INTO attributes_mig (attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable)
+SELECT attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable FROM attributes;
+
+DROP TABLE attributes;
+ALTER TABLE attributes_mig RENAME TO attributes;
+
+CREATE INDEX IDX_attributes_name_value
+    on attributes (name, value);
+CREATE INDEX IDX_attributes_noteId_index
+    on attributes (noteId);
+CREATE INDEX IDX_attributes_value_index
+    on attributes (value);
--- a/db/migrations/0157__fix_contentLength.sql
+++ b/db/migrations/0157__fix_contentLength.sql
@@ -0,0 +1 @@
+UPDATE notes SET contentLength = COALESCE((SELECT COALESCE(LENGTH(content), 0) FROM note_contents WHERE note_contents.noteId = notes.noteId), -1);
--- a/db/migrations/0158__add_isSynced_to_sync.sql
+++ b/db/migrations/0158__add_isSynced_to_sync.sql
@@ -0,0 +1,22 @@
+CREATE TABLE IF NOT EXISTS "sync_mig" (
+                                          `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                          `entityName`	TEXT NOT NULL,
+                                          `entityId`	TEXT NOT NULL,
+                                          `sourceId` TEXT NOT NULL,
+                                          `isSynced` INTEGER default 0 not null,
+                                          `utcSyncDate`	TEXT NOT NULL);
+
+INSERT INTO sync_mig (id, entityName, entityId, sourceId, isSynced, utcSyncDate)
+SELECT id, entityName, entityId, sourceId, 1, utcSyncDate FROM sync;
+
+DROP TABLE sync;
+
+ALTER TABLE sync_mig RENAME TO sync;
+
+CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` (
+                                                              `entityName`,
+                                                              `entityId`
+    );
+CREATE INDEX `IDX_sync_utcSyncDate` ON `sync` (
+                                               `utcSyncDate`
+    );
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -1,132 +1,133 @@
-CREATE TABLE IF NOT EXISTS "sync" (
-  `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  `entityName`	TEXT NOT NULL,
-  `entityId`	TEXT NOT NULL,
-  `sourceId` TEXT NOT NULL,
-  `syncDate`	TEXT NOT NULL);
-CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` (
-  `entityName`,
-  `entityId`
-);
-CREATE INDEX `IDX_sync_syncDate` ON `sync` (
-  `syncDate`
-);
 CREATE TABLE IF NOT EXISTS "source_ids" (
-  `sourceId`	TEXT NOT NULL,
-  `dateCreated`	TEXT NOT NULL,
-  PRIMARY KEY(`sourceId`)
-);
-CREATE TABLE IF NOT EXISTS "note_revisions" (
-  `noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
-  `noteId`	TEXT NOT NULL,
-  `title`	TEXT,
-  `content`	TEXT,
-  `isProtected`	INT NOT NULL DEFAULT 0,
-  `dateModifiedFrom` TEXT NOT NULL,
-  `dateModifiedTo` TEXT NOT NULL
-, type TEXT DEFAULT '' NOT NULL, mime TEXT DEFAULT '' NOT NULL, hash TEXT DEFAULT "" NOT NULL);
-CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (
-  `noteId`
-);
-CREATE INDEX `IDX_note_revisions_dateModifiedFrom` ON `note_revisions` (
-  `dateModifiedFrom`
-);
-CREATE INDEX `IDX_note_revisions_dateModifiedTo` ON `note_revisions` (
-  `dateModifiedTo`
+                                          `sourceId`	TEXT NOT NULL,
+                                          `utcDateCreated`	TEXT NOT NULL,
+                                          PRIMARY KEY(`sourceId`)
 );
 CREATE TABLE IF NOT EXISTS "api_tokens"
 (
  apiTokenId TEXT PRIMARY KEY NOT NULL,
  token TEXT NOT NULL,
-  dateCreated TEXT NOT NULL,
-  isDeleted INT NOT NULL DEFAULT 0
-, hash TEXT DEFAULT "" NOT NULL);
-CREATE TABLE IF NOT EXISTS "branches" (
-  `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,
-  `dateModified`	TEXT NOT NULL, hash TEXT DEFAULT "" NOT NULL, dateCreated TEXT NOT NULL DEFAULT '1970-01-01T00:00:00.000Z',
-  PRIMARY KEY(`branchId`)
-);
-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 TABLE IF NOT EXISTS "recent_notes" (
-  `branchId` TEXT NOT NULL PRIMARY KEY,
-  `notePath` TEXT NOT NULL,
-  hash TEXT DEFAULT "" NOT NULL,
-  `dateCreated` TEXT NOT NULL,
-  isDeleted INT
-);
-CREATE TABLE IF NOT EXISTS "event_log" (
-  `eventId`	TEXT NOT NULL PRIMARY KEY,
-  `noteId`	TEXT,
-  `comment`	TEXT,
-  `dateCreated`	TEXT NOT NULL
-);
+  utcDateCreated TEXT NOT NULL,
+  isDeleted INT NOT NULL DEFAULT 0,
+  hash TEXT DEFAULT "" NOT NULL);
 CREATE TABLE IF NOT EXISTS "options"
 (
  name TEXT not null PRIMARY KEY,
  value TEXT,
-  dateModified INT,
  isSynced INTEGER default 0 not null,
  hash TEXT default "" not null,
-  dateCreated TEXT default '1970-01-01T00:00:00.000Z' not null
+  utcDateCreated TEXT not null,
+  utcDateModified TEXT NOT NULL
 );
-CREATE TABLE attributes
+CREATE TABLE IF NOT EXISTS "note_contents" (
+                                                   `noteId`	TEXT NOT NULL,
+                                                   `content`	TEXT NULL DEFAULT NULL,
+                                                   `hash` TEXT DEFAULT "" NOT NULL,
+                                                   `utcDateModified` TEXT NOT NULL,
+                                                   PRIMARY KEY(`noteId`)
+);
+CREATE TABLE recent_notes
 (
-  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,
-  dateCreated  TEXT not null,
-  dateModified TEXT not null,
-  isDeleted    INT  not null,
-  hash         TEXT default "" not null, isInheritable int DEFAULT 0 NULL);
-CREATE INDEX IDX_attributes_name_value
-  on attributes (name, value);
+    noteId TEXT not null primary key,
+    notePath TEXT not null,
+    hash TEXT default "" not null,
+    utcDateCreated TEXT not null,
+    isDeleted INT
+);
+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);
+CREATE TABLE IF NOT EXISTS "note_revisions" (`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);
+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`);
+CREATE INDEX IDX_source_ids_utcDateCreated
+    on source_ids (utcDateCreated);
 CREATE TABLE IF NOT EXISTS "notes" (
-  `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`)
-);
-CREATE TABLE IF NOT EXISTS "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`)
-);
-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);
+                                           `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`));
+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" (
+                                          `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`));
+CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
+CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
+CREATE TABLE IF NOT EXISTS "attributes"
+(
+    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);
+CREATE INDEX IDX_attributes_name_value
+    on attributes (name, value);
 CREATE INDEX IDX_attributes_noteId_index
-  on attributes (noteId);
+    on attributes (noteId);
 CREATE INDEX IDX_attributes_value_index
-  on attributes (value);
+    on attributes (value);
+CREATE TABLE IF NOT EXISTS "sync" (
+    `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);
+CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` (
+                                                              `entityName`,
+                                                              `entityId`
+    );
+CREATE INDEX `IDX_sync_utcSyncDate` ON `sync` (
+                                               `utcSyncDate`
+    );
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -0,0 +1,17 @@
+version: '2.1'
+services:
+  trilium:
+    build:
+      context: .
+    image: zadam/trilium
+    restart: always
+    environment:
+      - TRILIUM_DATA_DIR=/data
+    ports:
+      - "8080:8080"
+    volumes:
+      - trilium:/data
+
+volumes:
+  trilium:
+
--- a/docs/backend_api/ApiToken.html
+++ b/docs/backend_api/ApiToken.html
@@ -28,7 +28,7 @@

 <header>
    
-        <h2><span class="attribs"><span class="type-signature"></span></span>ApiToken<span class="signature">(apiTokenId, token, isDeleted, dateCreated)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>ApiToken<span class="signature">()</span><span class="type-signature"></span></h2>
        
            <div class="class-description">ApiToken is an entity representing token used to authenticate against Trilium API from client applications. Currently used only by Trilium Sender.</div>
        
@@ -45,7 +45,7 @@
    

    
-    <h4 class="name" id="ApiToken"><span class="type-signature"></span>new ApiToken<span class="signature">(apiTokenId, token, isDeleted, dateCreated)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="ApiToken"><span class="type-signature"></span>new ApiToken<span class="signature">()</span><span class="type-signature"></span></h4>
    

    
@@ -60,10 +60,15 @@



-    <h5>Parameters:</h5>
+
+
+
+
+    <h5 class="subsection-title">Properties:</h5>
+
    

-<table class="params">
+<table class="props">
    <thead>
    <tr>
        
@@ -154,7 +159,7 @@

        <tr>
            
-                <td class="name"><code>dateCreated</code></td>
+                <td class="name"><code>utcDateCreated</code></td>
            

            <td class="type">
@@ -180,8 +185,6 @@



-
-
 <dl class="details">

    
@@ -239,6 +242,8 @@



+
+
    
    </div>

@@ -282,13 +287,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/Attribute.html
+++ b/docs/backend_api/Attribute.html
@@ -28,7 +28,7 @@

 <header>
    
-        <h2><span class="attribs"><span class="type-signature"></span></span>Attribute<span class="signature">(attributeId, noteId, type, name, value, position, isInheritable, isDeleted, dateCreated, dateModified)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>Attribute<span class="signature">()</span><span class="type-signature"></span></h2>
        
            <div class="class-description">Attribute is key value pair owned by a note.</div>
        
@@ -45,7 +45,7 @@
    

    
-    <h4 class="name" id="Attribute"><span class="type-signature"></span>new Attribute<span class="signature">(attributeId, noteId, type, name, value, position, isInheritable, isDeleted, dateCreated, dateModified)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="Attribute"><span class="type-signature"></span>new Attribute<span class="signature">()</span><span class="type-signature"></span></h4>
    

    
@@ -60,10 +60,15 @@



-    <h5>Parameters:</h5>
+
+
+
+
+    <h5 class="subsection-title">Properties:</h5>
+
    

-<table class="params">
+<table class="props">
    <thead>
    <tr>
        
@@ -269,7 +274,33 @@

        <tr>
            
-                <td class="name"><code>dateCreated</code></td>
+                <td class="name"><code>deleteId</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+|
+
+<span class="param-type">null</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">ID identifying delete transaction</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>utcDateCreated</code></td>
            

            <td class="type">
@@ -292,7 +323,7 @@

        <tr>
            
-                <td class="name"><code>dateModified</code></td>
+                <td class="name"><code>utcDateModified</code></td>
            

            <td class="type">
@@ -318,8 +349,6 @@



-
-
 <dl class="details">

    
@@ -349,7 +378,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line24">line 24</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line30">line 30</a>
    </li></ul></dd>
    

@@ -377,6 +406,8 @@



+
+
    
    </div>

@@ -462,7 +493,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line46">line 46</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line47">line 47</a>
    </li></ul></dd>
    

@@ -485,6 +516,8 @@



+
+
 <h5>Returns:</h5>

        
@@ -562,7 +595,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line57">line 57</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line54">line 54</a>
    </li></ul></dd>
    

@@ -585,6 +618,8 @@



+
+
 <h5>Returns:</h5>

        
@@ -662,7 +697,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line76">line 76</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line69">line 69</a>
    </li></ul></dd>
    

@@ -685,6 +720,8 @@



+
+
 <h5>Returns:</h5>

        
@@ -724,13 +761,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/BackendScriptApi.html
+++ b/docs/backend_api/BackendScriptApi.html
--- a/docs/backend_api/Branch.html
+++ b/docs/backend_api/Branch.html
@@ -28,7 +28,7 @@

 <header>
    
-        <h2><span class="attribs"><span class="type-signature"></span></span>Branch<span class="signature">(branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified, dateCreated)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>Branch<span class="signature">()</span><span class="type-signature"></span></h2>
        
            <div class="class-description">Branch represents note's placement in the tree - it's essentially pair of noteId and parentNoteId.
 Each note can have multiple (at least one) branches, meaning it can be placed into multiple places in the tree.</div>
@@ -46,7 +46,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
    

    
-    <h4 class="name" id="Branch"><span class="type-signature"></span>new Branch<span class="signature">(branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, dateModified, dateCreated)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="Branch"><span class="type-signature"></span>new Branch<span class="signature">()</span><span class="type-signature"></span></h4>
    

    
@@ -61,10 +61,15 @@ Each note can have multiple (at least one) branches, meaning it can be placed in



-    <h5>Parameters:</h5>
+
+
+
+
+    <h5 class="subsection-title">Properties:</h5>
+
    

-<table class="params">
+<table class="props">
    <thead>
    <tr>
        
@@ -247,7 +252,33 @@ Each note can have multiple (at least one) branches, meaning it can be placed in

        <tr>
            
-                <td class="name"><code>dateModified</code></td>
+                <td class="name"><code>deleteId</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+|
+
+<span class="param-type">null</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">ID identifying delete transaction</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>utcDateModified</code></td>
            

            <td class="type">
@@ -270,7 +301,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in

        <tr>
            
-                <td class="name"><code>dateCreated</code></td>
+                <td class="name"><code>utcDateCreated</code></td>
            

            <td class="type">
@@ -296,8 +327,6 @@ Each note can have multiple (at least one) branches, meaning it can be placed in



-
-
 <dl class="details">

    
@@ -327,7 +356,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line24">line 24</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line25">line 25</a>
    </li></ul></dd>
    

@@ -355,6 +384,8 @@ Each note can have multiple (at least one) branches, meaning it can be placed in



+
+
    
    </div>

@@ -392,7 +423,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
    

    
-    <h4 class="name" id="getNote"><span class="type-signature">(async) </span>getNote<span class="signature">()</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
+    <h4 class="name" id="getNote"><span class="type-signature">(async) </span>getNote<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
    

    
@@ -440,7 +471,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line38">line 38</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line32">line 32</a>
    </li></ul></dd>
    

@@ -463,6 +494,8 @@ Each note can have multiple (at least one) branches, meaning it can be placed in



+
+
 <h5>Returns:</h5>

        
@@ -474,10 +507,109 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
    </dt>
    <dd>
        
-<span class="param-type"><a href="Note.html">Note</a></span>
-|
+<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>

-<span class="param-type">null</span>
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="getParentNote"><span class="type-signature">(async) </span>getParentNote<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line37">line 37</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+        
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>


    </dd>
@@ -505,13 +637,13 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/Entity.html
+++ b/docs/backend_api/Entity.html
@@ -178,6 +178,8 @@



+
+
    
    </div>

@@ -210,13 +212,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/Link.html
+++ b/docs/backend_api/Link.html
@@ -28,7 +28,7 @@

 <header>
    
-        <h2><span class="attribs"><span class="type-signature"></span></span>Link<span class="signature">(linkId, noteId, targetNoteId, type, isDeleted, dateModified, dateCreated)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>Link<span class="signature">(linkId, noteId, targetNoteId, type, isDeleted, utcDateModified, utcDateCreated)</span><span class="type-signature"></span></h2>
        
            <div class="class-description">This class represents link from one note to another in the form of hyperlink or image reference. Note that
 this is different concept than attribute/relation.</div>
@@ -46,7 +46,7 @@ this is different concept than attribute/relation.</div>
    

    
-    <h4 class="name" id="Link"><span class="type-signature"></span>new Link<span class="signature">(linkId, noteId, targetNoteId, type, isDeleted, dateModified, dateCreated)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="Link"><span class="type-signature"></span>new Link<span class="signature">(linkId, noteId, targetNoteId, type, isDeleted, utcDateModified, utcDateCreated)</span><span class="type-signature"></span></h4>
    

    
@@ -201,7 +201,7 @@ this is different concept than attribute/relation.</div>

        <tr>
            
-                <td class="name"><code>dateModified</code></td>
+                <td class="name"><code>utcDateModified</code></td>
            

            <td class="type">
@@ -224,7 +224,7 @@ this is different concept than attribute/relation.</div>

        <tr>
            
-                <td class="name"><code>dateCreated</code></td>
+                <td class="name"><code>utcDateCreated</code></td>
            

            <td class="type">
--- a/docs/backend_api/Note.html
+++ b/docs/backend_api/Note.html
--- a/docs/backend_api/NoteRevision.html
+++ b/docs/backend_api/NoteRevision.html
@@ -28,7 +28,7 @@

 <header>
    
-        <h2><span class="attribs"><span class="type-signature"></span></span>NoteRevision<span class="signature">(noteRevisionId, noteId, type, mime, title, content, isProtected, dateModifiedFrom, dateModifiedTo)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>NoteRevision<span class="signature">()</span><span class="type-signature"></span></h2>
        
            <div class="class-description">NoteRevision represents snapshot of note's title and content at some point in the past. It's used for seamless note versioning.</div>
        
@@ -45,7 +45,7 @@
    

    
-    <h4 class="name" id="NoteRevision"><span class="type-signature"></span>new NoteRevision<span class="signature">(noteRevisionId, noteId, type, mime, title, content, isProtected, dateModifiedFrom, dateModifiedTo)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="NoteRevision"><span class="type-signature"></span>new NoteRevision<span class="signature">()</span><span class="type-signature"></span></h4>
    

    
@@ -60,10 +60,15 @@



-    <h5>Parameters:</h5>
+
+
+
+
+    <h5 class="subsection-title">Properties:</h5>
+
    

-<table class="params">
+<table class="props">
    <thead>
    <tr>
        
@@ -200,13 +205,36 @@

        <tr>
            
-                <td class="name"><code>content</code></td>
+                <td class="name"><code>contentLength</code></td>
            

            <td class="type">
            
                
-<span class="param-type">string</span>
+<span class="param-type">int</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last"></td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>isErased</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">boolean</span>


            
@@ -229,7 +257,7 @@
            <td class="type">
            
                
-<span class="param-type">string</span>
+<span class="param-type">boolean</span>


            
@@ -246,7 +274,7 @@

        <tr>
            
-                <td class="name"><code>dateModifiedFrom</code></td>
+                <td class="name"><code>dateLastEdited</code></td>
            

            <td class="type">
@@ -269,7 +297,76 @@

        <tr>
            
-                <td class="name"><code>dateModifiedTo</code></td>
+                <td class="name"><code>dateCreated</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last"></td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>utcDateLastEdited</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last"></td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>utcDateCreated</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last"></td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>utcDateModified</code></td>
            

            <td class="type">
@@ -295,8 +392,6 @@



-
-
 <dl class="details">

    
@@ -326,7 +421,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line22">line 22</a>
+        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line35">line 35</a>
    </li></ul></dd>
    

@@ -354,6 +449,8 @@



+
+
    
    </div>

@@ -383,6 +480,320 @@
    

    
+        <h3 class="subsection-title">Methods</h3>
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="getContent"><span class="type-signature">(async) </span>getContent<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;*>}</span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line69">line 69</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+        
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type">Promise.&lt;*></span>
+
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="isStringNote"><span class="type-signature"></span>isStringNote<span class="signature">()</span><span class="type-signature"> &rarr; {boolean}</span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line55">line 55</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+        
+<div class="param-desc">
+    true if the note has string content (not binary)
+</div>
+
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type">boolean</span>
+
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="setContent"><span class="type-signature">(async) </span>setContent<span class="signature">()</span><span class="type-signature"> &rarr; {Promise}</span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line105">line 105</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+        
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type">Promise</span>
+
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+
+        
+    

    

@@ -397,13 +808,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/Option.html
+++ b/docs/backend_api/Option.html
@@ -28,7 +28,7 @@

 <header>
    
-        <h2><span class="attribs"><span class="type-signature"></span></span>Option<span class="signature">(name, value, isSynced, dateModified, dateCreated)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>Option<span class="signature">()</span><span class="type-signature"></span></h2>
        
            <div class="class-description">Option represents name-value pair, either directly configurable by the user or some system property.</div>
        
@@ -45,7 +45,7 @@
    

    
-    <h4 class="name" id="Option"><span class="type-signature"></span>new Option<span class="signature">(name, value, isSynced, dateModified, dateCreated)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="Option"><span class="type-signature"></span>new Option<span class="signature">()</span><span class="type-signature"></span></h4>
    

    
@@ -60,10 +60,15 @@



-    <h5>Parameters:</h5>
+
+
+
+
+    <h5 class="subsection-title">Properties:</h5>
+
    

-<table class="params">
+<table class="props">
    <thead>
    <tr>
        
@@ -154,7 +159,7 @@

        <tr>
            
-                <td class="name"><code>dateModified</code></td>
+                <td class="name"><code>utcDateModified</code></td>
            

            <td class="type">
@@ -177,7 +182,7 @@

        <tr>
            
-                <td class="name"><code>dateCreated</code></td>
+                <td class="name"><code>utcDateCreated</code></td>
            

            <td class="type">
@@ -203,8 +208,6 @@



-
-
 <dl class="details">

    
@@ -234,7 +237,7 @@
    
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_option.js.html">entities/option.js</a>, <a href="entities_option.js.html#line17">line 17</a>
+        <a href="entities_option.js.html">entities/option.js</a>, <a href="entities_option.js.html#line22">line 22</a>
    </li></ul></dd>
    

@@ -262,6 +265,8 @@



+
+
    
    </div>

@@ -305,13 +310,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/RecentNote.html
+++ b/docs/backend_api/RecentNote.html
@@ -28,7 +28,7 @@

 <header>
    
-        <h2><span class="attribs"><span class="type-signature"></span></span>RecentNote<span class="signature">(branchId, notePath, isDeleted, dateModified)</span><span class="type-signature"></span></h2>
+        <h2><span class="attribs"><span class="type-signature"></span></span>RecentNote<span class="signature">()</span><span class="type-signature"></span></h2>
        
            <div class="class-description">RecentNote represents recently visited note.</div>
        
@@ -45,7 +45,7 @@
    

    
-    <h4 class="name" id="RecentNote"><span class="type-signature"></span>new RecentNote<span class="signature">(branchId, notePath, isDeleted, dateModified)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="RecentNote"><span class="type-signature"></span>new RecentNote<span class="signature">()</span><span class="type-signature"></span></h4>
    

    
@@ -60,10 +60,15 @@



-    <h5>Parameters:</h5>
+
+
+
+
+    <h5 class="subsection-title">Properties:</h5>
+
    

-<table class="params">
+<table class="props">
    <thead>
    <tr>
        
@@ -85,7 +90,7 @@

        <tr>
            
-                <td class="name"><code>branchId</code></td>
+                <td class="name"><code>noteId</code></td>
            

            <td class="type">
@@ -154,7 +159,7 @@

        <tr>
            
-                <td class="name"><code>dateModified</code></td>
+                <td class="name"><code>utcDateModified</code></td>
            

            <td class="type">
@@ -180,8 +185,6 @@



-
-
 <dl class="details">

    
@@ -239,6 +242,8 @@



+
+
    
    </div>

@@ -282,13 +287,13 @@
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_api_token.js.html
+++ b/docs/backend_api/entities_api_token.js.html
@@ -34,25 +34,25 @@ const dateUtils = require('../services/date_utils');
 /**
 * ApiToken is an entity representing token used to authenticate against Trilium API from client applications. Currently used only by Trilium Sender.
 *
- * @param {string} apiTokenId - primary key
- * @param {string} token
- * @param {boolean} isDeleted - true if API token is deleted
- * @param {string} dateCreated
+ * @property {string} apiTokenId - primary key
+ * @property {string} token
+ * @property {boolean} isDeleted - true if API token is deleted
+ * @property {string} utcDateCreated
 *
 * @extends Entity
 */
 class ApiToken extends Entity {
    static get entityName() { return "api_tokens"; }
    static get primaryKeyName() { return "apiTokenId"; }
-    static get hashedProperties() { return ["apiTokenId", "token", "dateCreated", "isDeleted"]; }
+    static get hashedProperties() { return ["apiTokenId", "token", "utcDateCreated", "isDeleted"]; }

    beforeSaving() {
        if (!this.isDeleted) {
            this.isDeleted = false;
        }

-        if (!this.dateCreated) {
-            this.dateCreated = dateUtils.nowDate();
+        if (!this.utcDateCreated) {
+            this.utcDateCreated = dateUtils.utcNowDateTime();
        }

        super.beforeSaving();
@@ -69,13 +69,13 @@ module.exports = ApiToken;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_attribute.js.html
+++ b/docs/backend_api/entities_attribute.js.html
@@ -36,23 +36,24 @@ const sql = require('../services/sql');
 /**
 * Attribute is key value pair owned by a note.
 *
- * @param {string} attributeId
- * @param {string} noteId
- * @param {string} type
- * @param {string} name
- * @param {string} value
- * @param {int} position
- * @param {boolean} isInheritable
- * @param {boolean} isDeleted
- * @param {string} dateCreated
- * @param {string} dateModified
+ * @property {string} attributeId
+ * @property {string} noteId
+ * @property {string} type
+ * @property {string} name
+ * @property {string} value
+ * @property {int} position
+ * @property {boolean} isInheritable
+ * @property {boolean} isDeleted
+ * @property {string|null} deleteId - ID identifying delete transaction
+ * @property {string} utcDateCreated
+ * @property {string} utcDateModified
 *
 * @extends Entity
 */
 class Attribute extends Entity {
    static get entityName() { return "attributes"; }
    static get primaryKeyName() { return "attributeId"; }
-    static get hashedProperties() { return ["attributeId", "noteId", "type", "name", "value", "isInheritable", "isDeleted", "dateCreated"]; }
+    static get hashedProperties() { return ["attributeId", "noteId", "type", "name", "value", "isInheritable", "isDeleted", "utcDateCreated"]; }

    constructor(row) {
        super(row);
@@ -72,11 +73,7 @@ class Attribute extends Entity {
     * @returns {Promise&lt;Note|null>}
     */
    async getNote() {
-        if (!this.__note) {
-            this.__note = await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
-        }
-
-        return this.__note;
+        return await repository.getNote(this.noteId);
    }

    /**
@@ -91,11 +88,7 @@ class Attribute extends Entity {
            return null;
        }

-        if (!this.__targetNote) {
-            this.__targetNote = await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.value]);
-        }
-
-        return this.__targetNote;
+        return await repository.getNote(this.value);
    }

    /**
@@ -107,6 +100,10 @@ class Attribute extends Entity {

    async beforeSaving() {
        if (!this.value) {
+            if (this.type === 'relation') {
+                throw new Error(`Cannot save relation ${this.name} since it does not target any note.`);
+            }
+
            // null value isn't allowed
            this.value = "";
        }
@@ -123,20 +120,35 @@ class Attribute extends Entity {
            this.isDeleted = false;
        }

-        if (!this.dateCreated) {
-            this.dateCreated = dateUtils.nowDate();
+        if (!this.utcDateCreated) {
+            this.utcDateCreated = dateUtils.utcNowDateTime();
        }

        super.beforeSaving();

        if (this.isChanged) {
-            this.dateModified = dateUtils.nowDate();
+            this.utcDateModified = dateUtils.utcNowDateTime();
        }
    }

    // cannot be static!
    updatePojo(pojo) {
        delete pojo.isOwned;
+        delete pojo.__note;
+    }
+
+    createClone(type, name, value) {
+        return new Attribute({
+            noteId: this.noteId,
+            type: type,
+            name: name,
+            value: value,
+            position: this.position,
+            isInheritable: this.isInheritable,
+            isDeleted: false,
+            utcDateCreated: this.utcDateCreated,
+            utcDateModified: this.utcDateModified
+        });
    }
 }

@@ -150,13 +162,13 @@ module.exports = Attribute;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_branch.js.html
+++ b/docs/backend_api/entities_branch.js.html
@@ -37,15 +37,16 @@ const sql = require('../services/sql');
 * Branch represents note's placement in the tree - it's essentially pair of noteId and parentNoteId.
 * Each note can have multiple (at least one) branches, meaning it can be placed into multiple places in the tree.
 *
- * @param {string} branchId - primary key
- * @param {string} noteId
- * @param {string} parentNoteId
- * @param {int} notePosition
- * @param {string} prefix
- * @param {boolean} isExpanded
- * @param {boolean} isDeleted
- * @param {string} dateModified
- * @param {string} dateCreated
+ * @property {string} branchId - primary key
+ * @property {string} noteId
+ * @property {string} parentNoteId
+ * @property {int} notePosition
+ * @property {string} prefix
+ * @property {boolean} isExpanded
+ * @property {boolean} isDeleted
+ * @property {string|null} deleteId - ID identifying delete transaction
+ * @property {string} utcDateModified
+ * @property {string} utcDateCreated
 *
 * @extends Entity
 */
@@ -53,44 +54,54 @@ class Branch extends Entity {
    static get entityName() { return "branches"; }
    static get primaryKeyName() { return "branchId"; }
    // notePosition is not part of hash because it would produce a lot of updates in case of reordering
-    static get hashedProperties() { return ["branchId", "noteId", "parentNoteId", "isDeleted", "prefix"]; }
+    static get hashedProperties() { return ["branchId", "noteId", "parentNoteId", "isDeleted", "deleteId", "prefix"]; }

-    constructor(row = {}) {
-        super(row);
-
-        // used to detect move in note tree
-        this.origParentNoteId = this.parentNoteId;
+    /** @returns {Promise&lt;Note|null>} */
+    async getNote() {
+        return await repository.getNote(this.noteId);
    }

-    /** @returns {Note|null} */
-    async getNote() {
-        return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
+    /** @returns {Promise&lt;Note|null>} */
+    async getParentNote() {
+        return await repository.getNote(this.parentNoteId);
    }

    async beforeSaving() {
        if (this.notePosition === undefined) {
            const maxNotePos = await sql.getValue('SELECT MAX(notePosition) FROM branches WHERE parentNoteId = ? AND isDeleted = 0', [this.parentNoteId]);
-            this.notePosition = maxNotePos === null ? 0 : maxNotePos + 1;
+            this.notePosition = maxNotePos === null ? 0 : maxNotePos + 10;
+        }
+
+        if (!this.isExpanded) {
+            this.isExpanded = false;
        }

        if (!this.isDeleted) {
            this.isDeleted = false;
        }

-        if (!this.dateCreated) {
-            this.dateCreated = dateUtils.nowDate();
+        if (!this.utcDateCreated) {
+            this.utcDateCreated = dateUtils.utcNowDateTime();
        }

        super.beforeSaving();

        if (this.isChanged) {
-            this.dateModified = dateUtils.nowDate();
+            this.utcDateModified = dateUtils.utcNowDateTime();
        }
    }

-    // cannot be static!
-    updatePojo(pojo) {
-        delete pojo.origParentNoteId;
+    createClone(parentNoteId, notePosition) {
+        return new Branch({
+            noteId: this.noteId,
+            parentNoteId: parentNoteId,
+            notePosition: notePosition,
+            prefix: this.prefix,
+            isExpanded: this.isExpanded,
+            isDeleted: false,
+            utcDateCreated: this.utcDateCreated,
+            utcDateModified: this.utcDateModified
+        });
    }
 }

@@ -104,13 +115,13 @@ module.exports = Branch;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_entity.js.html
+++ b/docs/backend_api/entities_entity.js.html
@@ -36,7 +36,10 @@ class Entity {
     */
    constructor(row = {}) {
        for (const key in row) {
-            this[key] = row[key];
+            // ! is used when joint-fetching notes and note_contents objects for performance
+            if (!key.startsWith('!')) {
+                this[key] = row[key];
+            }
        }

        if ('isDeleted' in this) {
@@ -51,7 +54,13 @@ class Entity {

        this.hash = this.generateHash();

-        this.isChanged = origHash !== this.hash;
+        if (this.forcedChange) {
+            this.isChanged = true;
+            delete this.forcedChange;
+        }
+        else {
+            this.isChanged = origHash !== this.hash;
+        }
    }

    generateIdIfNecessary() {
@@ -87,13 +96,13 @@ module.exports = Entity;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_link.js.html
+++ b/docs/backend_api/entities_link.js.html
@@ -41,15 +41,15 @@ const dateUtils = require('../services/date_utils');
 * @param {string} targetNoteId
 * @param {string} type
 * @param {boolean} isDeleted
- * @param {string} dateModified
- * @param {string} dateCreated
+ * @param {string} utcDateModified
+ * @param {string} utcDateCreated
 *
 * @extends Entity
 */
 class Link extends Entity {
    static get entityName() { return "links"; }
    static get primaryKeyName() { return "linkId"; }
-    static get hashedProperties() { return ["linkId", "noteId", "targetNoteId", "type", "isDeleted", "dateCreated", "dateModified"]; }
+    static get hashedProperties() { return ["linkId", "noteId", "targetNoteId", "type", "isDeleted", "utcDateCreated", "utcDateModified"]; }

    async getNote() {
        return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
@@ -64,14 +64,14 @@ class Link extends Entity {
            this.isDeleted = false;
        }

-        if (!this.dateCreated) {
-            this.dateCreated = dateUtils.nowDate();
+        if (!this.utcDateCreated) {
+            this.utcDateCreated = dateUtils.utcNowDateTime();
        }

        super.beforeSaving();

        if (this.isChanged) {
-            this.dateModified = dateUtils.nowDate();
+            this.utcDateModified = dateUtils.utcNowDateTime();
        }
    }
 }
--- a/docs/backend_api/entities_note.js.html
+++ b/docs/backend_api/entities_note.js.html
@@ -33,7 +33,9 @@ const Attribute = require('./attribute');
 const protectedSessionService = require('../services/protected_session');
 const repository = require('../services/repository');
 const sql = require('../services/sql');
+const utils = require('../services/utils');
 const dateUtils = require('../services/date_utils');
+const syncTableService = require('../services/sync_table');

 const LABEL = 'label';
 const LABEL_DEFINITION = 'label-definition';
@@ -47,18 +49,22 @@ const RELATION_DEFINITION = 'relation-definition';
 * @property {string} type - one of "text", "code", "file" or "render"
 * @property {string} mime - MIME type, e.g. "text/html"
 * @property {string} title - note title
- * @property {string} content - note content - e.g. HTML text for text notes, file payload for files
+ * @property {int} contentLength - length of content
 * @property {boolean} isProtected - true if note is protected
 * @property {boolean} isDeleted - true if note is deleted
- * @property {string} dateCreated
- * @property {string} dateModified
+ * @property {string|null} deleteId - ID identifying delete transaction
+ * @property {boolean} isErased - true if note's content is erased after it has been deleted
+ * @property {string} dateCreated - local date time (with offset)
+ * @property {string} dateModified - local date time (with offset)
+ * @property {string} utcDateCreated
+ * @property {string} utcDateModified
 *
 * @extends Entity
 */
 class Note extends Entity {
    static get entityName() { return "notes"; }
    static get primaryKeyName() { return "noteId"; }
-    static get hashedProperties() { return ["noteId", "title", "content", "type", "isProtected", "isDeleted"]; }
+    static get hashedProperties() { return ["noteId", "title", "type", "mime", "isProtected", "isDeleted", "deleteId"]; }

    /**
     * @param row - object containing database row from "notes" table
@@ -67,7 +73,7 @@ class Note extends Entity {
        super(row);

        this.isProtected = !!this.isProtected;
-        /* true if content (meaning any kind of potentially encrypted content) is either not encrypted
+        /* true if content is either not encrypted
         * or encrypted, but with available protected session (so effectively decrypted) */
        this.isContentAvailable = true;

@@ -75,19 +81,110 @@ class Note extends Entity {
        if (this.isProtected &amp;&amp; this.noteId) {
            this.isContentAvailable = protectedSessionService.isProtectedSessionAvailable();

-            protectedSessionService.decryptNote(this);
+            if (this.isContentAvailable) {
+                this.title = protectedSessionService.decryptString(this.title);
+            }
+            else {
+                this.title = "[protected]";
+            }
        }
-
-        this.setContent(this.content);
    }

-    setContent(content) {
+    /*
+     * Note content has quite special handling - it's not a separate entity, but a lazily loaded
+     * part of Note entity with it's own sync. Reasons behind this hybrid design has been:
+     *
+     * - content can be quite large and it's not necessary to load it / fill memory for any note access even if we don't need a content, especially for bulk operations like search
+     * - changes in the note metadata or title should not trigger note content sync (so we keep separate utcDateModified and sync rows)
+     * - but to the user note content and title changes are one and the same - single dateModified (so all changes must go through Note and content is not a separate entity)
+     */
+
+    /** @returns {Promise&lt;*>} */
+    async getContent(silentNotFoundError = false) {
+        if (this.content === undefined) {
+            const res = await sql.getRow(`SELECT content, hash FROM note_contents WHERE noteId = ?`, [this.noteId]);
+
+            if (!res) {
+                if (silentNotFoundError) {
+                    return undefined;
+                }
+                else {
+                    throw new Error("Cannot find note content for noteId=" + this.noteId);
+                }
+            }
+
+            this.content = res.content;
+
+            if (this.isProtected) {
+                if (this.isContentAvailable) {
+                    this.content = this.content === null ? null : protectedSessionService.decrypt(this.content);
+                }
+                else {
+                    this.content = "";
+                }
+            }
+        }
+
+        if (this.isStringNote()) {
+            return this.content === null
+                ? ""
+                : this.content.toString("UTF-8");
+        }
+        else {
+            return this.content;
+        }
+    }
+
+    /** @returns {Promise&lt;*>} */
+    async getJsonContent() {
+        const content = await this.getContent();
+
+        if (!content || !content.trim()) {
+            return null;
+        }
+
+        return JSON.parse(content);
+    }
+
+    /** @returns {Promise} */
+    async setContent(content) {
+        if (content === null || content === undefined) {
+            throw new Error(`Cannot set null content to note ${this.noteId}`);
+        }
+
+        content = Buffer.isBuffer(content) ? content : Buffer.from(content);
+
+        // force updating note itself so that dateModified is represented correctly even for the content
+        this.forcedChange = true;
+        this.contentLength = content.byteLength;
+        await this.save();
+
        this.content = content;

-        try {
-            this.jsonContent = JSON.parse(this.content);
+        const pojo = {
+            noteId: this.noteId,
+            content: content,
+            utcDateModified: dateUtils.utcNowDateTime(),
+            hash: utils.hash(this.noteId + "|" + content.toString())
+        };
+
+        if (this.isProtected) {
+            if (this.isContentAvailable) {
+                pojo.content = protectedSessionService.encrypt(pojo.content);
+            }
+            else {
+                throw new Error(`Cannot update content of noteId=${this.noteId} since we're out of protected session.`);
+            }
        }
-        catch(e) {}
+
+        await sql.upsert("note_contents", "noteId", pojo);
+
+        await syncTableService.addNoteContentSync(this.noteId);
+    }
+
+    /** @returns {Promise} */
+    async setJsonContent(content) {
+        await this.setContent(JSON.stringify(content, null, '\t'));
    }

    /** @returns {boolean} true if this note is the root of the note tree. Root note has "root" noteId */
@@ -113,6 +210,11 @@ class Note extends Entity {
        return (this.type === "code" || this.type === "file" || this.type === "render") &amp;&amp; this.mime === "text/html";
    }

+    /** @returns {boolean} true if the note has string content (not binary) */
+    isStringNote() {
+        return utils.isStringNote(this.type, this.mime);
+    }
+
    /** @returns {string} JS script environment - either "frontend" or "backend" */
    getScriptEnv() {
        if (this.isHtml() || (this.isJavaScript() &amp;&amp; this.mime.endsWith('env=frontend'))) {
@@ -130,11 +232,47 @@ class Note extends Entity {
        return null;
    }

+    async loadOwnedAttributesToCache() {
+        this.__ownedAttributeCache = await repository.getEntities(`SELECT * FROM attributes WHERE isDeleted = 0 AND noteId = ?`, [this.noteId]);
+        return this.__ownedAttributeCache;
+    }
+
    /**
-     * @returns {Promise&lt;Attribute[]>} attributes belonging to this specific note (excludes inherited attributes)
+     * This method is a faster variant of getAttributes() which looks for only owned attributes.
+     * Use when inheritance is not needed and/or in batch/performance sensitive operations.
+     *
+     * @param {string} [type] - (optional) attribute type to filter
+     * @param {string} [name] - (optional) attribute name to filter
+     * @returns {Promise&lt;Attribute[]>} note's "owned" attributes - excluding inherited ones
     */
-    async getOwnedAttributes() {
-        return await repository.getEntities(`SELECT * FROM attributes WHERE isDeleted = 0 AND noteId = ?`, [this.noteId]);
+    async getOwnedAttributes(type, name) {
+        if (!this.__ownedAttributeCache) {
+            await this.loadOwnedAttributesToCache();
+        }
+
+        if (type &amp;&amp; name) {
+            return this.__ownedAttributeCache.filter(attr => attr.type === type &amp;&amp; attr.name === name);
+        }
+        else if (type) {
+            return this.__ownedAttributeCache.filter(attr => attr.type === type);
+        }
+        else if (name) {
+            return this.__ownedAttributeCache.filter(attr => attr.name === name);
+        }
+        else {
+            return this.__ownedAttributeCache.slice();
+        }
+    }
+
+    /**
+     * @returns {Promise&lt;Attribute>} attribute belonging to this specific note (excludes inherited attributes)
+     *
+     * This method can be significantly faster than the getAttribute()
+     */
+    async getOwnedAttribute(type, name) {
+        const attrs = await this.getOwnedAttributes(type, name);
+
+        return attrs.length > 0 ? attrs[0] : null;
    }

    /**
@@ -145,19 +283,26 @@ class Note extends Entity {
    }

    /**
-     * @param {string} [name] - attribute name to filter
+     * @param {string} [type] - (optional) attribute type to filter
+     * @param {string} [name] - (optional) attribute name to filter
     * @returns {Promise&lt;Attribute[]>} all note's attributes, including inherited ones
     */
-    async getAttributes(name) {
+    async getAttributes(type, name) {
        if (!this.__attributeCache) {
            await this.loadAttributesToCache();
        }

-        if (name) {
+        if (type &amp;&amp; name) {
+            return this.__attributeCache.filter(attr => attr.type === type &amp;&amp; attr.name === name);
+        }
+        else if (type) {
+            return this.__attributeCache.filter(attr => attr.type === type);
+        }
+        else if (name) {
            return this.__attributeCache.filter(attr => attr.name === name);
        }
        else {
-            return this.__attributeCache;
+            return this.__attributeCache.slice();
        }
    }

@@ -166,7 +311,15 @@ class Note extends Entity {
     * @returns {Promise&lt;Attribute[]>} all note's labels (attributes with type label), including inherited ones
     */
    async getLabels(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === LABEL);
+        return await this.getAttributes(LABEL, name);
+    }
+
+    /**
+     * @param {string} [name] - label name to filter
+     * @returns {Promise&lt;Attribute[]>} all note's labels (attributes with type label), excluding inherited ones
+     */
+    async getOwnedLabels(name) {
+        return await this.getOwnedAttributes(LABEL, name);
    }

    /**
@@ -174,7 +327,7 @@ class Note extends Entity {
     * @returns {Promise&lt;Attribute[]>} all note's label definitions, including inherited ones
     */
    async getLabelDefinitions(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === LABEL_DEFINITION);
+        return await this.getAttributes(LABEL_DEFINITION, name);
    }

    /**
@@ -182,7 +335,30 @@ class Note extends Entity {
     * @returns {Promise&lt;Attribute[]>} all note's relations (attributes with type relation), including inherited ones
     */
    async getRelations(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === RELATION);
+        return await this.getAttributes(RELATION, name);
+    }
+
+    /**
+     * @param {string} [name] - relation name to filter
+     * @returns {Promise&lt;Attribute[]>} all note's relations (attributes with type relation), excluding inherited ones
+     */
+    async getOwnedRelations(name) {
+        return await this.getOwnedAttributes(RELATION, name);
+    }
+
+    /**
+     * @param {string} [name] - relation name to filter
+     * @returns {Promise&lt;Note[]>}
+     */
+    async getRelationTargets(name) {
+        const relations = await this.getRelations(name);
+        const targets = [];
+
+        for (const relation of relations) {
+            targets.push(await relation.getTargetNote());
+        }
+
+        return targets;
    }

    /**
@@ -190,7 +366,7 @@ class Note extends Entity {
     * @returns {Promise&lt;Attribute[]>} all note's relation definitions including inherited ones
     */
    async getRelationDefinitions(name) {
-        return (await this.getAttributes(name)).filter(attr => attr.type === RELATION_DEFINITION);
+        return await this.getAttributes(RELATION_DEFINITION, name);
    }

    /**
@@ -199,6 +375,7 @@ class Note extends Entity {
     */
    invalidateAttributeCache() {
        this.__attributeCache = null;
+        this.__ownedAttributeCache = null;
    }

    /** @returns {Promise&lt;void>} */
@@ -208,29 +385,33 @@ class Note extends Entity {
            tree(noteId, level) AS (
                SELECT ?, 0
                UNION
-                SELECT branches.parentNoteId, tree.level + 1 FROM branches
+                SELECT branches.parentNoteId, tree.level + 1 
+                    FROM branches
                    JOIN tree ON branches.noteId = tree.noteId
-                    JOIN notes ON notes.noteId = branches.parentNoteId
-                WHERE notes.isDeleted = 0
-                  AND branches.isDeleted = 0
+                WHERE branches.isDeleted = 0
            ),
            treeWithAttrs(noteId, level) AS (
                SELECT * FROM tree
                UNION
-                SELECT attributes.value, treeWithAttrs.level + 1 FROM attributes
+                SELECT attributes.value, treeWithAttrs.level FROM attributes
                     JOIN treeWithAttrs ON treeWithAttrs.noteId = attributes.noteId
                WHERE attributes.isDeleted = 0
                  AND attributes.type = 'relation'
                  AND attributes.name = 'template'
-                  AND (attributes.noteId = ? OR attributes.isInheritable = 1)
+                  AND (treeWithAttrs.level = 0 OR attributes.isInheritable = 1)
                )
            SELECT attributes.* FROM attributes JOIN treeWithAttrs ON attributes.noteId = treeWithAttrs.noteId
-            WHERE attributes.isDeleted = 0 AND (attributes.isInheritable = 1 OR attributes.noteId = ?)
-            ORDER BY level, noteId, position`, [this.noteId, this.noteId, this.noteId]);
+            WHERE attributes.isDeleted = 0 AND (attributes.isInheritable = 1 OR treeWithAttrs.level = 0)
+            ORDER BY level, noteId, position`, [this.noteId]);
        // attributes are ordered so that "closest" attributes are first
        // we order by noteId so that attributes from same note stay together. Actual noteId ordering doesn't matter.

        const filteredAttributes = attributes.filter((attr, index) => {
+            // if this exact attribute already appears then don't include it (can happen via cloning)
+            if (attributes.findIndex(it => it.attributeId === attr.attributeId) !== index) {
+                return false;
+            }
+
            if (attr.isDefinition()) {
                const firstDefinitionIndex = attributes.findIndex(el => el.type === attr.type &amp;&amp; el.name === attr.name);

@@ -274,6 +455,15 @@ class Note extends Entity {
        return !!await this.getAttribute(type, name);
    }

+    /**
+     * @param {string} type - attribute type (label, relation, etc.)
+     * @param {string} name - attribute name
+     * @returns {Promise&lt;boolean>} true if note has an attribute with given type and name (excluding inherited)
+     */
+    async hasOwnedAttribute(type, name) {
+        return !!await this.getOwnedAttribute(type, name);
+    }
+
    /**
     * @param {string} type - attribute type (label, relation, etc.)
     * @param {string} name - attribute name
@@ -288,7 +478,7 @@ class Note extends Entity {
    /**
     * @param {string} type - attribute type (label, relation, etc.)
     * @param {string} name - attribute name
-     * @returns {Promise&lt;string>} attribute value of given type and name or null if no such attribute exists.
+     * @returns {Promise&lt;string|null>} attribute value of given type and name or null if no such attribute exists.
     */
    async getAttributeValue(type, name) {
        const attr = await this.getAttribute(type, name);
@@ -296,6 +486,17 @@ class Note extends Entity {
        return attr ? attr.value : null;
    }

+    /**
+     * @param {string} type - attribute type (label, relation, etc.)
+     * @param {string} name - attribute name
+     * @returns {Promise&lt;string|null>} attribute value of given type and name or null if no such attribute exists.
+     */
+    async getOwnedAttributeValue(type, name) {
+        const attr = await this.getOwnedAttribute(type, name);
+
+        return attr ? attr.value : null;
+    }
+
    /**
     * Based on enabled, attribute is either set or removed.
     *
@@ -315,7 +516,7 @@ class Note extends Entity {
    }

    /**
-     * Creates given attribute name-value pair if it doesn't exist.
+     * Update's given attribute's value or creates it if it doesn't exist
     *
     * @param {string} type - attribute type (label, relation, etc.)
     * @param {string} name - attribute name
@@ -323,10 +524,18 @@ class Note extends Entity {
     * @returns {Promise&lt;void>}
     */
    async setAttribute(type, name, value) {
-        const attributes = await this.getOwnedAttributes();
-        let attr = attributes.find(attr => attr.type === type &amp;&amp; (value === undefined || attr.value === value));
+        const attributes = await this.loadOwnedAttributesToCache();
+        let attr = attributes.find(attr => attr.type === type &amp;&amp; attr.name === name);

-        if (!attr) {
+        if (attr) {
+            if (attr.value !== value) {
+                attr.value = value;
+                await attr.save();
+
+                this.invalidateAttributeCache();
+            }
+        }
+        else {
            attr = new Attribute({
                noteId: this.noteId,
                type: type,
@@ -349,10 +558,10 @@ class Note extends Entity {
     * @returns {Promise&lt;void>}
     */
    async removeAttribute(type, name, value) {
-        const attributes = await this.getOwnedAttributes();
+        const attributes = await this.loadOwnedAttributesToCache();

        for (const attribute of attributes) {
-            if (attribute.type === type &amp;&amp; (value === undefined || value === attribute.value)) {
+            if (attribute.type === type &amp;&amp; attribute.name === name &amp;&amp; (value === undefined || value === attribute.value)) {
                attribute.isDeleted = true;
                await attribute.save();

@@ -361,42 +570,104 @@ class Note extends Entity {
        }
    }

+    /**
+     * @return {Promise&lt;Attribute>}
+     */
+    async addAttribute(type, name, value = "") {
+        const attr = new Attribute({
+            noteId: this.noteId,
+            type: type,
+            name: name,
+            value: value
+        });
+
+        await attr.save();
+
+        this.invalidateAttributeCache();
+
+        return attr;
+    }
+
+    async addLabel(name, value = "") {
+        return await this.addAttribute(LABEL, name, value);
+    }
+
+    async addRelation(name, targetNoteId) {
+        return await this.addAttribute(RELATION, name, targetNoteId);
+    }
+
    /**
     * @param {string} name - label name
     * @returns {Promise&lt;boolean>} true if label exists (including inherited)
     */
    async hasLabel(name) { return await this.hasAttribute(LABEL, name); }

+    /**
+     * @param {string} name - label name
+     * @returns {Promise&lt;boolean>} true if label exists (excluding inherited)
+     */
+    async hasOwnedLabel(name) { return await this.hasOwnedAttribute(LABEL, name); }
+
    /**
     * @param {string} name - relation name
     * @returns {Promise&lt;boolean>} true if relation exists (including inherited)
     */
    async hasRelation(name) { return await this.hasAttribute(RELATION, name); }

+    /**
+     * @param {string} name - relation name
+     * @returns {Promise&lt;boolean>} true if relation exists (excluding inherited)
+     */
+    async hasOwnedRelation(name) { return await this.hasOwnedAttribute(RELATION, name); }
+
    /**
     * @param {string} name - label name
-     * @returns {Promise&lt;Attribute>} label if it exists, null otherwise
+     * @returns {Promise&lt;Attribute|null>} label if it exists, null otherwise
     */
    async getLabel(name) { return await this.getAttribute(LABEL, name); }

+    /**
+     * @param {string} name - label name
+     * @returns {Promise&lt;Attribute|null>} label if it exists, null otherwise
+     */
+    async getOwnedLabel(name) { return await this.getOwnedAttribute(LABEL, name); }
+
    /**
     * @param {string} name - relation name
-     * @returns {Promise&lt;Attribute>} relation if it exists, null otherwise
+     * @returns {Promise&lt;Attribute|null>} relation if it exists, null otherwise
     */
    async getRelation(name) { return await this.getAttribute(RELATION, name); }

+    /**
+     * @param {string} name - relation name
+     * @returns {Promise&lt;Attribute|null>} relation if it exists, null otherwise
+     */
+    async getOwnedRelation(name) { return await this.getOwnedAttribute(RELATION, name); }
+
    /**
     * @param {string} name - label name
-     * @returns {Promise&lt;string>} label value if label exists, null otherwise
+     * @returns {Promise&lt;string|null>} label value if label exists, null otherwise
     */
    async getLabelValue(name) { return await this.getAttributeValue(LABEL, name); }

+    /**
+     * @param {string} name - label name
+     * @returns {Promise&lt;string|null>} label value if label exists, null otherwise
+     */
+    async getOwnedLabelValue(name) { return await this.getOwnedAttributeValue(LABEL, name); }
+
    /**
     * @param {string} name - relation name
-     * @returns {Promise&lt;string>} relation value if relation exists, null otherwise
+     * @returns {Promise&lt;string|null>} relation value if relation exists, null otherwise
     */
    async getRelationValue(name) { return await this.getAttributeValue(RELATION, name); }

+    /**
+     * @param {string} name - relation name
+     * @returns {Promise&lt;string|null>} relation value if relation exists, null otherwise
+     */
+    async getOwnedRelationValue(name) { return await this.getOwnedAttributeValue(RELATION, name); }
+
    /**
     * @param {string} name
     * @returns {Promise&lt;Note>|null} target note of the relation or null (if target is empty or note was not found)
@@ -407,6 +678,16 @@ class Note extends Entity {
        return relation ? await repository.getNote(relation.value) : null;
    }

+    /**
+     * @param {string} name
+     * @returns {Promise&lt;Note>|null} target note of the relation or null (if target is empty or note was not found)
+     */
+    async getOwnedRelationTarget(name) {
+        const relation = await this.getOwnedRelation(name);
+
+        return relation ? await repository.getNote(relation.value) : null;
+    }
+
    /**
     * Based on enabled, label is either set or removed.
     *
@@ -428,7 +709,7 @@ class Note extends Entity {
    async toggleRelation(enabled, name, value) { return await this.toggleAttribute(RELATION, enabled, name, value); }

    /**
-     * Create label name-value pair if it doesn't exist yet.
+     * Update's given label's value or creates it if it doesn't exist
     *
     * @param {string} name - label name
     * @param {string} [value] - label value
@@ -437,7 +718,7 @@ class Note extends Entity {
    async setLabel(name, value) { return await this.setAttribute(LABEL, name, value); }

    /**
-     * Create relation name-value pair if it doesn't exist yet.
+     * Update's given relation's value or creates it if it doesn't exist
     *
     * @param {string} name - relation name
     * @param {string} [value] - relation value (noteId)
@@ -550,28 +831,17 @@ class Note extends Entity {
    /**
     * Get list of links coming out of this note.
     *
-     * @returns {Promise&lt;Link[]>}
+     * @deprecated - not intended for general use
+     * @returns {Promise&lt;Attribute[]>}
     */
    async getLinks() {
-        return await repository.getEntities("SELECT * FROM links WHERE noteId = ? AND isDeleted = 0", [this.noteId]);
-    }
-
-    /**
-     * Get list of links targetting this note.
-     *
-     * @returns {Promise&lt;Link[]>}
-     */
-    async getTargetLinks() {
-        return await repository.getEntities("SELECT * FROM links WHERE targetNoteId = ? AND isDeleted = 0", [this.noteId]);
-    }
-
-    /**
-     * Return all links from this note, including deleted ones.
-     *
-     * @returns {Promise&lt;Link[]>}
-     */
-    async getLinksWithDeleted() {
-        return await repository.getEntities("SELECT * FROM links WHERE noteId = ?", [this.noteId]);
+        return await repository.getEntities(`
+            SELECT * 
+            FROM attributes 
+            WHERE noteId = ? AND 
+                  isDeleted = 0 AND
+                  type = 'relation' AND
+                  name IN ('internalLink', 'imageLink', 'relationMapLink', 'includeNoteLink')`, [this.noteId]);
    }

    /**
@@ -628,38 +898,79 @@ class Note extends Entity {
                AND parent_notes.isDeleted = 0`, [this.noteId]);
    }

-    beforeSaving() {
-        if (this.isJson() &amp;&amp; this.jsonContent) {
-            this.content = JSON.stringify(this.jsonContent, null, '\t');
+    /**
+     * @return {Promise&lt;string[][]>} - array of notePaths (each represented by array of noteIds constituting the particular note path)
+     */
+    async getAllNotePaths() {
+        if (this.noteId === 'root') {
+            return [['root']];
        }

-        // we do this here because encryption needs the note ID for the IV
-        this.generateIdIfNecessary();
+        const notePaths = [];

+        for (const parentNote of await this.getParentNotes()) {
+            for (const parentPath of await parentNote.getAllNotePaths()) {
+                parentPath.push(this.noteId);
+                notePaths.push(parentPath);
+            }
+        }
+
+        return notePaths;
+    }
+
+    /**
+     * @param ancestorNoteId
+     * @return {Promise&lt;boolean>} - true if ancestorNoteId occurs in at least one of the note's paths
+     */
+    async isDescendantOfNote(ancestorNoteId) {
+        const notePaths = await this.getAllNotePaths();
+
+        return notePaths.some(path => path.includes(ancestorNoteId));
+    }
+
+    beforeSaving() {
        if (!this.isDeleted) {
            this.isDeleted = false;
        }

        if (!this.dateCreated) {
-            this.dateCreated = dateUtils.nowDate();
+            this.dateCreated = dateUtils.localNowDateTime();
+        }
+
+        if (!this.utcDateCreated) {
+            this.utcDateCreated = dateUtils.utcNowDateTime();
+        }
+
+        if (this.contentLength === undefined) {
+            this.contentLength = -1;
        }

        super.beforeSaving();

        if (this.isChanged) {
-            this.dateModified = dateUtils.nowDate();
+            this.dateModified = dateUtils.localNowDateTime();
+            this.utcDateModified = dateUtils.utcNowDateTime();
        }
    }

    // cannot be static!
    updatePojo(pojo) {
        if (pojo.isProtected) {
-            protectedSessionService.encryptNote(pojo);
+            if (this.isContentAvailable) {
+                pojo.title = protectedSessionService.encrypt(pojo.title);
+            }
+            else {
+                // updating protected note outside of protected session means we will keep original ciphertexts
+                delete pojo.title;
+            }
        }

-        delete pojo.jsonContent;
        delete pojo.isContentAvailable;
        delete pojo.__attributeCache;
+        delete pojo.__ownedAttributeCache;
+        delete pojo.content;
+        /** zero references to contentHash, probably can be removed */
+        delete pojo.contentHash;
    }
 }

@@ -673,13 +984,13 @@ module.exports = Note;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_note_revision.js.html
+++ b/docs/backend_api/entities_note_revision.js.html
@@ -31,26 +31,34 @@
 const Entity = require('./entity');
 const protectedSessionService = require('../services/protected_session');
 const repository = require('../services/repository');
+const utils = require('../services/utils');
+const sql = require('../services/sql');
+const dateUtils = require('../services/date_utils');
+const syncTableService = require('../services/sync_table');

 /**
 * NoteRevision represents snapshot of note's title and content at some point in the past. It's used for seamless note versioning.
 *
- * @param {string} noteRevisionId
- * @param {string} noteId
- * @param {string} type
- * @param {string} mime
- * @param {string} title
- * @param {string} content
- * @param {string} isProtected
- * @param {string} dateModifiedFrom
- * @param {string} dateModifiedTo
+ * @property {string} noteRevisionId
+ * @property {string} noteId
+ * @property {string} type
+ * @property {string} mime
+ * @property {string} title
+ * @property {int} contentLength
+ * @property {boolean} isErased
+ * @property {boolean} isProtected
+ * @property {string} dateLastEdited
+ * @property {string} dateCreated
+ * @property {string} utcDateLastEdited
+ * @property {string} utcDateCreated
+ * @property {string} utcDateModified
 *
 * @extends Entity
 */
 class NoteRevision extends Entity {
    static get entityName() { return "note_revisions"; }
    static get primaryKeyName() { return "noteRevisionId"; }
-    static get hashedProperties() { return ["noteRevisionId", "noteId", "title", "content", "isProtected", "dateModifiedFrom", "dateModifiedTo"]; }
+    static get hashedProperties() { return ["noteRevisionId", "noteId", "title", "contentLength", "isErased", "isProtected", "dateLastEdited", "dateCreated", "utcDateLastEdited", "utcDateCreated", "utcDateModified"]; }

    constructor(row) {
        super(row);
@@ -58,20 +66,120 @@ class NoteRevision extends Entity {
        this.isProtected = !!this.isProtected;

        if (this.isProtected) {
-            protectedSessionService.decryptNoteRevision(this);
+            if (protectedSessionService.isProtectedSessionAvailable()) {
+                this.title = protectedSessionService.decryptString(this.title);
+            }
+            else {
+                this.title = "[Protected]";
+            }
        }
    }

    async getNote() {
-        return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
+        return await repository.getNote(this.noteId);
+    }
+
+    /** @returns {boolean} true if the note has string content (not binary) */
+    isStringNote() {
+        return utils.isStringNote(this.type, this.mime);
+    }
+
+    /*
+     * Note revision content has quite special handling - it's not a separate entity, but a lazily loaded
+     * part of NoteRevision entity with it's own sync. Reason behind this hybrid design is that
+     * content can be quite large and it's not necessary to load it / fill memory for any note access even
+     * if we don't need a content, especially for bulk operations like search.
+     *
+     * This is the same approach as is used for Note's content.
+     */
+
+    /** @returns {Promise&lt;*>} */
+    async getContent(silentNotFoundError = false) {
+        if (this.content === undefined) {
+            const res = await sql.getRow(`SELECT content, hash FROM note_revision_contents WHERE noteRevisionId = ?`, [this.noteRevisionId]);
+
+            if (!res) {
+                if (silentNotFoundError) {
+                    return undefined;
+                }
+                else {
+                    throw new Error("Cannot find note revision content for noteRevisionId=" + this.noteRevisionId);
+                }
+            }
+
+            this.content = res.content;
+
+            if (this.isProtected) {
+                if (protectedSessionService.isProtectedSessionAvailable()) {
+                    this.content = protectedSessionService.decrypt(this.content);
+                }
+                else {
+                    this.content = "";
+                }
+            }
+        }
+
+        if (this.isStringNote()) {
+            return this.content === null
+                ? ""
+                : this.content.toString("UTF-8");
+        }
+        else {
+            return this.content;
+        }
+    }
+
+    /** @returns {Promise} */
+    async setContent(content) {
+        // force updating note itself so that utcDateModified is represented correctly even for the content
+        this.forcedChange = true;
+        this.contentLength = content === null ? 0 : content.length;
+        await this.save();
+
+        this.content = content;
+
+        const pojo = {
+            noteRevisionId: this.noteRevisionId,
+            content: content,
+            utcDateModified: dateUtils.utcNowDateTime(),
+            hash: utils.hash(this.noteRevisionId + "|" + content)
+        };
+
+        if (this.isProtected) {
+            if (protectedSessionService.isProtectedSessionAvailable()) {
+                pojo.content = protectedSessionService.encrypt(pojo.content);
+            }
+            else {
+                throw new Error(`Cannot update content of noteRevisionId=${this.noteRevisionId} since we're out of protected session.`);
+            }
+        }
+
+        await sql.upsert("note_revision_contents", "noteRevisionId", pojo);
+
+        await syncTableService.addNoteRevisionContentSync(this.noteRevisionId);
    }

    beforeSaving() {
-        if (this.isProtected) {
-            protectedSessionService.encryptNoteRevision(this);
+        super.beforeSaving();
+
+        if (this.isChanged) {
+            this.utcDateModified = dateUtils.utcNowDateTime();
+        }
+    }
+
+    // cannot be static!
+    updatePojo(pojo) {
+        if (pojo.isProtected) {
+            if (protectedSessionService.isProtectedSessionAvailable()) {
+                pojo.title = protectedSessionService.encrypt(pojo.title);
+            }
+            else {
+                // updating protected note outside of protected session means we will keep original ciphertexts
+                delete pojo.title;
+            }
        }

-        super.beforeSaving();
+        delete pojo.content;
    }
 }

@@ -85,13 +193,13 @@ module.exports = NoteRevision;</code></pre>
 </div>

 <nav>
-    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Link.html">Link</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
+    <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="ApiToken.html">ApiToken</a></li><li><a href="Attribute.html">Attribute</a></li><li><a href="BackendScriptApi.html">BackendScriptApi</a></li><li><a href="Branch.html">Branch</a></li><li><a href="Entity.html">Entity</a></li><li><a href="Note.html">Note</a></li><li><a href="NoteRevision.html">NoteRevision</a></li><li><a href="Option.html">Option</a></li><li><a href="RecentNote.html">RecentNote</a></li></ul><h3><a href="global.html">Global</a></h3>
 </nav>

 <br class="clear">

 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
 </footer>

 <script> prettyPrint(); </script>
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`UPDATE notes SET contentLength = COALESCE((SELECT COALESCE(LENGTH(content), 0) FROM note_contents WHERE note_contents.noteId = notes.noteId), -1);`