release 0.44.6

fixed demo document - restored more up to date version + largest notes stats
added base element to handle external links in exports, #1289
2025-10-31 02:16:05 +01:00 · 2020-10-07 00:07:23 +02:00 · 2020-10-06 22:25:28 +02:00 · 2020-10-06 21:30:41 +02:00 · 2020-10-06 20:58:14 +02:00 · 2020-10-05 23:56:59 +02:00
795 changed files with 77158 additions and 79003 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
@@ -1,7 +1,11 @@
 image:
  file: .gitpod.dockerfile
 tasks:
    - before: nvm install 10 && nvm use 10
      init: npm install
-      command: npm run start
+      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="4e69c96a-8a2b-43f5-9b40-d1608f75f7a4">
      <driver-ref>sqlite.xerial</driver-ref>
      <synchronize>true</synchronize>
      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/../trilium-data/document.db</jdbc-url>
+      <jdbc-url>jdbc:sqlite:$USER_HOME$/trilium-data/document.db</jdbc-url>
      <driver-properties>
        <property name="enable_load_extension" value="true" />
      </driver-properties>
    </data-source>
  </component>
 </project>
--- a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
+++ b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml
@@ -1,650 +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.15">
    <root id="1">
      <ServerVersion>3.25.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_contents"/>
    <table id="12" parent="2" name="note_revisions"/>
    <table id="13" parent="2" name="notes"/>
    <table id="14" parent="2" name="options"/>
    <table id="15" parent="2" name="recent_notes"/>
    <table id="16" parent="2" name="source_ids"/>
    <table id="17" parent="2" name="sqlite_master">
      <System>1</System>
    </table>
    <table id="18" parent="2" name="sqlite_sequence">
      <System>1</System>
    </table>
    <table id="19" parent="2" name="sync"/>
    <column id="20" parent="6" name="apiTokenId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="21" parent="6" name="token">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="22" parent="6" name="utcDateCreated">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="23" parent="6" name="isDeleted">
      <Position>4</Position>
      <DataType>INT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
    <column id="24" parent="6" name="hash">
      <Position>5</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
    <index id="25" parent="6" name="sqlite_autoindex_api_tokens_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>apiTokenId</ColNames>
      <Unique>1</Unique>
    </index>
    <key id="26" parent="6">
      <ColNames>apiTokenId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_api_tokens_1</UnderlyingIndexName>
    </key>
    <column id="27" parent="7" name="attributeId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="28" parent="7" name="noteId">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="29" parent="7" name="type">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="30" parent="7" name="name">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="31" parent="7" name="value">
      <Position>5</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&apos;&apos;</DefaultExpression>
    </column>
    <column id="32" parent="7" name="position">
      <Position>6</Position>
      <DataType>INT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
    <column id="33" parent="7" name="utcDateCreated">
      <Position>7</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="34" parent="7" name="utcDateModified">
      <Position>8</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="35" parent="7" name="isDeleted">
      <Position>9</Position>
      <DataType>INT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="36" parent="7" name="hash">
      <Position>10</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
    <column id="37" parent="7" name="isInheritable">
      <Position>11</Position>
      <DataType>int|0s</DataType>
      <DefaultExpression>0</DefaultExpression>
    </column>
    <index id="38" parent="7" name="sqlite_autoindex_attributes_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>attributeId</ColNames>
      <Unique>1</Unique>
    </index>
    <index id="39" parent="7" name="IDX_attributes_noteId_index">
      <ColNames>noteId</ColNames>
    </index>
    <index id="40" parent="7" name="IDX_attributes_name_value">
      <ColNames>name
 value</ColNames>
    </index>
    <index id="41" parent="7" name="IDX_attributes_name_index">
      <ColNames>name</ColNames>
    </index>
    <index id="42" parent="7" name="IDX_attributes_value_index">
      <ColNames>value</ColNames>
    </index>
    <key id="43" parent="7">
      <ColNames>attributeId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_attributes_1</UnderlyingIndexName>
    </key>
    <column id="44" parent="8" name="branchId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="45" parent="8" name="noteId">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="46" parent="8" name="parentNoteId">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="47" parent="8" name="notePosition">
      <Position>4</Position>
      <DataType>INTEGER|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="48" parent="8" name="prefix">
      <Position>5</Position>
      <DataType>TEXT|0s</DataType>
    </column>
    <column id="49" parent="8" name="isExpanded">
      <Position>6</Position>
      <DataType>BOOLEAN|0s</DataType>
    </column>
    <column id="50" parent="8" name="isDeleted">
      <Position>7</Position>
      <DataType>INTEGER|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
    <column id="51" parent="8" name="utcDateModified">
      <Position>8</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="52" parent="8" name="utcDateCreated">
      <Position>9</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="53" parent="8" name="hash">
      <Position>10</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
    <index id="54" parent="8" name="sqlite_autoindex_branches_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>branchId</ColNames>
      <Unique>1</Unique>
    </index>
    <index id="55" parent="8" name="IDX_branches_noteId_parentNoteId">
      <ColNames>noteId
 parentNoteId</ColNames>
    </index>
    <index id="56" parent="8" name="IDX_branches_noteId">
      <ColNames>noteId</ColNames>
    </index>
    <index id="57" parent="8" name="IDX_branches_parentNoteId">
      <ColNames>parentNoteId</ColNames>
    </index>
    <key id="58" parent="8">
      <ColNames>branchId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_branches_1</UnderlyingIndexName>
    </key>
    <column id="59" parent="9" name="eventId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="60" parent="9" name="noteId">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
    </column>
    <column id="61" parent="9" name="comment">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
    </column>
    <column id="62" parent="9" name="utcDateCreated">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <index id="63" parent="9" name="sqlite_autoindex_event_log_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>eventId</ColNames>
      <Unique>1</Unique>
    </index>
    <key id="64" parent="9">
      <ColNames>eventId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_event_log_1</UnderlyingIndexName>
    </key>
    <column id="65" parent="10" name="linkId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="66" parent="10" name="noteId">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="67" parent="10" name="targetNoteId">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="68" parent="10" name="type">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="69" parent="10" name="hash">
      <Position>5</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
    <column id="70" parent="10" name="isDeleted">
      <Position>6</Position>
      <DataType>INTEGER|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
    <column id="71" parent="10" name="utcDateCreated">
      <Position>7</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="72" parent="10" name="utcDateModified">
      <Position>8</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <index id="73" parent="10" name="sqlite_autoindex_links_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>linkId</ColNames>
      <Unique>1</Unique>
    </index>
    <index id="74" parent="10" name="IDX_links_noteId_index">
      <ColNames>noteId</ColNames>
    </index>
    <index id="75" parent="10" name="IDX_links_targetNoteId_index">
      <ColNames>targetNoteId</ColNames>
    </index>
    <key id="76" parent="10">
      <ColNames>linkId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_links_1</UnderlyingIndexName>
    </key>
    <column id="77" parent="11" name="noteId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="78" parent="11" name="content">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <DefaultExpression>NULL</DefaultExpression>
    </column>
    <column id="79" parent="11" name="hash">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
    <column id="80" parent="11" name="utcDateModified">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <index id="81" parent="11" name="sqlite_autoindex_note_contents_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>noteId</ColNames>
      <Unique>1</Unique>
    </index>
    <key id="82" parent="11">
      <ColNames>noteId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_note_contents_1</UnderlyingIndexName>
    </key>
    <column id="83" parent="12" name="noteRevisionId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="84" parent="12" name="noteId">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="85" parent="12" name="title">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
    </column>
    <column id="86" parent="12" name="content">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
    </column>
    <column id="87" parent="12" name="isProtected">
      <Position>5</Position>
      <DataType>INT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
    <column id="88" parent="12" name="utcDateModifiedFrom">
      <Position>6</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="89" parent="12" name="utcDateModifiedTo">
      <Position>7</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="90" parent="12" name="dateModifiedFrom">
      <Position>8</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="91" parent="12" name="dateModifiedTo">
      <Position>9</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="92" parent="12" name="type">
      <Position>10</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&apos;&apos;</DefaultExpression>
    </column>
    <column id="93" parent="12" name="mime">
      <Position>11</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&apos;&apos;</DefaultExpression>
    </column>
    <column id="94" parent="12" name="hash">
      <Position>12</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
    <index id="95" parent="12" name="sqlite_autoindex_note_revisions_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>noteRevisionId</ColNames>
      <Unique>1</Unique>
    </index>
    <index id="96" parent="12" name="IDX_note_revisions_noteId">
      <ColNames>noteId</ColNames>
    </index>
    <index id="97" parent="12" name="IDX_note_revisions_dateModifiedFrom">
      <ColNames>utcDateModifiedFrom</ColNames>
    </index>
    <index id="98" parent="12" name="IDX_note_revisions_dateModifiedTo">
      <ColNames>utcDateModifiedTo</ColNames>
    </index>
    <key id="99" parent="12">
      <ColNames>noteRevisionId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_note_revisions_1</UnderlyingIndexName>
    </key>
    <column id="100" parent="13" name="noteId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="101" parent="13" name="title">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;note&quot;</DefaultExpression>
    </column>
    <column id="102" parent="13" name="isProtected">
      <Position>3</Position>
      <DataType>INT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
    <column id="103" parent="13" name="type">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&apos;text&apos;</DefaultExpression>
    </column>
    <column id="104" parent="13" name="mime">
      <Position>5</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&apos;text/html&apos;</DefaultExpression>
    </column>
    <column id="105" parent="13" name="hash">
      <Position>6</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
    <column id="106" parent="13" name="isDeleted">
      <Position>7</Position>
      <DataType>INT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
    <column id="107" parent="13" name="dateCreated">
      <Position>8</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="108" parent="13" name="dateModified">
      <Position>9</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="109" parent="13" name="utcDateCreated">
      <Position>10</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="110" parent="13" name="utcDateModified">
      <Position>11</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <index id="111" parent="13" name="sqlite_autoindex_notes_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>noteId</ColNames>
      <Unique>1</Unique>
    </index>
    <key id="112" parent="13">
      <ColNames>noteId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_notes_1</UnderlyingIndexName>
    </key>
    <column id="113" parent="14" name="name">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="114" parent="14" name="value">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
    </column>
    <column id="115" parent="14" name="isSynced">
      <Position>3</Position>
      <DataType>INTEGER|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>0</DefaultExpression>
    </column>
    <column id="116" parent="14" name="hash">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
    <column id="117" parent="14" name="utcDateCreated">
      <Position>5</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="118" parent="14" name="utcDateModified">
      <Position>6</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <index id="119" parent="14" name="sqlite_autoindex_options_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>name</ColNames>
      <Unique>1</Unique>
    </index>
    <key id="120" parent="14">
      <ColNames>name</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_options_1</UnderlyingIndexName>
    </key>
    <column id="121" parent="15" name="branchId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="122" parent="15" name="notePath">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="123" parent="15" name="hash">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
      <DefaultExpression>&quot;&quot;</DefaultExpression>
    </column>
    <column id="124" parent="15" name="utcDateCreated">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="125" parent="15" name="isDeleted">
      <Position>5</Position>
      <DataType>INT|0s</DataType>
    </column>
    <index id="126" parent="15" name="sqlite_autoindex_recent_notes_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>branchId</ColNames>
      <Unique>1</Unique>
    </index>
    <key id="127" parent="15">
      <ColNames>branchId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_recent_notes_1</UnderlyingIndexName>
    </key>
    <column id="128" parent="16" name="sourceId">
      <Position>1</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="129" parent="16" name="utcDateCreated">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <index id="130" parent="16" name="sqlite_autoindex_source_ids_1">
      <NameSurrogate>1</NameSurrogate>
      <ColNames>sourceId</ColNames>
      <Unique>1</Unique>
    </index>
    <key id="131" parent="16">
      <ColNames>sourceId</ColNames>
      <Primary>1</Primary>
      <UnderlyingIndexName>sqlite_autoindex_source_ids_1</UnderlyingIndexName>
    </key>
    <column id="132" parent="17" name="type">
      <Position>1</Position>
      <DataType>text|0s</DataType>
    </column>
    <column id="133" parent="17" name="name">
      <Position>2</Position>
      <DataType>text|0s</DataType>
    </column>
    <column id="134" parent="17" name="tbl_name">
      <Position>3</Position>
      <DataType>text|0s</DataType>
    </column>
    <column id="135" parent="17" name="rootpage">
      <Position>4</Position>
      <DataType>int|0s</DataType>
    </column>
    <column id="136" parent="17" name="sql">
      <Position>5</Position>
      <DataType>text|0s</DataType>
    </column>
    <column id="137" parent="18" name="name">
      <Position>1</Position>
    </column>
    <column id="138" parent="18" name="seq">
      <Position>2</Position>
    </column>
    <column id="139" parent="19" name="id">
      <Position>1</Position>
      <DataType>INTEGER|0s</DataType>
      <NotNull>1</NotNull>
      <SequenceIdentity>1</SequenceIdentity>
    </column>
    <column id="140" parent="19" name="entityName">
      <Position>2</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="141" parent="19" name="entityId">
      <Position>3</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="142" parent="19" name="sourceId">
      <Position>4</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <column id="143" parent="19" name="utcSyncDate">
      <Position>5</Position>
      <DataType>TEXT|0s</DataType>
      <NotNull>1</NotNull>
    </column>
    <index id="144" parent="19" name="IDX_sync_entityName_entityId">
      <ColNames>entityName
 entityId</ColNames>
      <Unique>1</Unique>
    </index>
    <index id="145" parent="19" name="IDX_sync_utcSyncDate">
      <ColNames>utcSyncDate</ColNames>
    </index>
    <key id="146" parent="19">
      <ColNames>id</ColNames>
      <Primary>1</Primary>
    </key>
  </database-model>
 </dataSource>
--- a/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997/storage_v2/_src_/schema/main.uQUzAA.meta
+++ b/.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997/storage_v2/_src_/schema/main.uQUzAA.meta
@@ -1,2 +0,0 @@
 #n:main
 !<md> [0, 0, null, null, -2147483648, -2147483648]
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,7 @@
 <component name="InspectionProjectProfileManager">
  <profile version="1.0">
    <option name="myName" value="Project Default" />
    <inspection_tool class="JSUnfilteredForInLoop" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
      <option name="processCode" value="true" />
      <option name="processLiterals" value="true" />
--- a/.idea/jsLibraryMappings.xml
+++ b/.idea/jsLibraryMappings.xml
@@ -0,0 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="JavaScriptLibraryMappings">
    <file url="PROJECT" libraries="{@types/jquery}" />
  </component>
 </project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
  <component name="VcsDirectoryMappings">
    <mapping directory="" vcs="Git" />
    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
  </component>
 </project>
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -0,0 +1,18 @@
 {
    "version": "0.2.0",
    "configurations": [
        {
            "type": "node",
            "request": "launch",
            "name": "start-server",
            "skipFiles": [
                "<node_internals>/**"
            ],
            "env": {
                "TRILIUM_ENV": "dev"
            },
            "outputCapture": "std",
            "program": "${workspaceFolder}/src/www"
        }
    ]
 }
--- a/7
+++ b/7
@@ -1,11 +1,9 @@
-FROM node:10.15.3-alpine
+FROM node:12.16.3-alpine
 # Create app directory
 WORKDIR /usr/src/app
-# Copy both package.json and package-lock.json
+COPY server-package.json package.json
 # where available (npm@5+)
 COPY package.json package-lock.json ./
 # Install app dependencies
 RUN set -x \
@@ -18,6 +16,7 @@ RUN set -x \
        make \
        nasm \
        libpng-dev \
        python \
    && npm install --production \
    && apk del .build-dependencies
--- a/README.md
+++ b/README.md
@@ -8,23 +8,24 @@ Trilium Notes is a hierarchical note taking application with focus on building l
 ## 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).
@@ -45,5 +46,12 @@ Use a browser based dev environment
 Or clone locally and run
 ```
 npm install
-npm run start
+npm run start-server
 ```
 ## Shoutouts
 * [CKEditor 5](https://github.com/ckeditor/ckeditor5) - best WYSIWYG editor on the market, very interactive and listening team
 * [FancyTree](https://github.com/mar10/fancytree) - very feature rich tree library without real competition. Trilium Notes would not be the same without it.
 * [CodeMirror](https://github.com/codemirror/CodeMirror) - code editor with support for huge amount of languages
 * [jsPlumb](https://github.com/jsplumb/jsplumb) - visual connectivity library without competition. Used in [relation maps](https://github.com/zadam/trilium/wiki/Relation-map) and [link maps](https://github.com/zadam/trilium/wiki/Link-map)
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,13 @@
 # Security Policy
 ## Supported Versions
 In the (still active) 0.X phase of the project only the latest stable minor release is getting bugfixes (including security ones).
 So e.g. if the latest stable version is 0.42.3 and the latest beta version is 0.43.0-beta, then 0.42 line will still get security fixes but older versions (like 0.41.X) won't get any fixes.
 Description above is a general rule and may be altered on case by case basis.
 ## Reporting a Vulnerability
 You can report low severity vulnerabilities as GitHub issues, more severe vulnerabilities should be reported to the email zadam.apps@gmail.com
--- a/bin/better-sqlite3/linux-desktop-better_sqlite3.node
+++ b/bin/better-sqlite3/linux-desktop-better_sqlite3.node
--- a/bin/better-sqlite3/linux-server-better_sqlite3.node
+++ b/bin/better-sqlite3/linux-server-better_sqlite3.node
--- a/bin/better-sqlite3/mac-better_sqlite3.node
+++ b/bin/better-sqlite3/mac-better_sqlite3.node
--- a/bin/better-sqlite3/win-better_sqlite3.node
+++ b/bin/better-sqlite3/win-better_sqlite3.node
--- a/bin/build-docker.sh
+++ b/bin/build-docker.sh
@@ -3,6 +3,8 @@
 VERSION=`jq -r ".version" package.json`
 SERIES=${VERSION:0:4}-latest
 cat package.json | grep -v electron > server-package.json
 sudo docker build -t zadam/trilium:$VERSION -t zadam/trilium:$SERIES .
 if [[ $VERSION != *"beta"* ]]; then
--- a/bin/build-linux-x64.sh
+++ b/bin/build-linux-x64.sh
@@ -1,14 +1,25 @@
 #!/usr/bin/env bash
 SRC_DIR=./dist/trilium-linux-x64-src
 if [ "$1" != "DONTCOPY" ]
 then
    ./bin/copy-trilium.sh $SRC_DIR
 fi
 rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 echo "Copying required linux-x64 binaries"
 cp -r bin/better-sqlite3/linux-desktop-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 echo "Packaging linux x64 electron build"
 ./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
 BUILD_DIR=./dist/trilium-linux-x64
 rm -rf $BUILD_DIR
 rm -r node_modules/sqlite3/lib/binding/*
 cp -r bin/deps/linux-x64/sqlite/* node_modules/sqlite3/lib/binding/
 ./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=linux --arch=x64 --overwrite
 mv "./dist/Trilium Notes-linux-x64" $BUILD_DIR
 cp images/app-icons/png/128x128.png $BUILD_DIR/icon.png
@@ -16,9 +27,16 @@ cp images/app-icons/png/128x128.png $BUILD_DIR/icon.png
 # removing software WebGL binaries because they are pretty huge and not necessary
 rm -r $BUILD_DIR/swiftshader
 cp bin/tpl/portable-trilium.sh $BUILD_DIR/
 chmod 755 $BUILD_DIR/portable-trilium.sh
 echo "Packaging linux x64 electron distribution..."
 VERSION=`jq -r ".version" package.json`
 cd dist
 tar cJf trilium-linux-x64-${VERSION}.tar.xz trilium-linux-x64
 cd ..
 bin/build-debian.sh
--- a/bin/build-mac-x64.sh
+++ b/bin/build-mac-x64.sh
@@ -1,27 +1,28 @@
 #!/usr/bin/env bash
 SRC_DIR=./dist/trilium-mac-x64-src
 if [ "$1" != "DONTCOPY" ]
 then
    ./bin/copy-trilium.sh $SRC_DIR
 fi
 echo "Copying required mac binaries"
 cp -r bin/better-sqlite3/mac-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 echo "Packaging mac x64 electron build"
 ./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns
 BUILD_DIR=./dist/trilium-mac-x64
 rm -rf $BUILD_DIR
 echo "Copying required mac binaries"
 rm -r node_modules/sqlite3/lib/binding/*
 rm -r node_modules/mozjpeg/vendor/*
 rm -r node_modules/pngquant-bin/vendor/*
 rm -r node_modules/giflossy/vendor/*
 cp -r bin/deps/mac-x64/sqlite/* node_modules/sqlite3/lib/binding/
 cp bin/deps/mac-x64/image/cjpeg node_modules/mozjpeg/vendor/
 cp bin/deps/mac-x64/image/pngquant node_modules/pngquant-bin/vendor/
 cp bin/deps/mac-x64/image/gifsicle node_modules/giflossy/vendor/
 ./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=darwin --arch=x64 --overwrite --icon=images/app-icons/mac/icon.icns
 # Mac build has by default useless directory level
 mv "./dist/Trilium Notes-darwin-x64" $BUILD_DIR
 ./bin/reset-local.sh
 echo "Zipping mac x64 electron distribution..."
 VERSION=`jq -r ".version" package.json`
--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@@ -1,40 +1,33 @@
 #!/usr/bin/env bash
 PKG_DIR=dist/trilium-linux-x64-server
-NODE_VERSION=10.15.3
+NODE_VERSION=12.18.3
-rm -r $PKG_DIR
+if [ "$1" != "DONTCOPY" ]
-mkdir $PKG_DIR
+then
-cd $PKG_DIR
+    ./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 ../../images/ ./
 cp -r ../../libraries/ ./
 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`
+mv dist/node-v${NODE_VERSION}-linux-x64 $PKG_DIR/node
 rm -r $PKG_DIR/node/lib/node_modules/npm
 rm -r $PKG_DIR/node/include/node
 rm -r $PKG_DIR/node_modules/electron*
 cp -r bin/better-sqlite3/linux-server-better_sqlite3.node $PKG_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 printf "#!/bin/sh\n./node/bin/node src/www" > $PKG_DIR/trilium.sh
 chmod 755 $PKG_DIR/trilium.sh
 VERSION=`jq -r ".version" package.json`
 cd dist
 tar cJf trilium-linux-x64-server-${VERSION}.tar.xz trilium-linux-x64-server
--- a/bin/build-win-x64.sh
+++ b/bin/build-win-x64.sh
@@ -1,28 +1,31 @@
 #!/usr/bin/env bash
-BUILD_DIR=./dist/trilium-windows-x64
+SRC_DIR=./dist/trilium-windows-x64-src
-rm -rf $BUILD_DIR
+
 if [ "$1" != "DONTCOPY" ]
 then
    ./bin/copy-trilium.sh $SRC_DIR
 fi
 echo "Copying required windows binaries"
-rm -r node_modules/sqlite3/lib/binding/*
+cp -r bin/better-sqlite3/win-better_sqlite3.node $SRC_DIR/node_modules/better-sqlite3/build/Release/better_sqlite3.node
 rm -r node_modules/mozjpeg/vendor/*
 rm -r node_modules/pngquant-bin/vendor/*
 rm -r node_modules/giflossy/vendor/*
-cp -r bin/deps/win-x64/sqlite/* node_modules/sqlite3/lib/binding/
+rm -r $SRC_DIR/src/public/app-dist/*.mobile.*
 cp bin/deps/win-x64/image/cjpeg.exe node_modules/mozjpeg/vendor/
 cp bin/deps/win-x64/image/pngquant.exe node_modules/pngquant-bin/vendor/
 cp bin/deps/win-x64/image/gifsicle.exe node_modules/giflossy/vendor/
-./node_modules/.bin/electron-packager . --asar --out=dist --executable-name=trilium --platform=win32  --arch=x64 --overwrite --icon=images/app-icons/win/icon.ico
+echo "Packaging windows x64 electron build"
 ./node_modules/.bin/electron-packager $SRC_DIR --asar --out=dist --executable-name=trilium --platform=win32  --arch=x64 --overwrite --icon=images/app-icons/win/icon.ico
 BUILD_DIR=./dist/trilium-windows-x64
 rm -rf $BUILD_DIR
 mv "./dist/Trilium Notes-win32-x64" $BUILD_DIR
 # removing software WebGL binaries because they are pretty huge and not necessary
 rm -r $BUILD_DIR/swiftshader
-./bin/reset-local.sh
+cp bin/tpl/portable-trilium.bat $BUILD_DIR/
 echo "Zipping windows x64 electron distribution..."
 VERSION=`jq -r ".version" package.json`
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -1,21 +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
+# we'll just copy the same SRC dir to all the builds so we don't have to do npm install in each separately
-bin/build-linux-x64.sh
+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
-# this needs to be run after linux build
+bin/build-win-x64.sh DONTCOPY
 bin/build-debian.sh
-bin/build-server.sh
+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,51 @@
 #!/usr/bin/env bash
 if [[ $# -eq 0 ]] ; then
    echo "Missing argument of target directory"
    exit 1
 fi
 npm run webpack
 DIR=$1
 rm -rf $DIR
 mkdir $DIR
 echo "Copying Trilium to build directory $DIR"
 cp -r images $DIR/
 cp -r libraries $DIR/
 cp -r src $DIR/
 cp -r db $DIR/
 cp -r package.json $DIR/
 cp -r package-lock.json $DIR/
 cp -r README.md $DIR/
 cp -r LICENSE $DIR/
 cp -r config-sample.ini $DIR/
 cp -r electron.js $DIR/
 cp webpack-* $DIR/
 # run in subshell (so we return to original dir)
 (cd $DIR && npm install --only=prod)
 # cleanup of useless files in dependencies
 rm -r $DIR/node_modules/image-q/demo
 rm -r $DIR/node_modules/better-sqlite3/Release
 rm -r $DIR/node_modules/better-sqlite3/deps/sqlite3.tar.gz
 rm -r $DIR/node_modules/@jimp/plugin-print/fonts
 rm -r $DIR/node_modules/jimp/browser
 rm -r $DIR/node_modules/jimp/fonts
 # delete all tests (there are often large images as test file for jimp etc.)
 find $DIR/node_modules -name test -exec rm -rf {} \;
 find $DIR/node_modules -name docs -exec rm -rf {} \;
 find $DIR/node_modules -name demo -exec rm -rf {} \;
 find $DIR/libraries -name "*.map" -type f -delete
 rm -r $DIR/src/public/app
 sed -i -e 's/app\/desktop.js/app-dist\/desktop.js/g' $DIR/src/views/desktop.ejs
 sed -i -e 's/app\/mobile.js/app-dist\/mobile.js/g' $DIR/src/views/mobile.ejs
 sed -i -e 's/app\/setup.js/app-dist\/setup.js/g' $DIR/src/views/setup.ejs
--- a/bin/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/node-v64-linux-x64/node_sqlite3.node
+++ b/bin/deps/linux-x64/sqlite/node-v64-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/gifsicle
+++ b/bin/deps/mac-x64/image/gifsicle
--- 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/win-x64/image/cjpeg.exe
+++ b/bin/deps/win-x64/image/cjpeg.exe
--- a/bin/deps/win-x64/image/gifsicle.exe
+++ b/bin/deps/win-x64/image/gifsicle.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/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/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
--- a/bin/reset-local.sh
+++ b/bin/reset-local.sh
@@ -1,3 +0,0 @@
 #!/usr/bin/env bash
 ./node_modules/.bin/electron-rebuild --arch=x64
--- 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,16 @@
 # Instance name can be used to distinguish between different instances
 instanceName=
 # set to true to allow using Trilium without authentication (makes sense for server build only, desktop build doesn't need password)
 noAuthentication=false
 # Disable automatically generating desktop icon
 # noDesktopIcon=true
 [Network]
-# port setting is relevant only for web deployments, desktop builds run on random free port
+# host setting is relevant only for web deployments - set the host on which the server will listen
 # host=0.0.0.0
 # port setting is relevant only for web deployments, desktop builds run on a fixed port (changeable with TRILIUM_PORT environment variable)
 port=8080
 # true for TLS/SSL/HTTPS (secure), false for HTTP (unsecure).
 https=false
--- a/db/demo.tar
+++ b/db/demo.tar
--- a/db/demo.zip
+++ b/db/demo.zip
--- a/db/migrations/0104__fill_sync_rows_for_options.js
+++ b/db/migrations/0104__fill_sync_rows_for_options.js
@@ -1,4 +1,4 @@
-const syncTableService = require('../../src/services/sync_table');
+const syncTableService = require('../../src/services/entity_changes.js');
 // options has not been filled so far which caused problems with clean-slate sync.
 module.exports = async () => await syncTableService.fillAllSyncRows();
--- a/db/migrations/0132__fill_sync.js
+++ b/db/migrations/0132__fill_sync.js
@@ -1,4 +1,4 @@
-const syncTableService = require('../../src/services/sync_table');
+const syncTableService = require('../../src/services/entity_changes.js');
 module.exports = async () => {
    await syncTableService.fillAllSyncRows();
--- a/db/migrations/0137__links_to_attributes.sql
+++ b/db/migrations/0137__links_to_attributes.sql
@@ -0,0 +1,10 @@
 UPDATE links SET type = 'internal-link' WHERE type = 'hyper';
 UPDATE links SET type = 'image-link' WHERE type = 'image';
 UPDATE links SET type = 'relation-map-link' WHERE type = 'relation-map';
 INSERT INTO attributes (attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable)
 SELECT linkId, noteId, 'relation', type, targetNoteId, 0, utcDateCreated, utcDateModified, isDeleted, hash, 0 FROM links;
 UPDATE sync SET entityName = 'attributes' WHERE entityName = 'links';
 DROP TABLE links;
--- a/db/migrations/0138__sidebar_sizing.sql
+++ b/db/migrations/0138__sidebar_sizing.sql
@@ -0,0 +1,5 @@
 INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
 VALUES ('sidebarMinWidth', '350', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
 INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
 VALUES ('sidebarWidthPercent', '25', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0139__show_sidebar_in_new_tab.sql
+++ b/db/migrations/0139__show_sidebar_in_new_tab.sql
@@ -0,0 +1,2 @@
 INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
 VALUES ('showSidebarInNewTab', 'true', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0140__widget_config.sql
+++ b/db/migrations/0140__widget_config.sql
@@ -0,0 +1,14 @@
 INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
 VALUES ('noteInfoWidget', '{"enabled":true,"expanded":true,"position":100}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
 INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
 VALUES ('attributesWidget', '{"enabled":true,"expanded":true,"position":200}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
 INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
 VALUES ('linkMapWidget', '{"enabled":true,"expanded":true,"position":300}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
 INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
 VALUES ('noteRevisionsWidget', '{"enabled":true,"expanded":true,"position":400}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
 INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
 VALUES ('whatLinksHereWidget', '{"enabled":false,"expanded":true,"position":500}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0141__add_code_note_mime_types.sql
+++ b/db/migrations/0141__add_code_note_mime_types.sql
@@ -0,0 +1,5 @@
 INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
 VALUES ('codeNotesMimeTypes', '["text/x-csrc","text/x-c++src","text/x-csharp","text/css","text/x-go","text/x-groovy","text/x-haskell","text/html","message/http","text/x-java","application/javascript;env=frontend","application/javascript;env=backend","application/json","text/x-kotlin","text/x-markdown","text/x-perl","text/x-php","text/x-python","text/x-ruby",null,"text/x-sql","text/x-swift","text/xml","text/x-yaml"]', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 1);
 INSERT INTO sync (entityName, entityId, sourceId, utcSyncDate)
 VALUES ('options' ,'codeNotesMimeTypes', 'SYNC_FILL', '2018-01-01T00:00:00.000Z');
--- a/db/migrations/0142__similar_notes_widget.sql
+++ b/db/migrations/0142__similar_notes_widget.sql
@@ -0,0 +1,2 @@
 INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
 VALUES ('similarNotesWidget', '{"enabled":true,"expanded":true,"position":600}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0143__drop_event_log.sql
+++ b/db/migrations/0143__drop_event_log.sql
@@ -0,0 +1 @@
 DROP TABLE event_log;
--- a/db/migrations/0144__edited_notes_widget.sql
+++ b/db/migrations/0144__edited_notes_widget.sql
@@ -0,0 +1,2 @@
 INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
 VALUES ('editedNotesWidget', '{"enabled":true,"expanded":true,"position":50}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0145__calendar_widget.sql
+++ b/db/migrations/0145__calendar_widget.sql
@@ -0,0 +1,2 @@
 INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
 VALUES ('calendarWidget', '{"enabled":true,"expanded":true,"position":20}', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0146__add_spell_check_options.sql
+++ b/db/migrations/0146__add_spell_check_options.sql
@@ -0,0 +1,5 @@
 INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
 VALUES ('spellCheckEnabled', 'true', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
 INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
 VALUES ('spellCheckLanguageCode', 'en-US', '2018-07-29T18:31:00.874Z', '2018-07-29T18:31:00.874Z', 0);
--- a/db/migrations/0147__add_hideTabRowForOneTab_if_missing.sql
+++ b/db/migrations/0147__add_hideTabRowForOneTab_if_missing.sql
@@ -0,0 +1,3 @@
 INSERT INTO options (name, value, utcDateCreated, utcDateModified, isSynced)
 SELECT 'hideTabRowForOneTab', 'false', '2019-05-01T18:31:00.874Z', '2019-05-01T18:31:00.874Z', 0
 WHERE NOT EXISTS(SELECT 1 FROM options WHERE name = 'hideTabRowForOneTab');
--- a/db/migrations/0148__make_isExpanded_not_null.sql
+++ b/db/migrations/0148__make_isExpanded_not_null.sql
@@ -0,0 +1,22 @@
 CREATE TABLE IF NOT EXISTS "mig_branches" (
                                          `branchId`	TEXT NOT NULL,
                                          `noteId`	TEXT NOT NULL,
                                          `parentNoteId`	TEXT NOT NULL,
                                          `notePosition`	INTEGER NOT NULL,
                                          `prefix`	TEXT,
                                          `isExpanded`	INTEGER NOT NULL DEFAULT 0,
                                          `isDeleted`	INTEGER NOT NULL DEFAULT 0,
                                          `utcDateModified`	TEXT NOT NULL,
                                          utcDateCreated TEXT NOT NULL,
                                          hash TEXT DEFAULT "" NOT NULL,
                                          PRIMARY KEY(`branchId`));
 INSERT INTO mig_branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash)
 SELECT branchId, noteId, parentNoteId, notePosition, prefix, COALESCE(isExpanded, 0), isDeleted, utcDateModified, utcDateCreated, hash FROM branches;
 DROP TABLE branches;
 ALTER TABLE mig_branches RENAME TO branches;
 CREATE INDEX `IDX_branches_noteId` ON `branches` (`noteId`);
 CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
 CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
--- a/db/migrations/0149__space_out_positions.sql
+++ b/db/migrations/0149__space_out_positions.sql
@@ -0,0 +1,2 @@
 UPDATE branches SET notePosition = notePosition * 10;
 UPDATE attributes SET position = position * 10;
--- a/db/migrations/0150__note_revision_contents.sql
+++ b/db/migrations/0150__note_revision_contents.sql
@@ -0,0 +1,36 @@
 CREATE TABLE IF NOT EXISTS "note_revisions_mig" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
                                                `noteId`	TEXT NOT NULL,
                                                `title`	TEXT,
                                                `contentLength`	INT NOT NULL,
                                                `isProtected`	INT NOT NULL DEFAULT 0,
                                                `utcDateLastEdited` TEXT NOT NULL,
                                                `utcDateCreated` TEXT NOT NULL,
                                                `utcDateModified` TEXT NOT NULL,
                                                `dateLastEdited` TEXT NOT NULL,
                                                `dateCreated` TEXT NOT NULL,
                                                type TEXT DEFAULT '' NOT NULL,
                                                mime TEXT DEFAULT '' NOT NULL,
                                                hash TEXT DEFAULT '' NOT NULL);
 CREATE TABLE IF NOT EXISTS "note_revision_contents" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
                                                 `content`	TEXT,
                                                 hash TEXT DEFAULT '' NOT NULL,
                                                 `utcDateModified` TEXT NOT NULL);
 INSERT INTO note_revision_contents (noteRevisionId, content, hash, utcDateModified)
 SELECT noteRevisionId, content, hash, utcDateModifiedTo FROM note_revisions;
 INSERT INTO note_revisions_mig (noteRevisionId, noteId, title, contentLength, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash)
 SELECT noteRevisionId, noteId, title, COALESCE(LENGTH(content), 0), isProtected, utcDateModifiedFrom, utcDateModifiedTo, utcDateModifiedTo, dateModifiedFrom, dateModifiedTo, type, mime, hash FROM note_revisions;
 DROP TABLE note_revisions;
 ALTER TABLE note_revisions_mig RENAME TO note_revisions;
 CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (`noteId`);
 CREATE INDEX `IDX_note_revisions_utcDateCreated` ON `note_revisions` (`utcDateCreated`);
 CREATE INDEX `IDX_note_revisions_utcDateLastEdited` ON `note_revisions` (`utcDateLastEdited`);
 CREATE INDEX `IDX_note_revisions_dateCreated` ON `note_revisions` (`dateCreated`);
 CREATE INDEX `IDX_note_revisions_dateLastEdited` ON `note_revisions` (`dateLastEdited`);
 INSERT INTO sync (entityName, entityId, sourceId, utcSyncDate)
 SELECT 'note_revision_contents', entityId, sourceId, utcSyncDate FROM sync WHERE entityName = 'note_revisions';
--- a/db/migrations/0151__add_isErased_to_note.sql
+++ b/db/migrations/0151__add_isErased_to_note.sql
@@ -0,0 +1,31 @@
 CREATE TABLE IF NOT EXISTS "notes_mig" (
                                       `noteId`	TEXT NOT NULL,
                                       `title`	TEXT NOT NULL DEFAULT "note",
                                       `isProtected`	INT NOT NULL DEFAULT 0,
                                       `type` TEXT NOT NULL DEFAULT 'text',
                                       `mime` TEXT NOT NULL DEFAULT 'text/html',
                                       `hash` TEXT DEFAULT "" NOT NULL,
                                       `isDeleted`	INT NOT NULL DEFAULT 0,
                                       `isErased`	INT NOT NULL DEFAULT 0,
                                       `dateCreated`	TEXT NOT NULL,
                                       `dateModified`	TEXT NOT NULL,
                                       `utcDateCreated`	TEXT NOT NULL,
                                       `utcDateModified`	TEXT NOT NULL,
                                       PRIMARY KEY(`noteId`));
 INSERT INTO notes_mig (noteId, title, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
 SELECT noteId, title, isProtected, type, mime, hash, isDeleted, 0, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes;
 DROP TABLE notes;
 ALTER TABLE notes_mig RENAME TO notes;
 UPDATE notes SET isErased = 1 WHERE isDeleted = 1
 AND 1=(SELECT CASE WHEN content IS NULL THEN 1 ELSE 0 END FROM note_contents WHERE note_contents.noteId = notes.noteId);
 CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
 CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
 CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
 CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
 CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
 CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
 CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
--- a/db/migrations/0152__add_contentLength_to_note.sql
+++ b/db/migrations/0152__add_contentLength_to_note.sql
@@ -0,0 +1,34 @@
 CREATE TABLE IF NOT EXISTS "notes_mig" (
                                           `noteId`	TEXT NOT NULL,
                                           `title`	TEXT NOT NULL DEFAULT "note",
                                           `contentLength`	INT NOT NULL,
                                           `isProtected`	INT NOT NULL DEFAULT 0,
                                           `type` TEXT NOT NULL DEFAULT 'text',
                                           `mime` TEXT NOT NULL DEFAULT 'text/html',
                                           `hash` TEXT DEFAULT "" NOT NULL,
                                           `isDeleted`	INT NOT NULL DEFAULT 0,
                                           `isErased`	INT NOT NULL DEFAULT 0,
                                           `dateCreated`	TEXT NOT NULL,
                                           `dateModified`	TEXT NOT NULL,
                                           `utcDateCreated`	TEXT NOT NULL,
                                           `utcDateModified`	TEXT NOT NULL,
                                           PRIMARY KEY(`noteId`));
 INSERT INTO notes_mig (noteId, title, contentLength, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
 SELECT noteId, title, -1, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes;
 DROP TABLE notes;
 ALTER TABLE notes_mig RENAME TO notes;
 UPDATE notes SET contentLength = COALESCE((SELECT COALESCE(LENGTH(content), 0) FROM note_contents WHERE note_contents.noteId = notes.noteId), -1);
 CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
 CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
 CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
 CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
 CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
 CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
 CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
 -- should be OK since sync protocol changes so all instances must upgrade
 UPDATE attributes SET isDeleted = 1 WHERE name = 'fileSize';
--- a/db/migrations/0153__add_isErased_to_note_revision.sql
+++ b/db/migrations/0153__add_isErased_to_note_revision.sql
@@ -0,0 +1,28 @@
 CREATE TABLE IF NOT EXISTS "note_revisions_mig" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
                                                 `noteId`	TEXT NOT NULL,
                                                 `title`	TEXT,
                                                 `contentLength`	INT NOT NULL,
                                                 `isErased`	INT NOT NULL DEFAULT 0,
                                                 `isProtected`	INT NOT NULL DEFAULT 0,
                                                 `utcDateLastEdited` TEXT NOT NULL,
                                                 `utcDateCreated` TEXT NOT NULL,
                                                 `utcDateModified` TEXT NOT NULL,
                                                 `dateLastEdited` TEXT NOT NULL,
                                                 `dateCreated` TEXT NOT NULL,
                                                 type TEXT DEFAULT '' NOT NULL,
                                                 mime TEXT DEFAULT '' NOT NULL,
                                                 hash TEXT DEFAULT '' NOT NULL);
 INSERT INTO note_revisions_mig (noteRevisionId, noteId, title, contentLength, isErased, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash)
 SELECT noteRevisionId, noteId, title, contentLength, 0, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash FROM note_revisions;
 DROP TABLE note_revisions;
 ALTER TABLE note_revisions_mig RENAME TO note_revisions;
 UPDATE note_revisions SET isErased = (SELECT isErased FROM notes WHERE notes.noteId = note_revisions.noteId);
 CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (`noteId`);
 CREATE INDEX `IDX_note_revisions_utcDateCreated` ON `note_revisions` (`utcDateCreated`);
 CREATE INDEX `IDX_note_revisions_utcDateLastEdited` ON `note_revisions` (`utcDateLastEdited`);
 CREATE INDEX `IDX_note_revisions_dateCreated` ON `note_revisions` (`dateCreated`);
 CREATE INDEX `IDX_note_revisions_dateLastEdited` ON `note_revisions` (`dateLastEdited`);
--- a/db/migrations/0154__system_links_should_follow_camelCase.sql
+++ b/db/migrations/0154__system_links_should_follow_camelCase.sql
@@ -0,0 +1,3 @@
 UPDATE attributes SET name = 'internalLink' WHERE name = 'internal-link';
 UPDATE attributes SET name = 'imageLink' WHERE name = 'image-link';
 UPDATE attributes SET name = 'relationMapLink' WHERE name = 'relation-map-link';
--- a/db/migrations/0155__indexes.sql
+++ b/db/migrations/0155__indexes.sql
@@ -0,0 +1,5 @@
 DROP INDEX IF EXISTS IDX_attributes_name_index;
 DROP INDEX IF EXISTS IDX_branches_noteId;
 CREATE INDEX IDX_source_ids_utcDateCreated
    on source_ids (utcDateCreated);
--- a/db/migrations/0156__add_deleteId.sql
+++ b/db/migrations/0156__add_deleteId.sql
@@ -0,0 +1,81 @@
 CREATE TABLE IF NOT EXISTS "notes_mig" (
                                           `noteId`	TEXT NOT NULL,
                                           `title`	TEXT NOT NULL DEFAULT "note",
                                           `contentLength`	INT NOT NULL,
                                           `isProtected`	INT NOT NULL DEFAULT 0,
                                           `type` TEXT NOT NULL DEFAULT 'text',
                                           `mime` TEXT NOT NULL DEFAULT 'text/html',
                                           `hash` TEXT DEFAULT "" NOT NULL,
                                           `isDeleted`	INT NOT NULL DEFAULT 0,
                                           `deleteId`   TEXT DEFAULT NULL,
                                           `isErased`	INT NOT NULL DEFAULT 0,
                                           `dateCreated`	TEXT NOT NULL,
                                           `dateModified`	TEXT NOT NULL,
                                           `utcDateCreated`	TEXT NOT NULL,
                                           `utcDateModified`	TEXT NOT NULL,
                                           PRIMARY KEY(`noteId`));
 INSERT INTO notes_mig (noteId, title, contentLength, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
 SELECT noteId, title, -1, isProtected, type, mime, hash, isDeleted, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes;
 DROP TABLE notes;
 ALTER TABLE notes_mig RENAME TO notes;
 CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
 CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
 CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
 CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
 CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
 CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
 CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
 CREATE TABLE IF NOT EXISTS "branches_mig" (
                                          `branchId`	TEXT NOT NULL,
                                          `noteId`	TEXT NOT NULL,
                                          `parentNoteId`	TEXT NOT NULL,
                                          `notePosition`	INTEGER NOT NULL,
                                          `prefix`	TEXT,
                                          `isExpanded`	INTEGER NOT NULL DEFAULT 0,
                                          `isDeleted`	INTEGER NOT NULL DEFAULT 0,
                                          `deleteId`    TEXT DEFAULT NULL,
                                          `utcDateModified`	TEXT NOT NULL,
                                          utcDateCreated TEXT NOT NULL,
                                          hash TEXT DEFAULT "" NOT NULL,
                                          PRIMARY KEY(`branchId`));
 INSERT INTO branches_mig (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash)
    SELECT branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, utcDateModified, utcDateCreated, hash FROM branches;
 DROP TABLE branches;
 ALTER TABLE branches_mig RENAME TO branches;
 CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
 CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
 CREATE TABLE IF NOT EXISTS "attributes_mig"
 (
    attributeId      TEXT not null primary key,
    noteId       TEXT not null,
    type         TEXT not null,
    name         TEXT not null,
    value        TEXT default '' not null,
    position     INT  default 0 not null,
    utcDateCreated  TEXT not null,
    utcDateModified TEXT not null,
    isDeleted    INT  not null,
    `deleteId`    TEXT DEFAULT NULL,
    hash         TEXT default "" not null,
    isInheritable int DEFAULT 0 NULL);
 INSERT INTO attributes_mig (attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable)
 SELECT attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, hash, isInheritable FROM attributes;
 DROP TABLE attributes;
 ALTER TABLE attributes_mig RENAME TO attributes;
 CREATE INDEX IDX_attributes_name_value
    on attributes (name, value);
 CREATE INDEX IDX_attributes_noteId_index
    on attributes (noteId);
 CREATE INDEX IDX_attributes_value_index
    on attributes (value);
--- a/db/migrations/0157__fix_contentLength.sql
+++ b/db/migrations/0157__fix_contentLength.sql
@@ -0,0 +1 @@
 UPDATE notes SET contentLength = COALESCE((SELECT COALESCE(LENGTH(content), 0) FROM note_contents WHERE note_contents.noteId = notes.noteId), -1);
--- a/db/migrations/0158__add_isSynced_to_sync.sql
+++ b/db/migrations/0158__add_isSynced_to_sync.sql
@@ -0,0 +1,22 @@
 CREATE TABLE IF NOT EXISTS "sync_mig" (
                                          `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
                                          `entityName`	TEXT NOT NULL,
                                          `entityId`	TEXT NOT NULL,
                                          `sourceId` TEXT NOT NULL,
                                          `isSynced` INTEGER default 0 not null,
                                          `utcSyncDate`	TEXT NOT NULL);
 INSERT INTO sync_mig (id, entityName, entityId, sourceId, isSynced, utcSyncDate)
 SELECT id, entityName, entityId, sourceId, 1, utcSyncDate FROM sync;
 DROP TABLE sync;
 ALTER TABLE sync_mig RENAME TO sync;
 CREATE UNIQUE INDEX `IDX_sync_entityName_entityId` ON `sync` (
                                                              `entityName`,
                                                              `entityId`
    );
 CREATE INDEX `IDX_sync_utcSyncDate` ON `sync` (
                                               `utcSyncDate`
    );
--- a/db/migrations/0159__fix_isSynced_in_sync_rows.sql
+++ b/db/migrations/0159__fix_isSynced_in_sync_rows.sql
@@ -0,0 +1,4 @@
 UPDATE sync SET isSynced = 1 WHERE entityName != 'options' OR (
        entityName = 'options'
        AND 1 = (SELECT isSynced FROM options WHERE name = sync.entityId)
    )
--- a/db/migrations/0160__migrate_attr_definitions.sql
+++ b/db/migrations/0160__migrate_attr_definitions.sql
@@ -0,0 +1,2 @@
 UPDATE attributes SET type = 'label', name = 'label:' || name WHERE type = 'label-definition';
 UPDATE attributes SET type = 'label', name = 'relation:' || name WHERE type = 'relation-definition';
--- a/db/migrations/0161__attr_def_short.js
+++ b/db/migrations/0161__attr_def_short.js
@@ -0,0 +1,79 @@
 const sql = require('../../src/services/sql');
 module.exports = () => {
    for (const attr of sql.getRows("SELECT * FROM attributes WHERE name LIKE 'label:%'")) {
        let obj;
        try {
            obj = JSON.parse(attr.value);
        }
        catch (e) {
            console.log(`Parsing attribute definition "${attr.value}" of ${attr.attributeId} failed with error "${e.message}", setting to default value.`);
            sql.execute('UPDATE attributes SET value = ? WHERE attributeId = ?',
                ["multi,text", attr.attributeId]);
            continue;
        }
        const tokens = [];
        if (obj.isPromoted) {
            tokens.push('promoted');
        }
        if (obj.multiplicityType === 'singlevalue') {
            tokens.push('single');
        } else if (obj.multiplicityType === 'multivalue') {
            tokens.push('multi');
        }
        if (obj.labelType) {
            tokens.push(obj.labelType);
        }
        if (obj.numberPrecision) {
            tokens.push('precision='+obj.numberPrecision);
        }
        const newValue = tokens.join(',');
        sql.execute('UPDATE attributes SET value = ? WHERE attributeId = ?', [newValue, attr.attributeId]);
    }
    for (const attr of sql.getRows("SELECT * FROM attributes WHERE name LIKE 'relation:%'")) {
        let obj;
        try {
            obj = JSON.parse(attr.value);
        }
        catch (e) {
            console.log(`Parsing attribute definition "${attr.value}" of ${attr.attributeId} failed with error "${e.message}", setting to default value.`);
            sql.execute('UPDATE attributes SET value = ? WHERE attributeId = ?',
                ["multi", attr.attributeId]);
            continue;
        }
        const tokens = [];
        if (obj.isPromoted) {
            tokens.push('promoted');
        }
        if (obj.multiplicityType === 'singlevalue') {
            tokens.push('single');
        } else if (obj.multiplicityType === 'multivalue') {
            tokens.push('multi');
        }
        if (obj.inverseRelation) {
            tokens.push('inverse=' + obj.inverseRelation);
        }
        const newValue = tokens.join(',');
        sql.execute('UPDATE attributes SET value = ? WHERE attributeId = ?', [newValue, attr.attributeId]);
    }
 };
--- a/db/migrations/0162__drop_source_ids.sql
+++ b/db/migrations/0162__drop_source_ids.sql
@@ -0,0 +1 @@
 DROP TABLE source_ids;
--- a/db/migrations/0163__rename_sync_to_entity_changes.sql
+++ b/db/migrations/0163__rename_sync_to_entity_changes.sql
@@ -0,0 +1 @@
 ALTER TABLE sync RENAME TO entity_changes;
--- a/db/migrations/0164__rename_utcSyncDate.sql
+++ b/db/migrations/0164__rename_utcSyncDate.sql
@@ -0,0 +1,22 @@
 CREATE TABLE IF NOT EXISTS "mig_entity_changes" (
                                                `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
                                                `entityName`	TEXT NOT NULL,
                                                `entityId`	TEXT NOT NULL,
                                                `sourceId` TEXT NOT NULL,
                                                `isSynced` INTEGER default 0 not null,
                                                `utcChangedDate`	TEXT NOT NULL);
 INSERT INTO mig_entity_changes (id, entityName, entityId, sourceId, isSynced, utcChangedDate)
    SELECT id, entityName, entityId, sourceId, isSynced, utcSyncDate FROM entity_changes;
 DROP TABLE entity_changes;
 ALTER TABLE mig_entity_changes RENAME TO entity_changes;
 CREATE UNIQUE INDEX `IDX_entityChanges_entityName_entityId` ON "entity_changes" (
                                                                                 `entityName`,
                                                                                 `entityId`
    );
 CREATE INDEX `IDX_entityChanges_utcChangedDate` ON "entity_changes" (
                                                                  `utcChangedDate`
    );
--- a/db/migrations/0165__move_contentLength.sql
+++ b/db/migrations/0165__move_contentLength.sql
@@ -0,0 +1,55 @@
 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,
                                       `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, isProtected, type, mime, hash, isDeleted, deleteId, isErased, dateCreated, dateModified, utcDateCreated, utcDateModified)
    SELECT noteId, title, isProtected, type, mime, hash, isDeleted, deleteId, 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 "note_revisions_mig" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
                                             `noteId`	TEXT NOT NULL,
                                             `title`	TEXT,
                                             `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, isErased, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated, type, mime, hash)
 SELECT noteRevisionId, noteId, title, isErased, 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;
 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/0166__add_dateModified_to_note_content.sql
+++ b/db/migrations/0166__add_dateModified_to_note_content.sql
@@ -0,0 +1,20 @@
 CREATE TABLE IF NOT EXISTS "note_contents_mig" (
                                               `noteId`	TEXT NOT NULL,
                                               `content`	TEXT NULL DEFAULT NULL,
                                               `hash` TEXT DEFAULT "" NOT NULL,
                                               `dateModified` TEXT NOT NULL,
                                               `utcDateModified` TEXT NOT NULL,
                                               PRIMARY KEY(`noteId`)
 );
 INSERT INTO note_contents_mig (noteId, content, hash, dateModified, utcDateModified)
    SELECT noteId,
           content,
           hash,
           COALESCE((SELECT dateModified FROM notes WHERE noteId = note_contents.noteId), utcDateModified),
           utcDateModified
    FROM note_contents;
 DROP TABLE note_contents;
 ALTER TABLE note_contents_mig RENAME TO note_contents;
--- a/db/migrations/0167__remove_activateParentNote.sql
+++ b/db/migrations/0167__remove_activateParentNote.sql
@@ -0,0 +1 @@
 DELETE FROM options WHERE name = 'keyboardShortcutsActivateParentNote';
--- a/db/migrations/0168__rename_hideInAutocomplete_to_archived.sql
+++ b/db/migrations/0168__rename_hideInAutocomplete_to_archived.sql
@@ -0,0 +1 @@
 UPDATE attributes SET name = 'archived' WHERE name = 'hideInAutocomplete';
--- a/db/migrations/0169__convert_h1_to_h2.js
+++ b/db/migrations/0169__convert_h1_to_h2.js
@@ -0,0 +1,20 @@
 const repository = require('../../src/services/repository');
 module.exports = () => {
    for (const note of repository.getEntities("SELECT * FROM notes WHERE type = 'text' AND isProtected = 0")) {
        try {
            let origContent = note.getContent();
            const newContent = origContent
                .replace(/<h1/ig, "<h2")
                .replace(/<\/h1/ig, "</h2");
            if (newContent !== origContent) {
                note.setContent(newContent);
            }
        }
        catch (e) {
            console.log(`Changing note content for note ${note.noteId} failed with: ${e.message} ${e.stack}`);
        }
    }
 };
--- a/db/migrations/0170__fix_branch_ordering.js
+++ b/db/migrations/0170__fix_branch_ordering.js
@@ -0,0 +1,14 @@
 const repository = require('../../src/services/repository');
 const sql = require('../../src/services/sql');
 module.exports = () => {
    for (const note of repository.getEntities("SELECT * FROM notes")) {
        let position = 0;
        for (const branch of note.getChildBranches()) {
            sql.execute(`UPDATE branches SET notePosition = ? WHERE branchId = ?`, [position, branch.branchId]);
            position += 10;
        }
    }
 };
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -1,27 +1,3 @@
 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,
                                    `utcSyncDate`	TEXT NOT NULL);
 CREATE TABLE IF NOT EXISTS "source_ids" (
                                          `sourceId`	TEXT NOT NULL,
                                          `utcDateCreated`	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,
                                              `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);
 CREATE TABLE IF NOT EXISTS "api_tokens"
 (
  apiTokenId TEXT PRIMARY KEY NOT NULL,
@@ -29,25 +5,6 @@ CREATE TABLE IF NOT EXISTS "api_tokens"
  utcDateCreated 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,
                                        `utcDateModified`	TEXT NOT NULL,
                                        utcDateCreated TEXT NOT NULL,
                                        hash TEXT DEFAULT "" NOT NULL,
                                        PRIMARY KEY(`branchId`)
 );
 CREATE TABLE IF NOT EXISTS "event_log" (
                                         `eventId`	TEXT NOT NULL PRIMARY KEY,
                                         `noteId`	TEXT,
                                         `comment`	TEXT,
                                         `utcDateCreated`	TEXT NOT NULL
 );
 CREATE TABLE IF NOT EXISTS "options"
 (
  name TEXT not null PRIMARY KEY,
@@ -57,87 +14,6 @@ CREATE TABLE IF NOT EXISTS "options"
  utcDateCreated TEXT not null,
  utcDateModified TEXT NOT NULL
 );
 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,
  hash         TEXT default "" not null,
  isInheritable int DEFAULT 0 NULL);
 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,
                                     `utcDateCreated`	TEXT NOT NULL,
                                     `utcDateModified`	TEXT NOT NULL,
                                     PRIMARY KEY(`linkId`)
 );
 CREATE TABLE IF NOT EXISTS "notes" (
                                     `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`)
 );
 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 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
 (
    noteId TEXT not null primary key,
@@ -146,3 +22,104 @@ CREATE TABLE recent_notes
    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 "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);
 CREATE INDEX IDX_attributes_value_index
    on attributes (value);
 CREATE TABLE IF NOT EXISTS "entity_changes" (
                                                `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
                                                `entityName`	TEXT NOT NULL,
                                                `entityId`	TEXT NOT NULL,
                                                `sourceId` TEXT NOT NULL,
                                                `isSynced` INTEGER default 0 not null,
                                                `utcChangedDate`	TEXT NOT NULL);
 CREATE UNIQUE INDEX `IDX_entityChanges_entityName_entityId` ON "entity_changes" (
                                                                                 `entityName`,
                                                                                 `entityId`
    );
 CREATE INDEX `IDX_entityChanges_utcChangedDate` ON "entity_changes" (
                                                                  `utcChangedDate`
    );
 CREATE TABLE IF NOT EXISTS "notes" (
                                       `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,
                                       `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 "note_revisions" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
                                             `noteId`	TEXT NOT NULL,
                                             `title`	TEXT,
                                             `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 TABLE IF NOT EXISTS "note_contents" (
                                               `noteId`	TEXT NOT NULL,
                                               `content`	TEXT NULL DEFAULT NULL,
                                               `hash` TEXT DEFAULT "" NOT NULL,
                                               `dateModified` TEXT NOT NULL,
                                               `utcDateModified` TEXT NOT NULL,
                                               PRIMARY KEY(`noteId`)
 );
--- 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, utcDateCreated)</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, utcDateCreated)</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>
-<table class="params">
+
    <h5 class="subsection-title">Properties:</h5>
 <table class="props">
    <thead>
    <tr>
@@ -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.6</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, utcDateCreated, utcDateModified)</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, utcDateCreated, utcDateModified)</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>
-<table class="params">
+
    <h5 class="subsection-title">Properties:</h5>
 <table class="props">
    <thead>
    <tr>
@@ -101,7 +106,7 @@
-            <td class="description last"></td>
+            <td class="description last">immutable</td>
        </tr>
@@ -124,7 +129,7 @@
-            <td class="description last"></td>
+            <td class="description last">immutable</td>
        </tr>
@@ -147,7 +152,7 @@
-            <td class="description last"></td>
+            <td class="description last">immutable</td>
        </tr>
@@ -170,7 +175,7 @@
-            <td class="description last"></td>
+            <td class="description last">immutable</td>
        </tr>
@@ -239,7 +244,7 @@
-            <td class="description last"></td>
+            <td class="description last">immutable</td>
        </tr>
@@ -267,6 +272,32 @@
        <tr>
                <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>
@@ -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#line26">line 26</a>
    </li></ul></dd>
@@ -377,6 +406,8 @@
    </div>
@@ -414,7 +445,7 @@
-    <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>
+    <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span class="signature">()</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
@@ -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#line40">line 40</a>
    </li></ul></dd>
@@ -485,6 +516,8 @@
 <h5>Returns:</h5>
@@ -496,7 +529,10 @@
    </dt>
    <dd>
-<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
+<span class="param-type"><a href="Note.html">Note</a></span>
 |
 <span class="param-type">null</span>
    </dd>
@@ -514,7 +550,7 @@
-    <h4 class="name" id="getTargetNote"><span class="type-signature">(async) </span>getTargetNote<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    <h4 class="name" id="getTargetNote"><span class="type-signature"></span>getTargetNote<span class="signature">()</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
@@ -562,7 +598,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#line47">line 47</a>
    </li></ul></dd>
@@ -585,6 +621,8 @@
 <h5>Returns:</h5>
@@ -596,7 +634,10 @@
    </dt>
    <dd>
-<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
+<span class="param-type"><a href="Note.html">Note</a></span>
 |
 <span class="param-type">null</span>
    </dd>
@@ -662,7 +703,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#line62">line 62</a>
    </li></ul></dd>
@@ -685,6 +726,8 @@
 <h5>Returns:</h5>
@@ -724,13 +767,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.6</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, utcDateModified, utcDateCreated)</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, utcDateModified, utcDateCreated)</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>
-<table class="params">
+
    <h5 class="subsection-title">Properties:</h5>
 <table class="props">
    <thead>
    <tr>
@@ -102,7 +107,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
-            <td class="description last">primary key</td>
+            <td class="description last">primary key, immutable</td>
        </tr>
@@ -125,7 +130,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
-            <td class="description last"></td>
+            <td class="description last">immutable</td>
        </tr>
@@ -148,7 +153,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
-            <td class="description last"></td>
+            <td class="description last">immutable</td>
        </tr>
@@ -245,6 +250,32 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
        <tr>
                <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>
@@ -296,8 +327,6 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
 <dl class="details">
@@ -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"></span>getNote<span class="signature">()</span><span class="type-signature"> &rarr; {<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#line31">line 31</a>
    </li></ul></dd>
@@ -463,6 +494,113 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
 <h5>Returns:</h5>
 <dl>
    <dt>
        Type
    </dt>
    <dd>
 <span class="param-type"><a href="Note.html">Note</a></span>
 |
 <span class="param-type">null</span>
    </dd>
 </dl>
    <h4 class="name" id="getParentNote"><span class="type-signature"></span>getParentNote<span class="signature">()</span><span class="type-signature"> &rarr; {<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#line36">line 36</a>
    </li></ul></dd>
 </dl>
 <h5>Returns:</h5>
@@ -505,13 +643,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.6</a>
 </footer>
 <script> prettyPrint(); </script>
--- a/docs/backend_api/Entity.html
+++ b/docs/backend_api/Entity.html
@@ -150,7 +150,7 @@
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_entity.js.html">entities/entity.js</a>, <a href="entities_entity.js.html#line9">line 9</a>
+        <a href="entities_entity.js.html">entities/entity.js</a>, <a href="entities_entity.js.html#line10">line 10</a>
    </li></ul></dd>
@@ -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.6</a>
 </footer>
 <script> prettyPrint(); </script>
--- 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, utcDateModifiedFrom, utcDateModifiedTo)</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, utcDateModifiedFrom, utcDateModifiedTo)</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>
-<table class="params">
+
    <h5 class="subsection-title">Properties:</h5>
 <table class="props">
    <thead>
    <tr>
@@ -200,13 +205,13 @@
        <tr>
-                <td class="name"><code>content</code></td>
+                <td class="name"><code>isErased</code></td>
            <td class="type">
-<span class="param-type">string</span>
+<span class="param-type">boolean</span>
@@ -229,7 +234,7 @@
            <td class="type">
-<span class="param-type">string</span>
+<span class="param-type">boolean</span>
@@ -246,7 +251,7 @@
        <tr>
-                <td class="name"><code>dateModifiedFrom</code></td>
+                <td class="name"><code>dateLastEdited</code></td>
            <td class="type">
@@ -269,7 +274,7 @@
        <tr>
-                <td class="name"><code>dateModifiedTo</code></td>
+                <td class="name"><code>dateCreated</code></td>
            <td class="type">
@@ -292,7 +297,7 @@
        <tr>
-                <td class="name"><code>utcDateModifiedFrom</code></td>
+                <td class="name"><code>utcDateLastEdited</code></td>
            <td class="type">
@@ -315,7 +320,30 @@
        <tr>
-                <td class="name"><code>utcDateModifiedTo</code></td>
+                <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">
@@ -341,8 +369,6 @@
 <dl class="details">
@@ -372,7 +398,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#line24">line 24</a>
+        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line28">line 28</a>
    </li></ul></dd>
@@ -400,6 +426,8 @@
    </div>
@@ -429,6 +457,218 @@
        <h3 class="subsection-title">Methods</h3>
    <h4 class="name" id="getContent"><span class="type-signature"></span>getContent<span class="signature">()</span><span class="type-signature"> &rarr; {*}</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#line68">line 68</a>
    </li></ul></dd>
 </dl>
 <h5>Returns:</h5>
 <dl>
    <dt>
        Type
    </dt>
    <dd>
 <span class="param-type">*</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#line54">line 54</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>
@@ -443,13 +683,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.6</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, utcDateModified, utcDateCreated)</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, utcDateModified, utcDateCreated)</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>
-<table class="params">
+
    <h5 class="subsection-title">Properties:</h5>
 <table class="props">
    <thead>
    <tr>
@@ -203,8 +208,6 @@
 <dl class="details">
@@ -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.6</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">(noteId, notePath, isDeleted, utcDateModified)</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">(noteId, notePath, isDeleted, utcDateModified)</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>
-<table class="params">
+
    <h5 class="subsection-title">Properties:</h5>
 <table class="props">
    <thead>
    <tr>
@@ -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.6</a>
 </footer>
 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_api_token.js.html
+++ b/docs/backend_api/entities_api_token.js.html
@@ -34,10 +34,10 @@ 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
+ * @property {string} apiTokenId - primary key
- * @param {string} token
+ * @property {string} token
- * @param {boolean} isDeleted - true if API token is deleted
+ * @property {boolean} isDeleted - true if API token is deleted
- * @param {string} utcDateCreated
+ * @property {string} utcDateCreated
 *
 * @extends Entity
 */
@@ -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.6</a>
 </footer>
 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_attribute.js.html
+++ b/docs/backend_api/entities_attribute.js.html
@@ -28,24 +28,26 @@
        <article>
            <pre class="prettyprint source linenums"><code>"use strict";
 const Entity = require('./entity');
 const repository = require('../services/repository');
 const dateUtils = require('../services/date_utils');
 const sql = require('../services/sql');
 const promotedAttributeDefinitionParser = require("../services/promoted_attribute_definition_parser");
 /**
 * Attribute is key value pair owned by a note.
 *
- * @param {string} attributeId
+ * @property {string} attributeId - immutable
- * @param {string} noteId
+ * @property {string} noteId - immutable
- * @param {string} type
+ * @property {string} type - immutable
- * @param {string} name
+ * @property {string} name - immutable
- * @param {string} value
+ * @property {string} value
- * @param {int} position
+ * @property {int} position
- * @param {boolean} isInheritable
+ * @property {boolean} isInheritable - immutable
- * @param {boolean} isDeleted
+ * @property {boolean} isDeleted
- * @param {string} utcDateCreated
+ * @property {string|null} deleteId - ID identifying delete transaction
- * @param {string} utcDateModified
+ * @property {string} utcDateCreated
 * @property {string} utcDateModified
 *
 * @extends Entity
 */
@@ -58,31 +60,19 @@ class Attribute extends Entity {
        super(row);
        this.isInheritable = !!this.isInheritable;
        if (this.isDefinition()) {
            try {
                this.value = JSON.parse(this.value);
            }
            catch (e) {
            }
        }
    }
    /**
-     * @returns {Promise&lt;Note|null>}
+     * @returns {Note|null}
     */
-    async getNote() {
+    getNote() {
-        if (!this.__note) {
+        return this.repository.getNote(this.noteId);
            this.__note = await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
        }
        return this.__note;
    }
    /**
-     * @returns {Promise&lt;Note|null>}
+     * @returns {Note|null}
     */
-    async getTargetNote() {
+    getTargetNote() {
        if (this.type !== 'relation') {
            throw new Error(`Attribute ${this.attributeId} is not relation`);
        }
@@ -91,28 +81,42 @@ class Attribute extends Entity {
            return null;
        }
-        if (!this.__targetNote) {
+        return this.repository.getNote(this.value);
            this.__targetNote = await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.value]);
        }
        return this.__targetNote;
    }
    /**
     * @return {boolean}
     */
    isDefinition() {
-        return this.type === 'label-definition' || this.type === 'relation-definition';
+        return this.type === 'label' &amp;&amp; (this.name.startsWith('label:') || this.name.startsWith('relation:'));
    }
-    async beforeSaving() {
+    getDefinition() {
        return promotedAttributeDefinitionParser.parse(this.value);
    }
    getDefinedName() {
        if (this.type === 'label' &amp;&amp; this.name.startsWith('label:')) {
            return this.name.substr(6);
        } else if (this.type === 'label' &amp;&amp; this.name.startsWith('relation:')) {
            return this.name.substr(9);
        } else {
            return this.name;
        }
    }
    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 = "";
        }
        if (this.position === undefined) {
-            this.position = 1 + await sql.getValue(`SELECT COALESCE(MAX(position), 0) FROM attributes WHERE noteId = ?`, [this.noteId]);
+            this.position = 1 + sql.getValue(`SELECT COALESCE(MAX(position), 0) FROM attributes WHERE noteId = ?`, [this.noteId]);
        }
        if (!this.isInheritable) {
@@ -134,13 +138,23 @@ class Attribute extends Entity {
        }
    }
-    // cannot be static!
+    createClone(type, name, value, isInheritable) {
-    updatePojo(pojo) {
+        return new Attribute({
-        delete pojo.isOwned;
+            noteId: this.noteId,
            type: type,
            name: name,
            value: value,
            position: this.position,
            isInheritable: isInheritable,
            isDeleted: false,
            utcDateCreated: this.utcDateCreated,
            utcDateModified: this.utcDateModified
        });
    }
 }
-module.exports = Attribute;</code></pre>
+module.exports = Attribute;
 </code></pre>
        </article>
    </section>
@@ -150,13 +164,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.6</a>
 </footer>
 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_branch.js.html
+++ b/docs/backend_api/entities_branch.js.html
@@ -30,22 +30,22 @@
 const Entity = require('./entity');
 const dateUtils = require('../services/date_utils');
 const repository = require('../services/repository');
 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
+ * @property {string} branchId - primary key, immutable
- * @param {string} noteId
+ * @property {string} noteId - immutable
- * @param {string} parentNoteId
+ * @property {string} parentNoteId - immutable
- * @param {int} notePosition
+ * @property {int} notePosition
- * @param {string} prefix
+ * @property {string} prefix
- * @param {boolean} isExpanded
+ * @property {boolean} isExpanded
- * @param {boolean} isDeleted
+ * @property {boolean} isDeleted
- * @param {string} utcDateModified
+ * @property {string|null} deleteId - ID identifying delete transaction
- * @param {string} utcDateCreated
+ * @property {string} utcDateModified
 * @property {string} utcDateCreated
 *
 * @extends Entity
 */
@@ -53,24 +53,26 @@ 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 = {}) {
+    /** @returns {Note|null} */
-        super(row);
+    getNote() {
-
+        return this.repository.getNote(this.noteId);
        // used to detect move in note tree
        this.origParentNoteId = this.parentNoteId;
    }
    /** @returns {Note|null} */
-    async getNote() {
+    getParentNote() {
-        return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
+        return this.repository.getNote(this.parentNoteId);
    }
-    async beforeSaving() {
+    beforeSaving() {
        if (this.notePosition === undefined) {
-            const maxNotePos = await sql.getValue('SELECT MAX(notePosition) FROM branches WHERE parentNoteId = ? AND isDeleted = 0', [this.parentNoteId]);
+            const maxNotePos = 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) {
@@ -88,13 +90,22 @@ class Branch extends Entity {
        }
    }
-    // cannot be static!
+    createClone(parentNoteId, notePosition) {
-    updatePojo(pojo) {
+        return new Branch({
-        delete pojo.origParentNoteId;
+            noteId: this.noteId,
            parentNoteId: parentNoteId,
            notePosition: notePosition,
            prefix: this.prefix,
            isExpanded: this.isExpanded,
            isDeleted: false,
            utcDateCreated: this.utcDateCreated,
            utcDateModified: this.utcDateModified
        });
    }
 }
-module.exports = Branch;</code></pre>
+module.exports = Branch;
 </code></pre>
        </article>
    </section>
@@ -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.6</a>
 </footer>
 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_entity.js.html
+++ b/docs/backend_api/entities_entity.js.html
@@ -29,6 +29,7 @@
            <pre class="prettyprint source linenums"><code>"use strict";
 const utils = require('../services/utils');
 let repo = null;
 class Entity {
    /**
@@ -53,14 +54,7 @@ class Entity {
        const origHash = this.hash;
        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() {
@@ -79,14 +73,23 @@ class Entity {
        return utils.hash(contentToHash).substr(0, 10);
    }
-    async save() {
+    get repository() {
-        await require('../services/repository').updateEntity(this);
+        if (!repo) {
            repo = require('../services/repository');
        }
        return repo;
    }
    save() {
        this.repository.updateEntity(this);
        return this;
    }
 }
-module.exports = Entity;</code></pre>
+module.exports = Entity;
 </code></pre>
        </article>
    </section>
@@ -96,13 +99,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.6</a>
 </footer>
 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_note.js.html
+++ b/docs/backend_api/entities_note.js.html
--- a/docs/backend_api/entities_note_revision.js.html
+++ b/docs/backend_api/entities_note_revision.js.html
@@ -30,54 +30,154 @@
 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 entityChangesService = require('../services/entity_changes.js');
 /**
 * 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
+ * @property {string} noteRevisionId
- * @param {string} noteId
+ * @property {string} noteId
- * @param {string} type
+ * @property {string} type
- * @param {string} mime
+ * @property {string} mime
- * @param {string} title
+ * @property {string} title
- * @param {string} content
+ * @property {boolean} isErased
- * @param {string} isProtected
+ * @property {boolean} isProtected
- * @param {string} dateModifiedFrom
+ * @property {string} dateLastEdited
- * @param {string} dateModifiedTo
+ * @property {string} dateCreated
- * @param {string} utcDateModifiedFrom
+ * @property {string} utcDateLastEdited
- * @param {string} utcDateModifiedTo
+ * @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", "utcDateModifiedFrom", "utcDateModifiedTo"]; }
+    static get hashedProperties() { return ["noteRevisionId", "noteId", "title", "isErased", "isProtected", "dateLastEdited", "dateCreated", "utcDateLastEdited", "utcDateCreated", "utcDateModified"]; }
    constructor(row) {
        super(row);
        this.isErased = !!this.isErased;
        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() {
+    getNote() {
-        return await repository.getEntity("SELECT * FROM notes WHERE noteId = ?", [this.noteId]);
+        return this.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 {*} */
    getContent(silentNotFoundError = false) {
        if (this.content === undefined) {
            const res = 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;
        }
    }
    setContent(content) {
        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.`);
            }
        }
        sql.upsert("note_revision_contents", "noteRevisionId", pojo);
        entityChangesService.addNoteRevisionContentEntityChange(this.noteRevisionId);
    }
    beforeSaving() {
-        if (this.isProtected) {
+        super.beforeSaving();
-            protectedSessionService.encryptNoteRevision(this);
+
        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;
    }
 }
-module.exports = NoteRevision;</code></pre>
+module.exports = NoteRevision;
 </code></pre>
        </article>
    </section>
@@ -87,13 +187,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.6</a>
 </footer>
 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_option.js.html
+++ b/docs/backend_api/entities_option.js.html
@@ -34,11 +34,11 @@ const dateUtils = require('../services/date_utils');
 /**
 * Option represents name-value pair, either directly configurable by the user or some system property.
 *
- * @param {string} name
+ * @property {string} name
- * @param {string} value
+ * @property {string} value
- * @param {boolean} isSynced
+ * @property {boolean} isSynced
- * @param {string} utcDateModified
+ * @property {string} utcDateModified
- * @param {string} utcDateCreated
+ * @property {string} utcDateCreated
 *
 * @extends Entity
 */
@@ -76,13 +76,13 @@ module.exports = Option;</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.6</a>
 </footer>
 <script> prettyPrint(); </script>
--- a/docs/backend_api/entities_recent_note.js.html
+++ b/docs/backend_api/entities_recent_note.js.html
@@ -34,10 +34,10 @@ const dateUtils = require('../services/date_utils');
 /**
 * RecentNote represents recently visited note.
 *
- * @param {string} noteId
+ * @property {string} noteId
- * @param {string} notePath
+ * @property {string} notePath
- * @param {boolean} isDeleted
+ * @property {boolean} isDeleted
- * @param {string} utcDateModified
+ * @property {string} utcDateModified
 *
 * @extends Entity
 */
@@ -69,13 +69,13 @@ module.exports = RecentNote;</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.6</a>
 </footer>
 <script> prettyPrint(); </script>
--- a/docs/backend_api/global.html
+++ b/docs/backend_api/global.html
@@ -102,6 +102,313 @@
 <h4 class="name" id="CreateNewNoteParams">CreateNewNoteParams</h4>
    <h5>Type:</h5>
    <ul>
        <li>
 <span class="param-type">object</span>
        </li>
    </ul>
    <h5 class="subsection-title">Properties:</h5>
 <table class="props">
    <thead>
    <tr>
        <th>Name</th>
        <th>Type</th>
        <th class="last">Description</th>
    </tr>
    </thead>
    <tbody>
        <tr>
                <td class="name"><code>parentNoteId</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
            <td class="description last">MANDATORY</td>
        </tr>
        <tr>
                <td class="name"><code>title</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
            <td class="description last">MANDATORY</td>
        </tr>
        <tr>
                <td class="name"><code>content</code></td>
            <td class="type">
 <span class="param-type">string</span>
 |
 <span class="param-type">buffer</span>
            </td>
            <td class="description last">MANDATORY</td>
        </tr>
        <tr>
                <td class="name"><code>type</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
            <td class="description last">text, code, file, image, search, book, relation-map - MANDATORY</td>
        </tr>
        <tr>
                <td class="name"><code>mime</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
            <td class="description last">value is derived from default mimes for type</td>
        </tr>
        <tr>
                <td class="name"><code>isProtected</code></td>
            <td class="type">
 <span class="param-type">boolean</span>
            </td>
            <td class="description last">default is false</td>
        </tr>
        <tr>
                <td class="name"><code>isExpanded</code></td>
            <td class="type">
 <span class="param-type">boolean</span>
            </td>
            <td class="description last">default is false</td>
        </tr>
        <tr>
                <td class="name"><code>prefix</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
            <td class="description last">default is empty string</td>
        </tr>
        <tr>
                <td class="name"><code>notePosition</code></td>
            <td class="type">
 <span class="param-type">int</span>
            </td>
            <td class="description last">default is last existing notePosition in a parent + 10</td>
        </tr>
    </tbody>
 </table>
 <dl class="details">
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line213">line 213</a>
    </li></ul></dd>
 </dl>
 <h4 class="name" id="CreateNoteAttribute">CreateNoteAttribute</h4>
@@ -272,7 +579,195 @@
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line173">line 173</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line174">line 174</a>
    </li></ul></dd>
 </dl>
 <h4 class="name" id="CreateNoteAttribute">CreateNoteAttribute</h4>
    <h5>Type:</h5>
    <ul>
        <li>
 <span class="param-type">object</span>
        </li>
    </ul>
    <h5 class="subsection-title">Properties:</h5>
 <table class="props">
    <thead>
    <tr>
        <th>Name</th>
        <th>Type</th>
        <th>Attributes</th>
        <th class="last">Description</th>
    </tr>
    </thead>
    <tbody>
        <tr>
                <td class="name"><code>type</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
                <td class="attributes">
                </td>
            <td class="description last">attribute type - label, relation etc.</td>
        </tr>
        <tr>
                <td class="name"><code>name</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
                <td class="attributes">
                </td>
            <td class="description last">attribute name</td>
        </tr>
        <tr>
                <td class="name"><code>value</code></td>
            <td class="type">
 <span class="param-type">string</span>
            </td>
                <td class="attributes">
                    &lt;optional><br>
                </td>
            <td class="description last">attribute value</td>
        </tr>
    </tbody>
 </table>
 <dl class="details">
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line234">line 234</a>
    </li></ul></dd>
@@ -558,7 +1053,7 @@
    <dt class="tag-source">Source:</dt>
    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line180">line 180</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line241">line 241</a>
    </li></ul></dd>
@@ -588,13 +1083,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.6</a>
 </footer>
 <script> prettyPrint(); </script>
--- a/Show More
+++ b/Show More
		`@@ -0,0 +1,3 @@`
							`# These are supported funding model platforms`

							`github: [zadam]`
		`@@ -1,2 +0,0 @@`
			`#n:main`
			`!<md> [0, 0, null, null, -2147483648, -2147483648]`
		`@@ -1,3 +0,0 @@`
			`#!/usr/bin/env bash`

			`./node_modules/.bin/electron-rebuild --arch=x64`
		`@@ -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);`
		`@@ -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);`
		`@@ -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);`
		`@@ -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);`
		`@@ -0,0 +1,2 @@`
							`UPDATE branches SET notePosition = notePosition * 10;`
							`UPDATE attributes SET position = position * 10;`
		`@@ -0,0 +1 @@`
							`UPDATE notes SET contentLength = COALESCE((SELECT COALESCE(LENGTH(content), 0) FROM note_contents WHERE note_contents.noteId = notes.noteId), -1);`
		`@@ -0,0 +1,2 @@`
							`UPDATE attributes SET type = 'label', name = 'label:' \|\| name WHERE type = 'label-definition';`
							`UPDATE attributes SET type = 'label', name = 'relation:' \|\| name WHERE type = 'relation-definition';`