From 41a36e2e1877b4a2ab6751c011e80582f8ccbcf2 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Wed, 23 May 2018 01:14:52 +0200
Subject: [PATCH 01/74] Add privacy and ToS links

To be GDPR compliant we need to provide privacy statement. These should
be linked on the index page. So as soon as a document exist under
`public/docs/privacy.md` the link will show up.

Since we already add legal links, we also add Terms of Use, which will
show up as soon as `public/docs/terms-of-use.md` exists.

This should allow everyone to provide the legal documents they need for
GDPR and other privacy and business laws.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 lib/response.js             | 5 ++++-
 locales/en.json             | 6 ++++--
 public/views/index/body.ejs | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/response.js b/lib/response.js
index ae3e45f..2ea2f1c 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -2,6 +2,7 @@
 // response
 // external modules
 var fs = require('fs')
+var path = require('path')
 var markdownpdf = require('markdown-pdf')
 var shortId = require('shortid')
 var querystring = require('querystring')
@@ -75,7 +76,9 @@ function showIndex (req, res, next) {
     allowPDFExport: config.allowPDFExport,
     signin: req.isAuthenticated(),
     infoMessage: req.flash('info'),
-    errorMessage: req.flash('error')
+    errorMessage: req.flash('error'),
+    privacyStatement: fs.existsSync(path.join(config.docsPath, 'privacy.md')),
+    termsOfUse: fs.existsSync(path.join(config.docsPath, 'terms-of-use.md'))
   })
 }
 
diff --git a/locales/en.json b/locales/en.json
index 1aef3f6..b19089e 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -105,5 +105,7 @@
 	"Export to Snippet": "Export to Snippet",
 	"Select Visibility Level": "Select Visibility Level",
 	"Night Theme": "Night Theme",
-	"Follow us on %s and %s.": "Follow us on %s, and %s."
-}
+	"Follow us on %s and %s.": "Follow us on %s, and %s.",
+	"Privacy": "Privacy",
+	"Terms of Use": "Terms of Use"
+}
\ No newline at end of file
diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs
index d8766fe..e3a3a85 100644
--- a/public/views/index/body.ejs
+++ b/public/views/index/body.ejs
@@ -147,7 +147,7 @@
                         <option value="da">dansk</option>
                     </select>
                     <p>
-                        &copy; 2018 <a href="https://hackmd.io">HackMD</a> | <a href="<%- url %>/s/release-notes" target="_blank"><%= __('Releases') %></a>
+                        &copy; 2018 <a href="https://hackmd.io">HackMD</a> | <a href="<%- url %>/s/release-notes" target="_blank"><%= __('Releases') %></a><% if(privacyStatement) { %> | <a href="<%- url %>/s/privacy" target="_blank"><%= __('Privacy') %></a><% } %><% if(termsOfUse) { %> | <a href="<%- url %>/s/terms-of-use" target="_blank"><%= __('Terms of Use') %></a><% } %>
                     </p>
                     <h6 class="social-foot">
                         <%- __('Follow us on %s and %s.', '<a href="https://github.com/hackmdio/HackMD" target="_blank"><i class="fa fa-github"></i> GitHub</a>, <a href="https://twitter.com/hackmdio" target="_blank"><i class="fa fa-twitter"></i> Twitter</a>', '<a href="https://www.facebook.com/hackmdio" target="_blank"><i class="fa fa-facebook-square"></i> Facebook</a>') %>

From 8aa5c03213fb8809c4d41f95ee6b8d8e2967812a Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 25 May 2018 14:50:31 +0200
Subject: [PATCH 02/74] Use hard delete instead of soft delete

Right now we only flag notes as deleted. This is no longer allowed under
GDPR. Make sure you do regular backups!

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 lib/models/note.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/models/note.js b/lib/models/note.js
index 2a048e3..7b9a909 100644
--- a/lib/models/note.js
+++ b/lib/models/note.js
@@ -85,7 +85,7 @@ module.exports = function (sequelize, DataTypes) {
       type: DataTypes.DATE
     }
   }, {
-    paranoid: true,
+    paranoid: false,
     classMethods: {
       associate: function (models) {
         Note.belongsTo(models.User, {

From 408ab7ae1dfa5d1c7dedb2f9fde239596520b2e6 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 25 May 2018 14:54:00 +0200
Subject: [PATCH 03/74] Use cascaded deletes

When we delete a user we should delete all the notes that belong to this
user including the revisions of these notes.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 lib/models/author.js   | 8 ++++++--
 lib/models/note.js     | 4 +++-
 lib/models/revision.js | 4 +++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/models/author.js b/lib/models/author.js
index 8b4f74e..03f832a 100644
--- a/lib/models/author.js
+++ b/lib/models/author.js
@@ -24,12 +24,16 @@ module.exports = function (sequelize, DataTypes) {
         Author.belongsTo(models.Note, {
           foreignKey: 'noteId',
           as: 'note',
-          constraints: false
+          constraints: false,
+          onDelete: 'CASCADE',
+          hooks: true
         })
         Author.belongsTo(models.User, {
           foreignKey: 'userId',
           as: 'user',
-          constraints: false
+          constraints: false,
+          onDelete: 'CASCADE',
+          hooks: true
         })
       }
     }
diff --git a/lib/models/note.js b/lib/models/note.js
index 7b9a909..7d8e962 100644
--- a/lib/models/note.js
+++ b/lib/models/note.js
@@ -91,7 +91,9 @@ module.exports = function (sequelize, DataTypes) {
         Note.belongsTo(models.User, {
           foreignKey: 'ownerId',
           as: 'owner',
-          constraints: false
+          constraints: false,
+          onDelete: 'CASCADE',
+          hooks: true
         })
         Note.belongsTo(models.User, {
           foreignKey: 'lastchangeuserId',
diff --git a/lib/models/revision.js b/lib/models/revision.js
index 9ecd14d..8bc95cb 100644
--- a/lib/models/revision.js
+++ b/lib/models/revision.js
@@ -102,7 +102,9 @@ module.exports = function (sequelize, DataTypes) {
         Revision.belongsTo(models.Note, {
           foreignKey: 'noteId',
           as: 'note',
-          constraints: false
+          constraints: false,
+          onDelete: 'CASCADE',
+          hooks: true
         })
       },
       getNoteRevisions: function (note, callback) {

From 4229084c6211db3d22cd9abec99b957725650b9e Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 25 May 2018 15:20:38 +0200
Subject: [PATCH 04/74] Add delete function for authenticated users

Allow users to delete themselbes. This is require to be GDPR compliant.

See: https://gdpr-info.eu/art-17-gdpr/
Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 lib/web/userRouter.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/lib/web/userRouter.js b/lib/web/userRouter.js
index 963961c..b8bd915 100644
--- a/lib/web/userRouter.js
+++ b/lib/web/userRouter.js
@@ -3,6 +3,7 @@
 const Router = require('express').Router
 
 const response = require('../response')
+const config = require('../config')
 const models = require('../models')
 const logger = require('../logger')
 const {generateAvatar} = require('../letter-avatars')
@@ -36,6 +37,29 @@ UserRouter.get('/me', function (req, res) {
   }
 })
 
+// delete the currently authenticated user
+UserRouter.get('/me/delete', function (req, res) {
+  if (req.isAuthenticated()) {
+    models.User.findOne({
+      where: {
+        id: req.user.id
+      }
+    }).then(function (user) {
+      if (!user) { return response.errorNotFound(res) }
+      user.destroy().then(function () {
+        res.redirect(config.serverURL + '/')
+      })
+    }).catch(function (err) {
+      logger.error('delete user failed: ' + err)
+      return response.errorInternalError(res)
+    })
+  } else {
+    res.send({
+      status: 'forbidden'
+    })
+  }
+})
+
 UserRouter.get('/user/:username/avatar.svg', function (req, res, next) {
   res.setHeader('Content-Type', 'image/svg+xml')
   res.setHeader('Cache-Control', 'public, max-age=86400')

From e31d204d747c6db0b39288fa55269e8a3311525c Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 25 May 2018 16:15:10 +0200
Subject: [PATCH 05/74] Fix requests for deleted users

When users are requested from the authorship which no longer exist, they
shouldn't cause a 500.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 lib/models/user.js |  3 +++
 lib/realtime.js    | 12 +++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/models/user.js b/lib/models/user.js
index 4c82335..62ed5cc 100644
--- a/lib/models/user.js
+++ b/lib/models/user.js
@@ -66,6 +66,9 @@ module.exports = function (sequelize, DataTypes) {
         })
       },
       getProfile: function (user) {
+        if (!user) {
+          return null
+        }
         return user.profile ? User.parseProfile(user.profile) : (user.email ? User.parseProfileByEmail(user.email) : null)
       },
       parseProfile: function (profile) {
diff --git a/lib/realtime.js b/lib/realtime.js
index 070bde2..f6c62d4 100644
--- a/lib/realtime.js
+++ b/lib/realtime.js
@@ -486,11 +486,13 @@ function startConnection (socket) {
       for (var i = 0; i < note.authors.length; i++) {
         var author = note.authors[i]
         var profile = models.User.getProfile(author.user)
-        authors[author.userId] = {
-          userid: author.userId,
-          color: author.color,
-          photo: profile.photo,
-          name: profile.name
+        if (profile) {
+          authors[author.userId] = {
+            userid: author.userId,
+            color: author.color,
+            photo: profile.photo,
+            name: profile.name
+          }
         }
       }
 

From 9fd09a8dfb8c59a44e9b2b51658e9e638a855635 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 25 May 2018 17:03:35 +0200
Subject: [PATCH 06/74] Add delete user UI

This provides the UI for the delete user feature introduced in
4229084c6211db3d22cd9abec99b957725650b9e

Placing of the user delete button is not perfect, but can be moved to an
own user tab later on.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 locales/en.json             |  7 +++++--
 public/js/cover.js          | 20 ++++++++++++--------
 public/views/index/body.ejs | 33 +++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/locales/en.json b/locales/en.json
index b19089e..8b2574a 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -107,5 +107,8 @@
 	"Night Theme": "Night Theme",
 	"Follow us on %s and %s.": "Follow us on %s, and %s.",
 	"Privacy": "Privacy",
-	"Terms of Use": "Terms of Use"
-}
\ No newline at end of file
+	"Terms of Use": "Terms of Use",
+	"Do you really want to delete your user account?": "Do you really want to delete your user account?",
+	"This will delete your account, all notes that are owned by you and remove all references to your account from other notes.": "This will delete your account, all notes that are owned by you and remove all references to your account from other notes.",
+	"Delete user": "Delete user"
+}
diff --git a/public/js/cover.js b/public/js/cover.js
index c9c2b6c..2a09b4c 100644
--- a/public/js/cover.js
+++ b/public/js/cover.js
@@ -39,7 +39,7 @@ const options = {
             '<a href="#">' +
                 '<div class="item">' +
                     '<div class="ui-history-pin fa fa-thumb-tack fa-fw"></div>' +
-                    '<div class="ui-history-close fa fa-close fa-fw" data-toggle="modal" data-target=".delete-modal"></div>' +
+                    '<div class="ui-history-close fa fa-close fa-fw" data-toggle="modal" data-target=".delete-history-modal"></div>' +
                     '<div class="content">' +
                         '<h4 class="text"></h4>' +
                         '<p>' +
@@ -208,8 +208,8 @@ function historyCloseClick (e) {
   e.preventDefault()
   const id = $(this).closest('a').siblings('span').html()
   const value = historyList.get('id', id)[0]._values
-  $('.ui-delete-modal-msg').text('Do you really want to delete below history?')
-  $('.ui-delete-modal-item').html(`<i class="fa fa-file-text"></i> ${value.text}<br><i class="fa fa-clock-o"></i> ${value.time}`)
+  $('.ui-delete-history-modal-msg').text('Do you really want to delete below history?')
+  $('.ui-delete-history-modal-item').html(`<i class="fa fa-file-text"></i> ${value.text}<br><i class="fa fa-clock-o"></i> ${value.time}`)
   clearHistory = false
   deleteId = id
 }
@@ -277,7 +277,7 @@ function deleteHistory () {
           checkHistoryList()
         }
       }
-      $('.delete-modal').modal('hide')
+      $('.delete-history-modal').modal('hide')
       deleteId = null
       clearHistory = false
     })
@@ -297,12 +297,12 @@ function deleteHistory () {
         deleteId = null
       })
     }
-    $('.delete-modal').modal('hide')
+    $('.delete-history-modal').modal('hide')
     clearHistory = false
   })
 }
 
-$('.ui-delete-modal-confirm').click(() => {
+$('.ui-delete-history-modal-confirm').click(() => {
   deleteHistory()
 })
 
@@ -342,8 +342,8 @@ $('.ui-open-history').bind('change', e => {
 })
 
 $('.ui-clear-history').click(() => {
-  $('.ui-delete-modal-msg').text('Do you really want to clear all history?')
-  $('.ui-delete-modal-item').html('There is no turning back.')
+  $('.ui-delete-history-modal-msg').text('Do you really want to clear all history?')
+  $('.ui-delete-history-modal-item').html('There is no turning back.')
   clearHistory = true
   deleteId = null
 })
@@ -371,6 +371,10 @@ $('.ui-refresh-history').click(() => {
   })
 })
 
+$('.ui-delete-user-modal-cancel').click(() => {
+  $('.ui-delete-user').parent().removeClass('active')
+})
+
 $('.ui-logout').click(() => {
   clearLoginState()
   location.href = `${serverurl}/logout`
diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs
index e3a3a85..d435054 100644
--- a/public/views/index/body.ejs
+++ b/public/views/index/body.ejs
@@ -27,6 +27,7 @@
                                     </button>
                                     <ul class="dropdown-menu" aria-labelledby="profileLabel">
                                         <li><a href="<%- url %>/features"><i class="fa fa-dot-circle-o fa-fw"></i> <%= __('Features') %></a></li>
+                                        <li><a class="ui-delete-user" data-toggle="modal" data-target=".delete-user-modal"><i class="fa fa-trash fa-fw"></i> <%= __('Delete user') %></a></li>
                                         <li><a href="<%- url %>/logout"><i class="fa fa-sign-out fa-fw"></i> <%= __('Sign Out') %></a></li>
                                     </ul>
                                 </span>
@@ -108,7 +109,7 @@
                         <span class="btn btn-default btn-file ui-open-history" title="<%= __('Import history') %>">
                             <i class="fa fa-folder-open-o"></i><input type="file" />
                         </span>
-                    <a href="#" class="btn btn-default ui-clear-history" title="<%= __('Clear history') %>" data-toggle="modal" data-target=".delete-modal"><i class="fa fa-trash-o"></i></a>
+                    <a href="#" class="btn btn-default ui-clear-history" title="<%= __('Clear history') %>" data-toggle="modal" data-target=".delete-history-modal"><i class="fa fa-trash-o"></i></a>
                     </span>
                     <a href="#" class="btn btn-default ui-refresh-history" title="<%= __('Refresh history') %>"><i class="fa fa-refresh"></i></a>
                 </form>
@@ -157,8 +158,8 @@
         </div>
     </div>
 </div>
-<!-- delete modal -->
-<div class="modal fade delete-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<!-- delete history modal -->
+<div class="modal fade delete-history-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-sm">
         <div class="modal-content">
             <div class="modal-header">
@@ -167,12 +168,32 @@
                 <h4 class="modal-title" id="myModalLabel"><%= __('Are you sure?') %></h4>
             </div>
             <div class="modal-body" style="color:black;">
-                <h5 class="ui-delete-modal-msg"></h5>
-                <strong class="ui-delete-modal-item"></strong>
+                <h5 class="ui-delete-history-modal-msg"></h5>
+                <strong class="ui-delete-history-modal-item"></strong>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal"><%= __('Cancel') %></button>
-                <button type="button" class="btn btn-danger ui-delete-modal-confirm"><%= __('Yes, do it!') %></button>
+                <button type="button" class="btn btn-danger ui-delete-history-modal-confirm"><%= __('Yes, do it!') %></button>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- delete user modal -->
+<div class="modal fade delete-user-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-sm">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title" id="myModalLabel"><%= __('Are you sure?') %></h4>
+            </div>
+            <div class="modal-body" style="color:black;">
+                <h5 class="ui-delete-user-modal-msg"><%= __('Do you really want to delete your user account?') %></h5>
+                <strong class="ui-delete-user-modal-item"><%= __('This will delete your account, all notes that are owned by you and remove all references to your account from other notes.') %></strong>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default ui-delete-user-modal-cancel" data-dismiss="modal"><%= __('Cancel') %></button>
+                <a type="button" class="btn btn-danger" href="<%- url %>/me/delete"><%= __('Yes, do it!') %></a>
             </div>
         </div>
     </div>

From 70df29790a83db4abb40ed1e16cb05a3aa760672 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 25 May 2018 18:19:31 +0200
Subject: [PATCH 07/74] Add token based security feature

In the current setup users could be tricked into deleting their data by
providing a malicious link like `[click me](/me/delete)`. This commit
prevents such an easy attack and need the user's deleteToken to get his
data deleted. In case someone requests his deletion by email you can
also ask him for this token.

We can add a GUI that shows it later on.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 .../20180525153000-user-add-delete-token.js   | 13 +++++++++
 lib/models/user.js                            |  4 +++
 lib/response.js                               | 27 ++++++++++++++++---
 lib/web/userRouter.js                         | 20 ++++++++------
 public/views/index/body.ejs                   |  2 +-
 5 files changed, 53 insertions(+), 13 deletions(-)
 create mode 100644 lib/migrations/20180525153000-user-add-delete-token.js

diff --git a/lib/migrations/20180525153000-user-add-delete-token.js b/lib/migrations/20180525153000-user-add-delete-token.js
new file mode 100644
index 0000000..642fa5d
--- /dev/null
+++ b/lib/migrations/20180525153000-user-add-delete-token.js
@@ -0,0 +1,13 @@
+'use strict'
+module.exports = {
+  up: function (queryInterface, Sequelize) {
+    return queryInterface.addColumn('Users', 'deleteToken', {
+      type: Sequelize.UUID,
+      defaultValue: Sequelize.UUIDV4
+    })
+  },
+
+  down: function (queryInterface, Sequelize) {
+    return queryInterface.removeColumn('Users', 'deleteToken')
+  }
+}
diff --git a/lib/models/user.js b/lib/models/user.js
index 62ed5cc..019aab7 100644
--- a/lib/models/user.js
+++ b/lib/models/user.js
@@ -31,6 +31,10 @@ module.exports = function (sequelize, DataTypes) {
     refreshToken: {
       type: DataTypes.STRING
     },
+    deleteToken: {
+      type: DataTypes.UUID,
+      defaultValue: Sequelize.UUIDV4
+    },
     email: {
       type: Sequelize.TEXT,
       validate: {
diff --git a/lib/response.js b/lib/response.js
index 2ea2f1c..b1b89c7 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -56,7 +56,10 @@ function responseError (res, code, detail, msg) {
 }
 
 function showIndex (req, res, next) {
-  res.render(config.indexPath, {
+  var authStatus = req.isAuthenticated()
+  var deleteToken = ''
+
+  var data = {
     url: config.serverURL,
     useCDN: config.useCDN,
     allowAnonymous: config.allowAnonymous,
@@ -74,12 +77,28 @@ function showIndex (req, res, next) {
     email: config.isEmailEnable,
     allowEmailRegister: config.allowEmailRegister,
     allowPDFExport: config.allowPDFExport,
-    signin: req.isAuthenticated(),
+    signin: authStatus,
     infoMessage: req.flash('info'),
     errorMessage: req.flash('error'),
     privacyStatement: fs.existsSync(path.join(config.docsPath, 'privacy.md')),
-    termsOfUse: fs.existsSync(path.join(config.docsPath, 'terms-of-use.md'))
-  })
+    termsOfUse: fs.existsSync(path.join(config.docsPath, 'terms-of-use.md')),
+    deleteToken: deleteToken
+  }
+
+  if (authStatus) {
+    models.User.findOne({
+      where: {
+        id: req.user.id
+      }
+    }).then(function (user) {
+      if (user) {
+        data.deleteToken = user.deleteToken
+        res.render(config.indexPath, data)
+      }
+    })
+  } else {
+    res.render(config.indexPath, data)
+  }
 }
 
 function responseHackMD (res, note) {
diff --git a/lib/web/userRouter.js b/lib/web/userRouter.js
index b8bd915..6832d90 100644
--- a/lib/web/userRouter.js
+++ b/lib/web/userRouter.js
@@ -38,25 +38,29 @@ UserRouter.get('/me', function (req, res) {
 })
 
 // delete the currently authenticated user
-UserRouter.get('/me/delete', function (req, res) {
+UserRouter.get('/me/delete/:token?', function (req, res) {
   if (req.isAuthenticated()) {
     models.User.findOne({
       where: {
         id: req.user.id
       }
     }).then(function (user) {
-      if (!user) { return response.errorNotFound(res) }
-      user.destroy().then(function () {
-        res.redirect(config.serverURL + '/')
-      })
+      if (!user) {
+        return response.errorNotFound(res)
+      }
+      if (user.deleteToken === req.params.token) {
+        user.destroy().then(function () {
+          res.redirect(config.serverURL + '/')
+        })
+      } else {
+        return response.errorForbidden(res)
+      }
     }).catch(function (err) {
       logger.error('delete user failed: ' + err)
       return response.errorInternalError(res)
     })
   } else {
-    res.send({
-      status: 'forbidden'
-    })
+    return response.errorForbidden(res)
   }
 })
 
diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs
index d435054..f28ab11 100644
--- a/public/views/index/body.ejs
+++ b/public/views/index/body.ejs
@@ -193,7 +193,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default ui-delete-user-modal-cancel" data-dismiss="modal"><%= __('Cancel') %></button>
-                <a type="button" class="btn btn-danger" href="<%- url %>/me/delete"><%= __('Yes, do it!') %></a>
+                <a type="button" class="btn btn-danger" href="<%- url %>/me/delete/<%- deleteToken %>"><%= __('Yes, do it!') %></a>
             </div>
         </div>
     </div>

From bcbb8c67c9f8092643c318140f6613324f306bd2 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 26 May 2018 02:53:21 +0200
Subject: [PATCH 08/74] Add note export function

This function is the first step to get out data following GDPR about the
transportability of data.

Details: https://gdpr-info.eu/art-20-gdpr/
Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 lib/web/userRouter.js | 56 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/lib/web/userRouter.js b/lib/web/userRouter.js
index 6832d90..db786d5 100644
--- a/lib/web/userRouter.js
+++ b/lib/web/userRouter.js
@@ -1,5 +1,7 @@
 'use strict'
 
+const archiver = require('archiver')
+const async = require('async')
 const Router = require('express').Router
 
 const response = require('../response')
@@ -64,6 +66,60 @@ UserRouter.get('/me/delete/:token?', function (req, res) {
   }
 })
 
+// export the data of the authenticated user
+UserRouter.get('/me/export', function (req, res) {
+  if (req.isAuthenticated()) {
+    // let output = fs.createWriteStream(__dirname + '/example.zip');
+    let archive = archiver('zip', {
+      zlib: { level: 3 } // Sets the compression level.
+    })
+    res.setHeader('Content-Type', 'application/zip')
+    res.attachment('archive.zip')
+    archive.pipe(res)
+    archive.on('error', function (err) {
+      logger.error('export user data failed: ' + err)
+      return response.errorInternalError(res)
+    })
+    models.User.findOne({
+      where: {
+        id: req.user.id
+      }
+    }).then(function (user) {
+      models.Note.findAll({
+        where: {
+          ownerId: user.id
+        }
+      }).then(function (notes) {
+        let list = []
+        async.each(notes, function (note, callback) {
+          let title
+          let extension = ''
+          do {
+            title = note.title + extension
+            extension++
+          } while (list.indexOf(title) !== -1)
+
+          list.push(title)
+          logger.debug('Write: ' + title + '.md')
+          archive.append(Buffer.from(note.content), { name: title + '.md', date: note.lastchangeAt })
+          callback(null, null)
+        }, function (err) {
+          if (err) {
+            return response.errorInternalError(res)
+          }
+
+          archive.finalize()
+        })
+      })
+    }).catch(function (err) {
+      logger.error('export user data failed: ' + err)
+      return response.errorInternalError(res)
+    })
+  } else {
+    return response.errorForbidden(res)
+  }
+})
+
 UserRouter.get('/user/:username/avatar.svg', function (req, res, next) {
   res.setHeader('Content-Type', 'image/svg+xml')
   res.setHeader('Cache-Control', 'public, max-age=86400')

From 75f28ca7f3600ab6483f38ad47a0c8430858f5c3 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 26 May 2018 03:19:10 +0200
Subject: [PATCH 09/74] Add export data UI

This adds the UI for the export feature introduced in
bcbb8c67c9f8092643c318140f6613324f306bd2

It allows to download all notes from the main page in the default user
submenu.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 locales/en.json             | 3 ++-
 public/views/index/body.ejs | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/locales/en.json b/locales/en.json
index 8b2574a..f9c29b5 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -110,5 +110,6 @@
 	"Terms of Use": "Terms of Use",
 	"Do you really want to delete your user account?": "Do you really want to delete your user account?",
 	"This will delete your account, all notes that are owned by you and remove all references to your account from other notes.": "This will delete your account, all notes that are owned by you and remove all references to your account from other notes.",
-	"Delete user": "Delete user"
+	"Delete user": "Delete user",
+	"Export user data": "Export user data"
 }
diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs
index f28ab11..a7c5a0b 100644
--- a/public/views/index/body.ejs
+++ b/public/views/index/body.ejs
@@ -27,6 +27,7 @@
                                     </button>
                                     <ul class="dropdown-menu" aria-labelledby="profileLabel">
                                         <li><a href="<%- url %>/features"><i class="fa fa-dot-circle-o fa-fw"></i> <%= __('Features') %></a></li>
+                                        <li><a href="<%- url %>/me/export"><i class="fa fa-cloud-download fa-fw"></i> <%= __('Export user data') %></a></li>
                                         <li><a class="ui-delete-user" data-toggle="modal" data-target=".delete-user-modal"><i class="fa fa-trash fa-fw"></i> <%= __('Delete user') %></a></li>
                                         <li><a href="<%- url %>/logout"><i class="fa fa-sign-out fa-fw"></i> <%= __('Sign Out') %></a></li>
                                     </ul>

From 6f8bd8fdc90bf6e6f77591a28031edae4e58ceed Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 27 May 2018 15:28:09 +0200
Subject: [PATCH 10/74] Fix missing dependency

To export the notes we need the archiver package that takes care of
creating the zip files.

Looks like I forgot this one in the initial commit.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 1d96de8..f676a4c 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
   },
   "dependencies": {
     "Idle.Js": "git+https://github.com/shawnmclean/Idle.js",
+    "archiver": "^2.1.1",
     "async": "^2.1.4",
     "aws-sdk": "^2.7.20",
     "base64url": "^3.0.0",

From fce735e833f91a0f1d17c518b65c4c724d1a4b4d Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Mon, 28 May 2018 09:26:21 +0200
Subject: [PATCH 11/74] Add privacy policy example

As we use various services and integration we should provide an example
privacy policy.

It has to be adjust when using it to match your setup.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 public/docs/privacy.md.example | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 public/docs/privacy.md.example

diff --git a/public/docs/privacy.md.example b/public/docs/privacy.md.example
new file mode 100644
index 0000000..08bf909
--- /dev/null
+++ b/public/docs/privacy.md.example
@@ -0,0 +1,17 @@
+Privacy
+===
+
+We process the following data, for the following purposes:
+
+|your data|our usage|
+|---------|---------|
+|IP-Address|Used to communicate with your browser and our servers. It's may exposed to third-parties which provide resources for this service. These services are, depending on your login method, the document you visit and the setup of this instance: Google, Disqus, MathJax, GitHub, SlideShare/LinkedIn, yahoo, Gravatar, Imgur, Amazon, and Cloudflare.|
+|Usernames and profiles|Your username as well as user profiles that are connected with it are transmitted and stored by us to provide a useful login integration with services like GitHub, Facebook, Twitter, GitLab, Dropbox, Google. Depending on the setup of this HackMD instance there are maybe other third-parties involved using SAML, LDAP or the integration with a Mattermost instance.|
+|Profile pictures| Your profile picture is either loaded from the service you used to login, the HackMD instance or Gravatar.|
+|Uploaded pictures| Pictures that are uploaded for documents are either uploaded to Amazon S3, Imgur, a minio instance or the local filesystem of the HackMD server.|
+
+All account data and notes are stored in a mysql/postgres/sqlite database. Besides the user accounts and the document themselves also relationships between the documents and the user accounts are stored. This includes ownership, authorship and revisions of all changes made during the creation of a note.
+
+To delete your account and all your notes owned by your user account, you can find a button in the drop down menu on the front page.
+
+The deletion of guest notes is not possible. These don't have any ownership and this means we can't connect these to you or anyone else. If you participated in a guest note or a note owned by someone else, your authorship for the revisions is removed from these notes as well. But the content you created will stay in place as the integrity of these notes has to stay untouched.

From 4fcefebe5c968aaed6c770896ce90e2a62992aab Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 17 Jun 2018 23:36:22 +0200
Subject: [PATCH 12/74] Update yarn.lock

---
 yarn.lock | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 137 insertions(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index e6a9c70..8bacf95 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -160,6 +160,30 @@ aproba@^1.0.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
 
+archiver-utils@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-1.3.0.tgz#e50b4c09c70bf3d680e32ff1b7994e9f9d895174"
+  dependencies:
+    glob "^7.0.0"
+    graceful-fs "^4.1.0"
+    lazystream "^1.0.0"
+    lodash "^4.8.0"
+    normalize-path "^2.0.0"
+    readable-stream "^2.0.0"
+
+archiver@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/archiver/-/archiver-2.1.1.tgz#ff662b4a78201494a3ee544d3a33fe7496509ebc"
+  dependencies:
+    archiver-utils "^1.3.0"
+    async "^2.0.0"
+    buffer-crc32 "^0.2.1"
+    glob "^7.0.0"
+    lodash "^4.8.0"
+    readable-stream "^2.0.0"
+    tar-stream "^1.5.0"
+    zip-stream "^1.2.0"
+
 archy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
@@ -289,6 +313,12 @@ async@^1.3.0, async@^1.4.0, async@^1.5.0, async@^1.5.2, async@~1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
+async@^2.0.0:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+  dependencies:
+    lodash "^4.17.10"
+
 async@^2.1.4:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
@@ -1031,6 +1061,25 @@ buble@^0.15.0:
     minimist "^1.2.0"
     os-homedir "^1.0.1"
 
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+
+buffer-alloc@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
+buffer-crc32@^0.2.1:
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+
 buffer-writer@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-1.0.1.tgz#22a936901e3029afcd7547eb4487ceb697a3bf08"
@@ -1411,6 +1460,15 @@ component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
 
+compress-commons@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz#524a9f10903f3a813389b0225d27c48bb751890f"
+  dependencies:
+    buffer-crc32 "^0.2.1"
+    crc32-stream "^2.0.0"
+    normalize-path "^2.0.0"
+    readable-stream "^2.0.0"
+
 compressible@~2.0.11:
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.11.tgz#16718a75de283ed8e604041625a2064586797d8a"
@@ -1544,10 +1602,21 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
+crc32-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
+  dependencies:
+    crc "^3.4.4"
+    readable-stream "^2.0.0"
+
 crc@3.4.4:
   version "3.4.4"
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.4.4.tgz#9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"
 
+crc@^3.4.4:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/crc/-/crc-3.5.0.tgz#98b8ba7d489665ba3979f59b21381374101a1964"
+
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -2051,6 +2120,12 @@ encodeurl@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
 
+end-of-stream@^1.0.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  dependencies:
+    once "^1.4.0"
+
 end-of-stream@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf"
@@ -2777,6 +2852,10 @@ fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
 
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+
 fs-exists-sync@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
@@ -3031,7 +3110,7 @@ good-listener@^1.2.2:
   dependencies:
     delegate "^3.1.2"
 
-graceful-fs@*, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+graceful-fs@*, graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
@@ -4063,6 +4142,12 @@ lazy-cache@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
 
+lazystream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
+  dependencies:
+    readable-stream "^2.0.5"
+
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
@@ -4365,6 +4450,10 @@ lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.14.2, lodash@^4.17.0, l
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
+lodash@^4.17.10, lodash@^4.8.0:
+  version "4.17.10"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
+
 lodash@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
@@ -5868,6 +5957,10 @@ process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
 
+process-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+
 process@^0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
@@ -6074,6 +6167,18 @@ readable-stream@2.3.3, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
+readable-stream@^2.0.0, readable-stream@^2.3.0:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
 readable-stream@~2.0.0:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
@@ -6893,6 +6998,12 @@ string_decoder@~1.0.3:
   dependencies:
     safe-buffer "~5.1.0"
 
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  dependencies:
+    safe-buffer "~5.1.0"
+
 stringify-entities@^1.0.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-1.3.1.tgz#b150ec2d72ac4c1b5f324b51fb6b28c9cdff058c"
@@ -7045,6 +7156,18 @@ tar-pack@^3.4.0:
     tar "^2.2.1"
     uid-number "^0.0.6"
 
+tar-stream@^1.5.0:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.1.tgz#f84ef1696269d6223ca48f6e1eeede3f7e81f395"
+  dependencies:
+    bl "^1.0.0"
+    buffer-alloc "^1.1.0"
+    end-of-stream "^1.0.0"
+    fs-constants "^1.0.0"
+    readable-stream "^2.3.0"
+    to-buffer "^1.1.0"
+    xtend "^4.0.0"
+
 tar@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
@@ -7163,6 +7286,10 @@ to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
 
+to-buffer@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
+
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
@@ -7941,3 +8068,12 @@ yauzl@2.4.1:
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
+
+zip-stream@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"
+  dependencies:
+    archiver-utils "^1.3.0"
+    compress-commons "^1.2.0"
+    lodash "^4.8.0"
+    readable-stream "^2.0.0"

From 6ffe8875bf4fe4106e3707426ec7304d441b27f9 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 17 Jun 2018 23:05:13 +0200
Subject: [PATCH 13/74] Add K8s note in README

We have an official K8s chart for helm out there but probably no one
knows about it. Let's advertise it a bit!

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index ba04182..893e68e 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ Thanks for using! :smile:
     - [Prerequisite](#prerequisite)
     - [Instructions](#instructions)
   - [Heroku Deployment](#heroku-deployment)
+  - [Kubernetes](#kubernetes)
   - [HackMD by docker container](#hackmd-by-docker-container)
 - [Upgrade](#upgrade)
   - [Native setup](#native-setup)
@@ -78,6 +79,12 @@ You can quickly setup a sample Heroku HackMD application by clicking the button
 
 If you deploy it without the button, keep in mind to use the right buildpacks. For details check `app.json`.
 
+## Kubernetes
+
+To install use `helm install stable/hackmd`.
+
+For all further details, please check out the offical HackMD  [K8s helm chart](https://github.com/kubernetes/charts/tree/master/stable/hackmd).
+
 ## HackMD by docker container
 [![Try in PWD](https://cdn.rawgit.com/play-with-docker/stacks/cff22438/assets/images/button.png)](http://play-with-docker.com?stack=https://github.com/hackmdio/docker-hackmd/raw/master/docker-compose.yml&stack_name=hackmd)
 

From 10dbd537b4781e53d67de882faa84217ce4005fb Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 17 Jun 2018 23:10:47 +0200
Subject: [PATCH 14/74] Fix wrong docs about default image upload location

We wrongly state that the default image upload location is imgur. This
is no longer true, but got lost when updating docs. This commit should
fix it.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ba04182..20a72a9 100644
--- a/README.md
+++ b/README.md
@@ -202,7 +202,7 @@ There are some config settings you need to change in the files below.
 | `HMD_EMAIL` | `true` or `false` | set to allow email signin |
 | `HMD_ALLOW_PDF_EXPORT` | `true` or `false` | Enable or disable PDF exports |
 | `HMD_ALLOW_EMAIL_REGISTER` | `true` or `false` | set to allow email register (only applied when email is set, default is `true`. Note `bin/manage_users` might help you if registration is `false`.) |
-| `HMD_IMAGE_UPLOAD_TYPE` | `imgur`, `s3`, `minio` or `filesystem` | Where to upload image. For S3, see our Image Upload Guides for [S3](docs/guides/s3-image-upload.md) or [Minio](docs/guides/minio-image-upload.md) |
+| `HMD_IMAGE_UPLOAD_TYPE` | `imgur`, `s3`, `minio` or `filesystem` | Where to upload images. For S3, see our Image Upload Guides for [S3](docs/guides/s3-image-upload.md) or [Minio](docs/guides/minio-image-upload.md) |
 | `HMD_S3_ACCESS_KEY_ID` | no example | AWS access key id |
 | `HMD_S3_SECRET_ACCESS_KEY` | no example | AWS secret key |
 | `HMD_S3_REGION` | `ap-northeast-1` | AWS S3 region |
@@ -263,7 +263,7 @@ There are some config settings you need to change in the files below.
 | `documentMaxLength` | `100000` | note max length |
 | `email` | `true` or `false` | set to allow email signin |
 | `allowEmailRegister`  | `true` or `false` | set to allow email register (only applied when email is set, default is `true`. Note `bin/manage_users` might help you if registration is `false`.) |
-| `imageUploadType` | `imgur`(default), `s3`, `minio`, `azure` or `filesystem` | Where to upload image
+| `imageUploadType` | `imgur`, `s3`, `minio`, `azure` or `filesystem`(default) | Where to upload images. For S3, see our Image Upload Guides for [S3](docs/guides/s3-image-upload.md) or [Minio](docs/guides/minio-image-upload.md)|
 | `minio` | `{ "accessKey": "YOUR_MINIO_ACCESS_KEY", "secretKey": "YOUR_MINIO_SECRET_KEY", "endpoint": "YOUR_MINIO_HOST", port: 9000, secure: true }` | When `imageUploadType` is set to `minio`, you need to set this key. Also checkout our [Minio Image Upload Guide](docs/guides/minio-image-upload.md) |
 | `s3` | `{ "accessKeyId": "YOUR_S3_ACCESS_KEY_ID", "secretAccessKey": "YOUR_S3_ACCESS_KEY", "region": "YOUR_S3_REGION" }` | When `imageuploadtype` be set to `s3`, you would also need to setup this key, check our [S3 Image Upload Guide](docs/guides/s3-image-upload.md) |
 | `s3bucket` | `YOUR_S3_BUCKET_NAME` | bucket name when `imageUploadType` is set to `s3` or `minio` |

From ed5353d13ad1fe5dfa18f6e0936bcafa77ea0a73 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Mon, 18 Jun 2018 01:24:53 +0200
Subject: [PATCH 15/74] Move polyfill to CDN section

We don't support it on CDN false instances, but it doesn't hurt to keep
it in for CDN-enabled instances

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 public/views/hackmd/head.ejs | 2 +-
 public/views/index/head.ejs  | 2 +-
 public/views/pretty.ejs      | 2 +-
 public/views/slide.ejs       | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/public/views/hackmd/head.ejs b/public/views/hackmd/head.ejs
index 1f72285..8dfef43 100644
--- a/public/views/hackmd/head.ejs
+++ b/public/views/hackmd/head.ejs
@@ -15,8 +15,8 @@
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css" integrity="sha256-QiWfLIsCT02Sdwkogf6YMiQlj4NE84MKkzEMkZnMGdg=" crossorigin="anonymous" />
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />
 <%- include ../build/index-header %>
+<%- include ../shared/polyfill %>
 <% } else { %>
 <link rel="stylesheet" href='<%- url %>/build/emojify.js/dist/css/basic/emojify.min.css'>
 <%- include ../build/index-pack-header %>
 <% } %>
-<%- include ../shared/polyfill %>
\ No newline at end of file
diff --git a/public/views/index/head.ejs b/public/views/index/head.ejs
index bbd1456..e43c57d 100644
--- a/public/views/index/head.ejs
+++ b/public/views/index/head.ejs
@@ -16,7 +16,7 @@
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/3.5.4/select2.min.css" integrity="sha256-ijlUKKj3hJCiiT2HWo1kqkI79NTEYpzOsw5Rs3k42dI=" crossorigin="anonymous" />
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/3.5.4/select2-bootstrap.min.css" integrity="sha256-NAWFcNIZdH+TS1xpWujF/EB/Y8gwBbEOCoaK/eqaer8=" crossorigin="anonymous" />
 <%- include ../build/cover-header %>
+<%- include ../shared/polyfill %>
 <% } else { %>
 <%- include ../build/cover-pack-header %>
 <% } %>
-<%- include ../shared/polyfill %>
\ No newline at end of file
diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs
index 91d9c36..395f921 100644
--- a/public/views/pretty.ejs
+++ b/public/views/pretty.ejs
@@ -24,11 +24,11 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css" integrity="sha256-QiWfLIsCT02Sdwkogf6YMiQlj4NE84MKkzEMkZnMGdg=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />
     <%- include build/pretty-header %>
+    <%- include shared/polyfill %>
   <% } else { %>
     <link rel="stylesheet" href='<%- url %>/build/emojify.js/dist/css/basic/emojify.min.css'>
     <%- include build/pretty-pack-header %>
   <% } %>
-    <%- include shared/polyfill %>
 </head>
 
 <body style="display:none;">
diff --git a/public/views/slide.ejs b/public/views/slide.ejs
index a9d2b70..7b9ae29 100644
--- a/public/views/slide.ejs
+++ b/public/views/slide.ejs
@@ -22,6 +22,7 @@
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/reveal.js/3.6.0/css/reveal.min.css" integrity="sha256-ol2N5Xr80jdDqxK0lte3orKGb9Ja3sOnpAUV7TTADmg=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />
         <%- include build/slide-header %>
+        <%- include shared/polyfill %>
         <% } else { %>
         <link rel="stylesheet" href="<%- url %>/build/reveal.js/css/reveal.css">
         <link rel="stylesheet" href='<%- url %>/build/emojify.js/dist/css/basic/emojify.min.css'>
@@ -47,8 +48,6 @@
             link.href = '<%- url %>/build/reveal.js/' + (window.location.search.match( /print-pdf/gi ) ? 'css/print/pdf.css' : 'css/print/paper.css');
             document.getElementsByTagName( 'head' )[0].appendChild( link );
         </script>
-
-        <%- include shared/polyfill %>
     </head>
     <body>
         <div class="container">

From a8b664fdb5b425625928d0ce6ae9cdbd78fb3833 Mon Sep 17 00:00:00 2001
From: Edgar Zanella Alvarenga <e@vaz.io>
Date: Tue, 19 Jun 2018 16:03:32 +0200
Subject: [PATCH 16/74] Add a toolbar to Codemirror editor

Signed-off-by: Edgar Zanella Alvarenga <e@vaz.io>
---
 public/css/index.css              | 18 +++++++
 public/js/index.js                |  9 ++++
 public/js/lib/editor/index.js     | 87 +++++++++++++++++++++++++++++++
 public/js/lib/editor/toolbar.html | 48 +++++++++++++++++
 public/js/lib/editor/utils.js     | 40 ++++++++++++++
 5 files changed, 202 insertions(+)
 create mode 100644 public/js/lib/editor/toolbar.html

diff --git a/public/css/index.css b/public/css/index.css
index 3f391e2..9cc1766 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -20,6 +20,24 @@ body.night{
     background: #333 !important;
 }
 
+.toolbar {
+  background-color: #1c1c1e;
+  border: 1px solid #343434;
+}
+
+.toolbar > .btn-toolbar > .btn-group > .btn {
+  background-color: #1c1c1e;
+  padding: 5px;
+  font-size: 1em;
+}
+
+.toolbar > .btn-toolbar > .btn-group > .btn:hover {
+  background-color: #383a3e;
+
+  padding: 5px;
+}
+
+
 .CodeMirror {
     font-family: "Source Code Pro", Consolas, monaco, monospace;
     letter-spacing: 0.025em;
diff --git a/public/js/index.js b/public/js/index.js
index c6a4f77..5e0aded 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -30,6 +30,8 @@ import {
 import {
     debug,
     DROPBOX_APP_KEY,
+    GOOGLE_API_KEY,
+    GOOGLE_CLIENT_ID,
     noteid,
     noteurl,
     urlpath,
@@ -566,6 +568,9 @@ var previousFocusOnEditor = null
 
 function checkEditorStyle () {
   var desireHeight = editorInstance.statusBar ? (ui.area.edit.height() - editorInstance.statusBar.outerHeight()) : ui.area.edit.height()
+  if (editorInstance.toolBar) {
+     desireHeight = desireHeight - editorInstance.toolBar.outerHeight()
+  }
     // set editor height and min height based on scrollbar style and mode
   var scrollbarStyle = editor.getOption('scrollbarStyle')
   if (scrollbarStyle === 'overlay' || appState.currentMode === modeType.both) {
@@ -804,6 +809,10 @@ function changeMode (type) {
       editorInstance.addStatusBar()
       editorInstance.updateStatusBar()
     }
+    // add and update tool bar
+    if (!editorInstance.toolBar) {
+      editorInstance.addToolBar()
+    }
     // work around foldGutter might not init properly
     editor.setOption('foldGutter', false)
     editor.setOption('foldGutter', true)
diff --git a/public/js/lib/editor/index.js b/public/js/lib/editor/index.js
index bc228b7..cb9192b 100644
--- a/public/js/lib/editor/index.js
+++ b/public/js/lib/editor/index.js
@@ -1,6 +1,7 @@
 import * as utils from './utils'
 import config from './config'
 import statusBarTemplate from './statusbar.html'
+import toolBarTemplate from './toolbar.html'
 
 /* config section */
 const isMac = CodeMirror.keyMap.default === CodeMirror.keyMap.macDefault
@@ -136,6 +137,92 @@ export default class Editor {
     })
   }
 
+  addToolBar () {
+    this.toolBar = $(toolBarTemplate)
+    //console.log('PLACE', $('#toolbarPlace'))
+    //$('#toolbarPlace').html(this.toolBar)
+    this.toolbarPanel = this.editor.addPanel(this.toolBar[0], {
+       position: 'top'
+    })
+
+    var insertDemo = $('#insertDemo')
+    var makeBold = $('#makeBold')
+    var makeItalic = $('#makeItalic')
+    var makeStrike = $('#makeStrike')
+    var makeHeader = $('#makeHeader')
+    var makeCode = $('#makeCode')
+    var makeQuote = $('#makeQuote')
+    var makeGenericList = $('#makeGenericList')
+    var makeOrderedList = $('#makeOrderedList')
+    var makeCheckList = $('#makeCheckList')
+    var makeLink = $('#makeLink')
+    var makeImage = $('#makeImage')
+    var makeTable = $('#makeTable')
+    var makeLine = $('#makeLine')
+    var makeComment = $('#makeComment')
+
+    makeBold.click(() => {
+        utils.wrapTextWith(this.editor, this.editor, '**')
+        this.editor.focus()
+    })
+
+    makeItalic.click(() => {
+        utils.wrapTextWith(this.editor, this.editor, '*')
+        this.editor.focus()
+    })
+
+    makeStrike.click(() => {
+        utils.wrapTextWith(this.editor, this.editor, '~~')
+        this.editor.focus()
+    })
+
+    makeHeader.click(() => {
+      utils.insertHeader(this.editor)
+    })
+
+    makeCode.click(() => {
+      utils.wrapTextWith(this.editor, this.editor, '```')
+        this.editor.focus()
+    })
+
+    makeQuote.click(() => {
+      utils.insertOnStartOfLines(this.editor, '> ')
+    })
+
+    makeGenericList.click(() => {
+      utils.insertOnStartOfLines(this.editor, '* ')
+    })
+
+    makeOrderedList.click(() => {
+      utils.insertOnStartOfLines(this.editor, '1. ')
+    })
+
+    makeCheckList.click(() => {
+      utils.insertOnStartOfLines(this.editor, '- [ ] ')
+    })
+
+    makeLink.click(() => {
+      utils.insertText(this.editor, '[](https://)', 1)
+    })
+
+    makeImage.click(() => {
+      utils.insertText(this.editor, '![](https://)', 4)
+    })
+
+    makeTable.click(() => {
+      utils.insertText(this.editor, '\n\n| Column 1 | Column 2 | Column 3 |\n| -------- | -------- | -------- |\n| Text     | Text     | Text     |\n')
+    })
+
+    makeLine.click(() => {
+      utils.insertText(this.editor, '\n----\n')
+    })
+
+    makeComment.click(() => {
+      utils.insertText(this.editor, '> []', 4)
+    })
+
+  }
+
   addStatusBar () {
     this.statusBar = $(statusBarTemplate)
     this.statusCursor = this.statusBar.find('.status-cursor > .status-line-column')
diff --git a/public/js/lib/editor/toolbar.html b/public/js/lib/editor/toolbar.html
new file mode 100644
index 0000000..2894eef
--- /dev/null
+++ b/public/js/lib/editor/toolbar.html
@@ -0,0 +1,48 @@
+<div class="toolbar">
+  <div class="btn-toolbar" role="toolbar" aria-label="Editor toolbar">
+    <div class="btn-group" role="group">
+      <a id="makeBold" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Bold">
+          <i class="fa fa-bold fa-fw"></i>
+      </a>
+      <a id="makeItalic" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Italic">
+          <i class="fa fa-italic fa-fw"></i>
+      </a>
+      <a id="makeStrike" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Strikethrough">
+          <i class="fa fa-strikethrough fa-fw"></i>
+      </a>
+      <a id="makeHeader" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Heading">
+          <i class="fa fa-h1 fa-fw">H</i>
+      </a>
+      <a id="makeCode" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Quote">
+          <i class="fa fa-code fa-fw"></i>
+      </a>
+      <a id="makeQuote" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Quote">
+          <i class="fa fa-quote-right fa-fw"></i>
+      </a>
+      <a id="makeGenericList" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="List">
+          <i class="fa fa-list fa-fw"></i>
+      </a>
+      <a id="makeOrderedList" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Numbered List">
+          <i class="fa fa-list-ol fa-fw"></i>
+      </a>
+      <a id="makeCheckList" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Check List">
+          <i class="fa fa-check-square fa-fw"></i>
+      </a>
+      <a id="makeLink" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Link">
+          <i class="fa fa-link fa-fw"></i>
+      </a>
+      <a id="makeImage" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Image">
+          <i class="fa fa-image fa-fw"></i>
+      </a>
+      <a id="makeTable" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Table">
+          <i class="fa fa-table fa-fw"></i>
+      </a>
+      <a id="makeLine" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Line">
+          <i class="fa fa-minus fa-fw"></i>
+      </a>
+      <a id="makeComment" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Line">
+          <i class="fa fa-comment fa-fw"></i>
+      </a>
+    </div>
+  </div>
+</div>
diff --git a/public/js/lib/editor/utils.js b/public/js/lib/editor/utils.js
index 3702a16..f1053c4 100644
--- a/public/js/lib/editor/utils.js
+++ b/public/js/lib/editor/utils.js
@@ -46,3 +46,43 @@ export function wrapTextWith (editor, cm, symbol) {
     }
   }
 }
+
+export function insertText (cm, text, cursorEnd = 0) {
+  var cursor = cm.getCursor()
+  cm.replaceSelection(text, cursor, cursor)
+  cm.focus()
+  cm.setCursor({line: cursor.line, ch: cursor.ch + cursorEnd})
+}
+
+export function insertHeader (cm) {
+  let cursor = cm.getCursor()
+  let startOfLine = {line: cursor.line, ch: 0}
+  let startOfLineText = cm.getRange(startOfLine, {line: cursor.line, ch: 1})
+  // See if it is already a header
+  if (startOfLineText === '#') {
+    cm.replaceRange('#', startOfLine, startOfLine)
+  } else {
+    cm.replaceRange('# ', startOfLine, startOfLine)
+  }
+  cm.focus()
+}
+
+export function insertOnStartOfLines (cm, symbol, cursorEnd) {
+  let cursor = cm.getCursor()
+  var ranges = cm.listSelections()
+
+  for (let i = 0; i < ranges.length; i++) {
+    var range = ranges[i]
+    if (!range.empty()) {
+      const from = range.from()
+      const to = range.to()
+      for (let j = from.line; j <= to.line; ++j) {
+        cm.replaceRange(symbol, {line: j, ch: 0}, {line: j, ch: 0})
+      }
+    } else {
+      cm.replaceRange(symbol, {line: cursor.line, ch: 0}, {line: cursor.line, ch: 0})
+    }
+  }
+  cm.setCursor({line: cursor.line, ch: (cursorEnd)? cursorEnd : cursor.ch})
+  cm.focus()
+}

From b98d10c79a98d8e369fb3ea8e4e4218bf90448dd Mon Sep 17 00:00:00 2001
From: Jake Burden <jake@doge.haus>
Date: Fri, 22 Jun 2018 15:34:53 -0400
Subject: [PATCH 17/74] turn concatenated string into a multi-line template
 string Signed-off-by: Jake Burden <jake@doge.haus>

---
 public/js/cover.js | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/public/js/cover.js b/public/js/cover.js
index 2a09b4c..6ca05f6 100644
--- a/public/js/cover.js
+++ b/public/js/cover.js
@@ -34,25 +34,25 @@ import S from 'string'
 
 const options = {
   valueNames: ['id', 'text', 'timestamp', 'fromNow', 'time', 'tags', 'pinned'],
-  item: '<li class="col-xs-12 col-sm-6 col-md-6 col-lg-4">' +
-            '<span class="id" style="display:none;"></span>' +
-            '<a href="#">' +
-                '<div class="item">' +
-                    '<div class="ui-history-pin fa fa-thumb-tack fa-fw"></div>' +
-                    '<div class="ui-history-close fa fa-close fa-fw" data-toggle="modal" data-target=".delete-history-modal"></div>' +
-                    '<div class="content">' +
-                        '<h4 class="text"></h4>' +
-                        '<p>' +
-                            '<i><i class="fa fa-clock-o"></i> visited </i><i class="fromNow"></i>' +
-                            '<br>' +
-                            '<i class="timestamp" style="display:none;"></i>' +
-                            '<i class="time"></i>' +
-                        '</p>' +
-                        '<p class="tags"></p>' +
-                    '</div>' +
-                '</div>' +
-            '</a>' +
-           '</li>',
+  item: `<li class="col-xs-12 col-sm-6 col-md-6 col-lg-4">
+          <span class="id" style="display:none;"></span>
+          <a href="#">
+            <div class="item">
+              <div class="ui-history-pin fa fa-thumb-tack fa-fw"></div>
+              <div class="ui-history-close fa fa-close fa-fw" data-toggle="modal" data-target=".delete-history-modal"></div>
+              <div class="content">
+                <h4 class="text"></h4>
+                <p>
+                  <i><i class="fa fa-clock-o"></i> visited </i><i class="fromNow"></i>
+                  <br>
+                  <i class="timestamp" style="display:none;"></i>
+                  <i class="time"></i>
+                </p>
+                <p class="tags"></p>
+              </div>
+            </div>
+          </a>
+        </li>`,
   page: 18,
   pagination: [{
     outerWindow: 1

From f65d96c57b02c98616ffe3d8d7cc93f3e3942897 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 23 Jun 2018 20:55:32 +0200
Subject: [PATCH 18/74] Fix liniting and optimize some functions

First fixed some linting issues. Also optimized some functions to be
undoable with one ctrl+z.

This should also speedup some operations

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 public/js/index.js            |  6 +--
 public/js/lib/editor/index.js | 26 +++++-----
 public/js/lib/editor/utils.js | 89 ++++++++++++++++++++++++-----------
 3 files changed, 74 insertions(+), 47 deletions(-)

diff --git a/public/js/index.js b/public/js/index.js
index 5e0aded..6e13fe9 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -30,8 +30,6 @@ import {
 import {
     debug,
     DROPBOX_APP_KEY,
-    GOOGLE_API_KEY,
-    GOOGLE_CLIENT_ID,
     noteid,
     noteurl,
     urlpath,
@@ -569,9 +567,9 @@ var previousFocusOnEditor = null
 function checkEditorStyle () {
   var desireHeight = editorInstance.statusBar ? (ui.area.edit.height() - editorInstance.statusBar.outerHeight()) : ui.area.edit.height()
   if (editorInstance.toolBar) {
-     desireHeight = desireHeight - editorInstance.toolBar.outerHeight()
+    desireHeight = desireHeight - editorInstance.toolBar.outerHeight()
   }
-    // set editor height and min height based on scrollbar style and mode
+  // set editor height and min height based on scrollbar style and mode
   var scrollbarStyle = editor.getOption('scrollbarStyle')
   if (scrollbarStyle === 'overlay' || appState.currentMode === modeType.both) {
     ui.area.codemirrorScroll.css('height', desireHeight + 'px')
diff --git a/public/js/lib/editor/index.js b/public/js/lib/editor/index.js
index cb9192b..0537e92 100644
--- a/public/js/lib/editor/index.js
+++ b/public/js/lib/editor/index.js
@@ -139,13 +139,10 @@ export default class Editor {
 
   addToolBar () {
     this.toolBar = $(toolBarTemplate)
-    //console.log('PLACE', $('#toolbarPlace'))
-    //$('#toolbarPlace').html(this.toolBar)
     this.toolbarPanel = this.editor.addPanel(this.toolBar[0], {
-       position: 'top'
+      position: 'top'
     })
 
-    var insertDemo = $('#insertDemo')
     var makeBold = $('#makeBold')
     var makeItalic = $('#makeItalic')
     var makeStrike = $('#makeStrike')
@@ -162,18 +159,18 @@ export default class Editor {
     var makeComment = $('#makeComment')
 
     makeBold.click(() => {
-        utils.wrapTextWith(this.editor, this.editor, '**')
-        this.editor.focus()
+      utils.wrapTextWith(this.editor, this.editor, '**')
+      this.editor.focus()
     })
 
     makeItalic.click(() => {
-        utils.wrapTextWith(this.editor, this.editor, '*')
-        this.editor.focus()
+      utils.wrapTextWith(this.editor, this.editor, '*')
+      this.editor.focus()
     })
 
     makeStrike.click(() => {
-        utils.wrapTextWith(this.editor, this.editor, '~~')
-        this.editor.focus()
+      utils.wrapTextWith(this.editor, this.editor, '~~')
+      this.editor.focus()
     })
 
     makeHeader.click(() => {
@@ -182,7 +179,7 @@ export default class Editor {
 
     makeCode.click(() => {
       utils.wrapTextWith(this.editor, this.editor, '```')
-        this.editor.focus()
+      this.editor.focus()
     })
 
     makeQuote.click(() => {
@@ -202,11 +199,11 @@ export default class Editor {
     })
 
     makeLink.click(() => {
-      utils.insertText(this.editor, '[](https://)', 1)
+      utils.insertLink(this.editor, false)
     })
 
     makeImage.click(() => {
-      utils.insertText(this.editor, '![](https://)', 4)
+      utils.insertLink(this.editor, true)
     })
 
     makeTable.click(() => {
@@ -218,9 +215,8 @@ export default class Editor {
     })
 
     makeComment.click(() => {
-      utils.insertText(this.editor, '> []', 4)
+      utils.insertText(this.editor, '> []')
     })
-
   }
 
   addStatusBar () {
diff --git a/public/js/lib/editor/utils.js b/public/js/lib/editor/utils.js
index f1053c4..3367088 100644
--- a/public/js/lib/editor/utils.js
+++ b/public/js/lib/editor/utils.js
@@ -3,39 +3,39 @@ export function wrapTextWith (editor, cm, symbol) {
   if (!cm.getSelection()) {
     return CodeMirror.Pass
   } else {
-    var ranges = cm.listSelections()
-    for (var i = 0; i < ranges.length; i++) {
-      var range = ranges[i]
+    let ranges = cm.listSelections()
+    for (let i = 0; i < ranges.length; i++) {
+      let range = ranges[i]
       if (!range.empty()) {
         const from = range.from()
         const to = range.to()
 
         if (symbol !== 'Backspace') {
-          cm.replaceRange(symbol, to, to, '+input')
-          cm.replaceRange(symbol, from, from, '+input')
-          // workaround selection range not correct after add symbol
-          var _ranges = cm.listSelections()
-          var anchorIndex = editor.indexFromPos(_ranges[i].anchor)
-          var headIndex = editor.indexFromPos(_ranges[i].head)
+          let selection = cm.getRange(from, to)
+          let anchorIndex = editor.indexFromPos(ranges[i].anchor)
+          let headIndex = editor.indexFromPos(ranges[i].head)
+          cm.replaceRange(symbol + selection + symbol, from, to, '+input')
           if (anchorIndex > headIndex) {
-            _ranges[i].anchor.ch--
+            ranges[i].anchor.ch+= symbol.length
+            ranges[i].head.ch+= symbol.length
           } else {
-            _ranges[i].head.ch--
+            ranges[i].head.ch+= symbol.length
+            ranges[i].anchor.ch+= symbol.length
           }
-          cm.setSelections(_ranges)
+          cm.setSelections(ranges)
         } else {
-          var preEndPos = {
+          let preEndPos = {
             line: to.line,
-            ch: to.ch + 1
+            ch: to.ch + symbol.length
           }
-          var preText = cm.getRange(to, preEndPos)
-          var preIndex = wrapSymbols.indexOf(preText)
-          var postEndPos = {
+          let preText = cm.getRange(to, preEndPos)
+          let preIndex = wrapSymbols.indexOf(preText)
+          let postEndPos = {
             line: from.line,
-            ch: from.ch - 1
+            ch: from.ch - symbol.length
           }
-          var postText = cm.getRange(postEndPos, from)
-          var postIndex = wrapSymbols.indexOf(postText)
+          let postText = cm.getRange(postEndPos, from)
+          let postIndex = wrapSymbols.indexOf(postText)
           // check if surround symbol are list in array and matched
           if (preIndex > -1 && postIndex > -1 && preIndex === postIndex) {
             cm.replaceRange('', to, preEndPos, '+delete')
@@ -48,12 +48,44 @@ export function wrapTextWith (editor, cm, symbol) {
 }
 
 export function insertText (cm, text, cursorEnd = 0) {
-  var cursor = cm.getCursor()
+  let cursor = cm.getCursor()
   cm.replaceSelection(text, cursor, cursor)
   cm.focus()
   cm.setCursor({line: cursor.line, ch: cursor.ch + cursorEnd})
 }
 
+export function insertLink(cm, isImage) {
+  let cursor = cm.getCursor()
+  let ranges = cm.listSelections()
+  const linkEnd = '](https://)'
+  const symbol = (isImage) ? '![' : '['
+
+  for (let i = 0; i < ranges.length; i++) {
+    let range = ranges[i]
+    if (!range.empty()) {
+      const from = range.from()
+      const to = range.to()
+      let anchorIndex = editor.indexFromPos(ranges[i].anchor)
+      let headIndex = editor.indexFromPos(ranges[i].head)
+      let selection = cm.getRange(from, to)
+      selection = symbol + selection + linkEnd
+      cm.replaceRange(selection, from, to)
+      if (anchorIndex > headIndex) {
+        ranges[i].anchor.ch+= symbol.length
+        ranges[i].head.ch+= symbol.length
+      } else {
+        ranges[i].head.ch+= symbol.length
+        ranges[i].anchor.ch+= symbol.length
+      }
+      cm.setSelections(ranges)
+    } else {
+      cm.replaceRange(symbol + linkEnd, cursor, cursor)
+      cm.setCursor({line: cursor.line, ch: cursor.ch + symbol.length + linkend.length})
+    }
+  }
+  cm.focus()
+}
+
 export function insertHeader (cm) {
   let cursor = cm.getCursor()
   let startOfLine = {line: cursor.line, ch: 0}
@@ -67,22 +99,23 @@ export function insertHeader (cm) {
   cm.focus()
 }
 
-export function insertOnStartOfLines (cm, symbol, cursorEnd) {
+export function insertOnStartOfLines (cm, symbol) {
   let cursor = cm.getCursor()
-  var ranges = cm.listSelections()
+  let ranges = cm.listSelections()
 
   for (let i = 0; i < ranges.length; i++) {
-    var range = ranges[i]
+    let range = ranges[i]
     if (!range.empty()) {
       const from = range.from()
       const to = range.to()
-      for (let j = from.line; j <= to.line; ++j) {
-        cm.replaceRange(symbol, {line: j, ch: 0}, {line: j, ch: 0})
-      }
+      let selection = cm.getRange({line: from.line, ch: 0}, to)
+      selection = selection.replace(/\n/g, '\n' + symbol)
+      selection = symbol + selection
+      cm.replaceRange(selection, from, to)
     } else {
       cm.replaceRange(symbol, {line: cursor.line, ch: 0}, {line: cursor.line, ch: 0})
     }
   }
-  cm.setCursor({line: cursor.line, ch: (cursorEnd)? cursorEnd : cursor.ch})
+  cm.setCursor({line: cursor.line, ch: cursor.ch + symbol.length})
   cm.focus()
 }

From 47b18ada765271853ce512ff7511aa0abda206ac Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 23 Jun 2018 21:25:36 +0200
Subject: [PATCH 19/74] Remove unused zh.json from repo

Since the original idea of using a symlink didn't work anyway, we should
remove the zh.json symlink from the repo.  It doesn't provide any
benefit but alters the repo on start of HackMD.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 app.js          | 2 +-
 locales/zh.json | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 120000 locales/zh.json

diff --git a/app.js b/app.js
index 772073b..fcb5305 100644
--- a/app.js
+++ b/app.js
@@ -129,7 +129,7 @@ if (config.csp.enable) {
 }
 
 i18n.configure({
-  locales: ['en', 'zh', 'zh-CN', 'zh-TW', 'fr', 'de', 'ja', 'es', 'ca', 'el', 'pt', 'it', 'tr', 'ru', 'nl', 'hr', 'pl', 'uk', 'hi', 'sv', 'eo', 'da', 'ko'],
+  locales: ['en', 'zh-CN', 'zh-TW', 'fr', 'de', 'ja', 'es', 'ca', 'el', 'pt', 'it', 'tr', 'ru', 'nl', 'hr', 'pl', 'uk', 'hi', 'sv', 'eo', 'da', 'ko'],
   cookie: 'locale',
   directory: path.join(__dirname, '/locales'),
   updateFiles: config.updateI18nFiles
diff --git a/locales/zh.json b/locales/zh.json
deleted file mode 120000
index 77c7eac..0000000
--- a/locales/zh.json
+++ /dev/null
@@ -1 +0,0 @@
-locales/zh-TW.json
\ No newline at end of file

From 8fe26988d159b8ad3970f54f256245cece3efce5 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 23 Jun 2018 21:27:05 +0200
Subject: [PATCH 20/74] Fix all newly introduced linting issues

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 public/js/lib/editor/utils.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/js/lib/editor/utils.js b/public/js/lib/editor/utils.js
index 3367088..36e5c12 100644
--- a/public/js/lib/editor/utils.js
+++ b/public/js/lib/editor/utils.js
@@ -16,11 +16,11 @@ export function wrapTextWith (editor, cm, symbol) {
           let headIndex = editor.indexFromPos(ranges[i].head)
           cm.replaceRange(symbol + selection + symbol, from, to, '+input')
           if (anchorIndex > headIndex) {
-            ranges[i].anchor.ch+= symbol.length
-            ranges[i].head.ch+= symbol.length
+            ranges[i].anchor.ch += symbol.length
+            ranges[i].head.ch += symbol.length
           } else {
-            ranges[i].head.ch+= symbol.length
-            ranges[i].anchor.ch+= symbol.length
+            ranges[i].head.ch += symbol.length
+            ranges[i].anchor.ch += symbol.length
           }
           cm.setSelections(ranges)
         } else {
@@ -54,7 +54,7 @@ export function insertText (cm, text, cursorEnd = 0) {
   cm.setCursor({line: cursor.line, ch: cursor.ch + cursorEnd})
 }
 
-export function insertLink(cm, isImage) {
+export function insertLink (cm, isImage) {
   let cursor = cm.getCursor()
   let ranges = cm.listSelections()
   const linkEnd = '](https://)'
@@ -71,16 +71,16 @@ export function insertLink(cm, isImage) {
       selection = symbol + selection + linkEnd
       cm.replaceRange(selection, from, to)
       if (anchorIndex > headIndex) {
-        ranges[i].anchor.ch+= symbol.length
-        ranges[i].head.ch+= symbol.length
+        ranges[i].anchor.ch += symbol.length
+        ranges[i].head.ch += symbol.length
       } else {
-        ranges[i].head.ch+= symbol.length
-        ranges[i].anchor.ch+= symbol.length
+        ranges[i].head.ch += symbol.length
+        ranges[i].anchor.ch += symbol.length
       }
       cm.setSelections(ranges)
     } else {
       cm.replaceRange(symbol + linkEnd, cursor, cursor)
-      cm.setCursor({line: cursor.line, ch: cursor.ch + symbol.length + linkend.length})
+      cm.setCursor({line: cursor.line, ch: cursor.ch + symbol.length + linkEnd.length})
     }
   }
   cm.focus()

From a2608c319a8c31f9b173dbb5d00221d3ad96739b Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 23 Jun 2018 21:47:22 +0200
Subject: [PATCH 21/74] Fix possible error if HackMD is started with wrong
 workdir

In https://github.com/hackmdio/hackmd/issues/834 is described how
starting HackMD crashes when using the wrong working dir.

This is caused by a relative path in our upload routine. This change
should fix it and prevent future crashes.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 README.md                    | 1 +
 lib/config/default.js        | 1 +
 lib/config/index.js          | 1 +
 lib/web/imageRouter/index.js | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3e411df..7783400 100644
--- a/README.md
+++ b/README.md
@@ -261,6 +261,7 @@ There are some config settings you need to change in the files below.
 | `errorPath` | `./public/views/error.ejs` | error template file path |
 | `prettyPath` | `./public/views/pretty.ejs` | pretty template file path |
 | `slidePath` | `./public/views/slide.hbs` | slide template file path |
+| `uploadsPath` | `./public/uploads` | uploads directory - needs to be persistent when you use imageUploadType `filesystem` |
 | `sessionName` | `connect.sid` | cookie session name |
 | `sessionSecret` | `secret` | cookie session secret |
 | `sessionLife` | `14 * 24 * 60 * 60 * 1000` | cookie session life |
diff --git a/lib/config/default.js b/lib/config/default.js
index 1b124b3..f88c17b 100644
--- a/lib/config/default.js
+++ b/lib/config/default.js
@@ -45,6 +45,7 @@ module.exports = {
   errorPath: './public/views/error.ejs',
   prettyPath: './public/views/pretty.ejs',
   slidePath: './public/views/slide.ejs',
+  uploadsPath: './public/uploads',
   // session
   sessionName: 'connect.sid',
   sessionSecret: 'secret',
diff --git a/lib/config/index.js b/lib/config/index.js
index 7853dba..b8bf64c 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -173,6 +173,7 @@ config.hackmdPath = path.join(appRootPath, config.hackmdPath)
 config.errorPath = path.join(appRootPath, config.errorPath)
 config.prettyPath = path.join(appRootPath, config.prettyPath)
 config.slidePath = path.join(appRootPath, config.slidePath)
+config.uploadsPath = path.join(appRootPath, config.uploadsPath)
 
 // make config readonly
 config = deepFreeze(config)
diff --git a/lib/web/imageRouter/index.js b/lib/web/imageRouter/index.js
index f7e031a..f3c2dec 100644
--- a/lib/web/imageRouter/index.js
+++ b/lib/web/imageRouter/index.js
@@ -16,7 +16,7 @@ imageRouter.post('/uploadimage', function (req, res) {
   form.keepExtensions = true
 
   if (config.imageUploadType === 'filesystem') {
-    form.uploadDir = 'public/uploads'
+    form.uploadDir = config.uploadsPath
   }
 
   form.parse(req, function (err, fields, files) {

From 318b2d378f54805e99b7022db15136df7c920083 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 23 Jun 2018 23:40:46 +0200
Subject: [PATCH 22/74] Allow to disable gravatar

Since Gravatar is an external image source and not perfect from a
privacy perspective, forbidding it allows to improve privacy.

This commit also simplifies and optimizes the avatar code.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 README.md                 |  2 ++
 lib/config/default.js     |  1 +
 lib/config/environment.js |  1 +
 lib/letter-avatars.js     | 16 ++++++++++++++--
 lib/models/user.js        | 30 +++++-------------------------
 5 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 7783400..095cc41 100644
--- a/README.md
+++ b/README.md
@@ -209,6 +209,7 @@ There are some config settings you need to change in the files below.
 | `HMD_EMAIL` | `true` or `false` | set to allow email signin |
 | `HMD_ALLOW_PDF_EXPORT` | `true` or `false` | Enable or disable PDF exports |
 | `HMD_ALLOW_EMAIL_REGISTER` | `true` or `false` | set to allow email register (only applied when email is set, default is `true`. Note `bin/manage_users` might help you if registration is `false`.) |
+| `HMD_ALLOW_GRAVATAR` | `true` or `false` | set to `false` to disable gravatar as profile picture source on your instance |
 | `HMD_IMAGE_UPLOAD_TYPE` | `imgur`, `s3`, `minio` or `filesystem` | Where to upload images. For S3, see our Image Upload Guides for [S3](docs/guides/s3-image-upload.md) or [Minio](docs/guides/minio-image-upload.md) |
 | `HMD_S3_ACCESS_KEY_ID` | no example | AWS access key id |
 | `HMD_S3_SECRET_ACCESS_KEY` | no example | AWS secret key |
@@ -271,6 +272,7 @@ There are some config settings you need to change in the files below.
 | `documentMaxLength` | `100000` | note max length |
 | `email` | `true` or `false` | set to allow email signin |
 | `allowEmailRegister`  | `true` or `false` | set to allow email register (only applied when email is set, default is `true`. Note `bin/manage_users` might help you if registration is `false`.) |
+| `allowGravatar` | `true` or `false` | set to `false` to disable gravatar as profile picture source on your instance |
 | `imageUploadType` | `imgur`, `s3`, `minio`, `azure` or `filesystem`(default) | Where to upload images. For S3, see our Image Upload Guides for [S3](docs/guides/s3-image-upload.md) or [Minio](docs/guides/minio-image-upload.md)|
 | `minio` | `{ "accessKey": "YOUR_MINIO_ACCESS_KEY", "secretKey": "YOUR_MINIO_SECRET_KEY", "endpoint": "YOUR_MINIO_HOST", port: 9000, secure: true }` | When `imageUploadType` is set to `minio`, you need to set this key. Also checkout our [Minio Image Upload Guide](docs/guides/minio-image-upload.md) |
 | `s3` | `{ "accessKeyId": "YOUR_S3_ACCESS_KEY_ID", "secretAccessKey": "YOUR_S3_ACCESS_KEY", "region": "YOUR_S3_REGION" }` | When `imageuploadtype` be set to `s3`, you would also need to setup this key, check our [S3 Image Upload Guide](docs/guides/s3-image-upload.md) |
diff --git a/lib/config/default.js b/lib/config/default.js
index f88c17b..ec44ae7 100644
--- a/lib/config/default.js
+++ b/lib/config/default.js
@@ -146,5 +146,6 @@ module.exports = {
   },
   email: true,
   allowEmailRegister: true,
+  allowGravatar: true,
   allowPDFExport: true
 }
diff --git a/lib/config/environment.js b/lib/config/environment.js
index e1c1156..0ca3d92 100644
--- a/lib/config/environment.js
+++ b/lib/config/environment.js
@@ -120,5 +120,6 @@ module.exports = {
   },
   email: toBooleanConfig(process.env.HMD_EMAIL),
   allowEmailRegister: toBooleanConfig(process.env.HMD_ALLOW_EMAIL_REGISTER),
+  allowGravatar: toBooleanConfig(process.env.HMD_ALLOW_GRAVATAR),
   allowPDFExport: toBooleanConfig(process.env.HMD_ALLOW_PDF_EXPORT)
 }
diff --git a/lib/letter-avatars.js b/lib/letter-avatars.js
index b5b1d9e..53fa011 100644
--- a/lib/letter-avatars.js
+++ b/lib/letter-avatars.js
@@ -1,5 +1,6 @@
 'use strict'
 // external modules
+const md5 = require('blueimp-md5')
 const randomcolor = require('randomcolor')
 const config = require('./config')
 
@@ -24,6 +25,17 @@ exports.generateAvatar = function (name) {
   return svg
 }
 
-exports.generateAvatarURL = function (name) {
-  return config.serverURL + '/user/' + name + '/avatar.svg'
+exports.generateAvatarURL = function (name, email = '', big = true) {
+  let photo
+  if (email !== '' && config.allowGravatar) {
+    photo = 'https://www.gravatar.com/avatar/' + md5(email.toLowerCase())
+    if (big) {
+      photo += '?s=400'
+    } else {
+      photo += '?s=96'
+    }
+  } else {
+    photo = config.serverURL + '/user/' + (name || email.substring(0, email.lastIndexOf('@')) || md5(email.toLowerCase())) + '/avatar.svg'
+  }
+  return photo
 }
diff --git a/lib/models/user.js b/lib/models/user.js
index 5dd1386..1bd8c74 100644
--- a/lib/models/user.js
+++ b/lib/models/user.js
@@ -1,6 +1,5 @@
 'use strict'
 // external modules
-var md5 = require('blueimp-md5')
 var Sequelize = require('sequelize')
 var scrypt = require('scrypt')
 
@@ -128,10 +127,7 @@ module.exports = function (sequelize, DataTypes) {
             }
             break
           case 'dropbox':
-            // no image api provided, use gravatar
-            photo = 'https://www.gravatar.com/avatar/' + md5(profile.emails[0].value)
-            if (bigger) photo += '?s=400'
-            else photo += '?s=96'
+            photo = generateAvatarURL('', profile.emails[0].value, bigger)
             break
           case 'google':
             photo = profile.photos[0].value
@@ -139,35 +135,19 @@ module.exports = function (sequelize, DataTypes) {
             else photo = photo.replace(/(\?sz=)\d*$/i, '$196')
             break
           case 'ldap':
-            // no image api provided,
-            // use gravatar if email exists,
-            // otherwise generate a letter avatar
-            if (profile.emails[0]) {
-              photo = 'https://www.gravatar.com/avatar/' + md5(profile.emails[0])
-              if (bigger) photo += '?s=400'
-              else photo += '?s=96'
-            } else {
-              photo = generateAvatarURL(profile.username)
-            }
+            photo = generateAvatarURL(profile.username, profile.emails[0], bigger)
             break
           case 'saml':
-            if (profile.emails[0]) {
-              photo = 'https://www.gravatar.com/avatar/' + md5(profile.emails[0])
-              if (bigger) photo += '?s=400'
-              else photo += '?s=96'
-            } else {
-              photo = generateAvatarURL(profile.username)
-            }
+            photo = generateAvatarURL(profile.username, profile.emails[0], bigger)
             break
         }
         return photo
       },
       parseProfileByEmail: function (email) {
-        var photoUrl = 'https://www.gravatar.com/avatar/' + md5(email)
         return {
           name: email.substring(0, email.lastIndexOf('@')),
-          photo: photoUrl + '?s=96',
-          biggerphoto: photoUrl + '?s=400'
+          photo: generateAvatarURL('', email, false),
+          biggerphoto: generateAvatarURL('', email, true)
         }
       }
     }

From 0ed4b50098b4329b1d91e519bbbbe4e14701f92f Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 24 Jun 2018 00:06:03 +0200
Subject: [PATCH 23/74] Move config out of statics path

Since static path is providing with a high expiration data, we provide
configs via API. This shouldn't add any noticeable load while making it
uncached and this way working again.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 app.js                            | 16 ----------------
 lib/config/default.js             |  1 +
 lib/config/index.js               |  1 +
 lib/web/statusRouter.js           | 17 +++++++++++++++++
 public/views/includes/scripts.ejs |  2 +-
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/app.js b/app.js
index fcb5305..bfb5a49 100644
--- a/app.js
+++ b/app.js
@@ -26,22 +26,6 @@ var response = require('./lib/response')
 var models = require('./lib/models')
 var csp = require('./lib/csp')
 
-// generate front-end constants by template
-var constpath = path.join(__dirname, './public/js/lib/common/constant.ejs')
-var data = {
-  domain: config.domain,
-  urlpath: config.urlPath,
-  debug: config.debug,
-  version: config.version,
-  DROPBOX_APP_KEY: config.dropbox.appKey,
-  allowedUploadMimeTypes: config.allowedUploadMimeTypes
-}
-
-ejs.renderFile(constpath, data, {}, function (err, str) {
-  if (err) throw new Error(err)
-  fs.writeFileSync(path.join(__dirname, './public/build/constant.js'), str)
-})
-
 // server setup
 var app = express()
 var server = null
diff --git a/lib/config/default.js b/lib/config/default.js
index f88c17b..2a91c85 100644
--- a/lib/config/default.js
+++ b/lib/config/default.js
@@ -45,6 +45,7 @@ module.exports = {
   errorPath: './public/views/error.ejs',
   prettyPath: './public/views/pretty.ejs',
   slidePath: './public/views/slide.ejs',
+  constantsPath: './public/js/lib/common/constant.ejs',
   uploadsPath: './public/uploads',
   // session
   sessionName: 'connect.sid',
diff --git a/lib/config/index.js b/lib/config/index.js
index b8bf64c..7933044 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -173,6 +173,7 @@ config.hackmdPath = path.join(appRootPath, config.hackmdPath)
 config.errorPath = path.join(appRootPath, config.errorPath)
 config.prettyPath = path.join(appRootPath, config.prettyPath)
 config.slidePath = path.join(appRootPath, config.slidePath)
+config.constantsPath = path.join(appRootPath, config.constantsPath)
 config.uploadsPath = path.join(appRootPath, config.uploadsPath)
 
 // make config readonly
diff --git a/lib/web/statusRouter.js b/lib/web/statusRouter.js
index d22fac4..4495a28 100644
--- a/lib/web/statusRouter.js
+++ b/lib/web/statusRouter.js
@@ -90,3 +90,20 @@ statusRouter.post('/temp', urlencodedParser, function (req, res) {
     }
   }
 })
+
+statusRouter.get('/config', function (req, res) {
+  var data = {
+    domain: config.domain,
+    urlpath: config.urlPath,
+    debug: config.debug,
+    version: config.version,
+    DROPBOX_APP_KEY: config.dropbox.appKey,
+    allowedUploadMimeTypes: config.allowedUploadMimeTypes
+  }
+  res.set({
+    'Cache-Control': 'private', // only cache by client
+    'X-Robots-Tag': 'noindex, nofollow', // prevent crawling
+    'HackMD-Version': config.version
+  })
+  res.render(config.constantsPath, data)
+})
diff --git a/public/views/includes/scripts.ejs b/public/views/includes/scripts.ejs
index 8766894..df8fbc0 100644
--- a/public/views/includes/scripts.ejs
+++ b/public/views/includes/scripts.ejs
@@ -1,4 +1,4 @@
-<script src="<%= webpackConfig.output.baseUrl %>/build/constant.js"></script>
+<script src="<%= webpackConfig.output.baseUrl %>/config"></script>
 <% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
 <script src="<%= webpackConfig.output.baseUrl %><%= htmlWebpackPlugin.files.chunks[chunk].entry %>" defer></script>
 <% } %>

From b7b621822c518f659f775343332945bc545cb094 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 24 Jun 2018 00:32:41 +0200
Subject: [PATCH 24/74] Fix possible line-ending issues for init note

By uploading a malicous note currently it is possible to prevent this
note from being edited. This happens when using Windows line endings.

With this commit we remove all `\r` characters from the notes and this
way prevent this problem.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 lib/response.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/response.js b/lib/response.js
index 4cfa9a7..335f100 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -145,6 +145,8 @@ function responseHackMD (res, note) {
 
 function newNote (req, res, next) {
   var owner = null
+  var body = req.body ? req.body : ''
+  body = body.replace(/[\r]/g, '')
   if (req.isAuthenticated()) {
     owner = req.user.id
   } else if (!config.allowAnonymous) {
@@ -153,7 +155,7 @@ function newNote (req, res, next) {
   models.Note.create({
     ownerId: owner,
     alias: req.alias ? req.alias : null,
-    content: req.body ? req.body : ''
+    content: body
   }).then(function (note) {
     return res.redirect(config.serverURL + '/' + models.Note.encodeNoteId(note.id))
   }).catch(function (err) {

From f69e77de424ea763a87a04c9d66196d9353c8690 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 24 Jun 2018 01:00:20 +0200
Subject: [PATCH 25/74] Fix broken images in PDF caused by misconfigred server
 URL

As it turns out, if the serverURL can't be generated correctly, HackMD
will use relative paths in image upload. This causes broken links in
PDF.

With this commit we force absolute links during PDF creation which
hopefully fixes the problem.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 lib/response.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/response.js b/lib/response.js
index 4cfa9a7..a3c988f 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -327,15 +327,18 @@ function actionInfo (req, res, note) {
 }
 
 function actionPDF (req, res, note) {
+  var url = config.serverURL || 'http://' + req.get('host')
   var body = note.content
   var extracted = models.Note.extractMeta(body)
+  var content = extracted.markdown
   var title = models.Note.decodeTitle(note.title)
 
   if (!fs.existsSync(config.tmpPath)) {
     fs.mkdirSync(config.tmpPath)
   }
   var path = config.tmpPath + '/' + Date.now() + '.pdf'
-  markdownpdf().from.string(extracted.markdown).to(path, function () {
+  content = content.replace(/\]\(\//g, '](' + url + '/')
+  markdownpdf().from.string(content).to(path, function () {
     var stream = fs.createReadStream(path)
     var filename = title
     // Be careful of special characters

From bf9400e107f5378b502650a2223c238c3671e6b4 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 24 Jun 2018 01:03:25 +0200
Subject: [PATCH 26/74] Fix breaking regex

The image upload regex breaks with the new path for uploads.

This commit fixes it.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 lib/web/imageRouter/filesystem.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/web/imageRouter/filesystem.js b/lib/web/imageRouter/filesystem.js
index 145876a..4bf82b3 100644
--- a/lib/web/imageRouter/filesystem.js
+++ b/lib/web/imageRouter/filesystem.js
@@ -15,5 +15,5 @@ exports.uploadImage = function (imagePath, callback) {
     return
   }
 
-  callback(null, url.resolve(config.serverURL + '/', imagePath.match(/^public\/(.+$)/)[1]))
+  callback(null, url.resolve(config.serverURL + '/', imagePath.match(/public\/(.+)$/)[1]))
 }

From 4b060c7dba034f76007f41d088778e569e69d2af Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 22 Jun 2018 21:07:30 +0200
Subject: [PATCH 27/74] Rebrand HackMD to CodiMD

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 CONTRIBUTING.md                               |  36 +++++-----
 README.md                                     |  66 +++++++++---------
 app.js                                        |   2 +-
 app.json                                      |   6 +-
 bin/setup                                     |   7 +-
 config.json.example                           |   4 +-
 lib/models/note.js                            |   2 +-
 package.json                                  |   6 +-
 ...kmd-icon-1024.png => codimd-icon-1024.png} | Bin
 public/docs/features.md                       |   8 +--
 public/docs/yaml-metadata.md                  |   6 +-
 public/js/extra.js                            |   4 +-
 public/views/hackmd/header.ejs                |   2 +-
 public/views/index/body.ejs                   |   7 +-
 public/views/index/head.ejs                   |   2 +-
 public/views/shared/help-modal.ejs            |   4 +-
 16 files changed, 80 insertions(+), 82 deletions(-)
 rename public/{hackmd-icon-1024.png => codimd-icon-1024.png} (100%)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b002e54..40f7355 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,30 +1,30 @@
 # Contributing
 
 When contributing to this repository, please first discuss the change you wish to make via issue,
-email, or any other method with the owners of this repository before making a change. 
+email, or any other method with the owners of this repository before making a change.
 
 Please note we have a code of conduct, please follow it in all your interactions with the project.
 
 ## Pull Request Process
 1. Ensure you signed all your commits with Developer Certificate of Origin (DCO).
-2. Ensure any install or build dependencies are removed before the end of the layer when doing a 
+2. Ensure any install or build dependencies are removed before the end of the layer when doing a
    build.
-3. Update the README.md with details of changes to the interface, this includes new environment 
+3. Update the README.md with details of changes to the interface, this includes new environment
    variables, exposed ports, useful file locations and container parameters.
 4. Increase the version numbers in any examples files and the README.md to the new version that this
    Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/).
-5. You may merge the Pull Request in once you have the sign-off of two other developers, or if you 
+5. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
    do not have permission to do that, you may request the second reviewer to merge it for you.
 
 ## Contributor Code of Conduct
 
-As contributors and maintainers of this project, and in the interest of fostering an open and 
-welcoming community, we pledge to respect all people who contribute through reporting issues, 
-posting feature requests, updating documentation, submitting pull requests or patches, and other 
+As contributors and maintainers of this project, and in the interest of fostering an open and
+welcoming community, we pledge to respect all people who contribute through reporting issues,
+posting feature requests, updating documentation, submitting pull requests or patches, and other
 activities.
 
-We are committed to making participation in this project a harassment-free experience for everyone, 
-regardless of level of experience, gender, gender identity and expression, sexual orientation, 
+We are committed to making participation in this project a harassment-free experience for everyone,
+regardless of level of experience, gender, gender identity and expression, sexual orientation,
 disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
 
 Examples of unacceptable behavior by participants include:
@@ -37,26 +37,26 @@ Examples of unacceptable behavior by participants include:
   permission
 * Other unethical or unprofessional conduct.
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, 
-code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By 
-adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently 
-applying these principles to every aspect of managing this project. Project maintainers who do not 
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits,
+code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By
+adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently
+applying these principles to every aspect of managing this project. Project maintainers who do not
 follow or enforce the Code of Conduct may be permanently removed from the project team.
 
-This code of conduct applies both within project spaces and in public spaces when an individual is 
+This code of conduct applies both within project spaces and in public spaces when an individual is
 representing the project or its community.
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an 
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an
 issue or contacting one or more of the project maintainers.
 
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), 
-version 1.2.0, available at 
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org),
+version 1.2.0, available at
 [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)
 
 ### Sign your work
 
 We use the Developer Certificate of Origin (DCO) as a additional safeguard
-for the HackMD project. This is a well established and widely used
+for the CodiMD project. This is a well established and widely used
 mechanism to assure contributors have confirmed their right to license
 their contribution under the project's license.
 Please read [contribute/developer-certificate-of-origin][dcofile].
diff --git a/README.md b/README.md
index 095cc41..4255e71 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,18 @@
-HackMD Community Edition
+CodiMD
 ===
 
 [![Standard - JavaScript Style Guide][standardjs-image]][standardjs-url]
 
 [![Join the chat at https://gitter.im/hackmdio/hackmd][gitter-image]][gitter-url]
-[![#HackMD on matrix.org][matrix.org-image]][matrix.org-url]
+[![#CodiMD on matrix.org][matrix.org-image]][matrix.org-url]
 [![build status][travis-image]][travis-url]
 [![version][github-version-badge]][github-release-page]
 [![Help Contribute to Open Source][codetriage-image]][codetriage-url]
 [![POEditor][poeditor-image]][poeditor-url]
 
-HackMD lets you create realtime collaborative markdown notes on all platforms.
-Inspired by Hackpad, with more focus on speed and flexibility.
-Still in the early stage, feel free to fork or contribute to HackMD.
+CodiMD lets you create real-time collaborative markdown notes on all platforms.
+Inspired by Hackpad, with more focus on speed and flexibility, and build from [HackMD](https://hackmd.io) source code.
+Feel free to contribute.
 
 Thanks for using! :smile:
 
@@ -27,7 +27,7 @@ Thanks for using! :smile:
     - [Instructions](#instructions)
   - [Heroku Deployment](#heroku-deployment)
   - [Kubernetes](#kubernetes)
-  - [HackMD by docker container](#hackmd-by-docker-container)
+  - [CodiMD by docker container](#codimd-by-docker-container)
 - [Upgrade](#upgrade)
   - [Native setup](#native-setup)
 - [Configuration](#configuration)
@@ -60,7 +60,7 @@ Thanks for using! :smile:
 - Node.js 6.x or up (test up to 7.5.0)
 - Database (PostgreSQL, MySQL, MariaDB, SQLite, MSSQL) use charset `utf8`
 - npm (and its dependencies, especially [uWebSockets](https://github.com/uWebSockets/uWebSockets#nodejs-developers), [node-gyp](https://github.com/nodejs/node-gyp#installation))
-- For **building** HackMD we recommend to use a machine with at least **2GB** RAM
+- For **building** CodiMD we recommend to use a machine with at least **2GB** RAM
 
 ### Instructions
 
@@ -73,9 +73,9 @@ Thanks for using! :smile:
 
 ## Heroku Deployment
 
-You can quickly setup a sample Heroku HackMD application by clicking the button below.
+You can quickly setup a sample Heroku CodiMD application by clicking the button below.
 
-[![Deploy on Heroku](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/hackmdio/hackmd/tree/master)
+[![Deploy on Heroku](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/hackmdio/codimd/tree/master)
 
 If you deploy it without the button, keep in mind to use the right buildpacks. For details check `app.json`.
 
@@ -83,10 +83,10 @@ If you deploy it without the button, keep in mind to use the right buildpacks. F
 
 To install use `helm install stable/hackmd`.
 
-For all further details, please check out the offical HackMD  [K8s helm chart](https://github.com/kubernetes/charts/tree/master/stable/hackmd).
+For all further details, please check out the offical CodiMD  [K8s helm chart](https://github.com/kubernetes/charts/tree/master/stable/hackmd).
 
-## HackMD by docker container
-[![Try in PWD](https://cdn.rawgit.com/play-with-docker/stacks/cff22438/assets/images/button.png)](http://play-with-docker.com?stack=https://github.com/hackmdio/docker-hackmd/raw/master/docker-compose.yml&stack_name=hackmd)
+## CodiMD by docker container
+[![Try in PWD](https://cdn.rawgit.com/play-with-docker/stacks/cff22438/assets/images/button.png)](http://play-with-docker.com?stack=https://github.com/hackmdio/docker-hackmd/raw/master/docker-compose.yml&stack_name=codimd)
 
 
 **Debian-based version:**
@@ -98,11 +98,11 @@ For all further details, please check out the offical HackMD  [K8s helm chart](h
 
 [![alpine](https://images.microbadger.com/badges/version/hackmdio/hackmd:alpine.svg)](https://microbadger.com/images/hackmdio/hackmd:alpine "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/hackmdio/hackmd:alpine.svg)](https://microbadger.com/images/hackmdio/hackmd:alpine "Get your own image badge on microbadger.com")
 
-The easiest way to setup HackMD using docker are using the following three commands:
+The easiest way to setup CodiMD using docker are using the following three commands:
 
 ```console
 git clone https://github.com/hackmdio/docker-hackmd.git
-cd docker-hackmd
+cd docker-codimd
 docker-compose up
 ```
 Read more about it in the [docker repository…](https://github.com/hackmdio/docker-hackmd)
@@ -111,14 +111,14 @@ Read more about it in the [docker repository…](https://github.com/hackmdio/doc
 
 ## Native setup
 
-If you are upgrading HackMD from an older version, follow these steps:
+If you are upgrading CodiMD from an older version, follow these steps:
 
 1. Fully stop your old server first (important)
 2. `git pull` or do whatever that updates the files
 3. `npm install` to update dependencies
 4. Build front-end bundle by `npm run build` (use `npm run dev` if you are in development)
 5. Modify the file named `.sequelizerc`, change the value of the variable `url` with your db connection string
-   For example: `postgres://username:password@localhost:5432/hackmd`
+   For example: `postgres://username:password@localhost:5432/codimd`
 6. Run `node_modules/.bin/sequelize db:migrate`, this step will migrate your db to the latest schema
 7. Start your whole new server!
 
@@ -154,10 +154,10 @@ There are some config settings you need to change in the files below.
 | --------- | ------ | ----------- |
 | `NODE_ENV`  | `production` or `development` | set current environment (will apply corresponding settings in the `config.json`) |
 | `DEBUG` | `true` or `false` | set debug mode; show more logs |
-| `HMD_DOMAIN` | `hackmd.io` | domain name |
-| `HMD_URL_PATH` | `hackmd` | sub URL path, like `www.example.com/<URL_PATH>` |
+| `HMD_DOMAIN` | `codimd.org` | domain name |
+| `HMD_URL_PATH` | `codimd` | sub URL path, like `www.example.com/<URL_PATH>` |
 | `HMD_PORT` | `80` | web app port |
-| `HMD_ALLOW_ORIGIN` | `localhost, hackmd.io` | domain name whitelist (use comma to separate) |
+| `HMD_ALLOW_ORIGIN` | `localhost, codimd.org` | domain name whitelist (use comma to separate) |
 | `HMD_PROTOCOL_USESSL` | `true` or `false` | set to use SSL protocol for resources path (only applied when domain is set) |
 | `HMD_URL_ADDPORT` | `true` or `false` | set to add port on callback URL (ports `80` or `443` won't be applied) (only applied when domain is set) |
 | `HMD_USECDN` | `true` or `false` | set to use CDN resources or not (default is `true`) |
@@ -191,8 +191,8 @@ There are some config settings you need to change in the files below.
 | `HMD_LDAP_SEARCHBASE` | `o=users,dc=example,dc=com` | LDAP directory to begin search from |
 | `HMD_LDAP_SEARCHFILTER` | `(uid={{username}})` | LDAP filter to search with |
 | `HMD_LDAP_SEARCHATTRIBUTES` | `displayName, mail` | LDAP attributes to search with (use comma to separate) |
-| `HMD_LDAP_USERIDFIELD` | `uidNumber` or `uid` or `sAMAccountName` | The LDAP field which is used uniquely identify a user on HackMD |
-| `HMD_LDAP_USERNAMEFIELD` | Fallback to userid | The LDAP field which is used as the username on HackMD |
+| `HMD_LDAP_USERIDFIELD` | `uidNumber` or `uid` or `sAMAccountName` | The LDAP field which is used uniquely identify a user on CodiMD |
+| `HMD_LDAP_USERNAMEFIELD` | Fallback to userid | The LDAP field which is used as the username on CodiMD |
 | `HMD_LDAP_TLS_CA` | `server-cert.pem, root.pem` | Root CA for LDAP TLS in PEM format (use comma to separate) |
 | `HMD_LDAP_PROVIDERNAME` | `My institution` | Optional name to be displayed at login form indicating the LDAP provider |
 | `HMD_SAML_IDPSSOURL` | `https://idp.example.com/sso` | authentication endpoint of IdP. for details, see [guide](docs/guides/auth.md#saml-onelogin). |
@@ -235,7 +235,7 @@ There are some config settings you need to change in the files below.
 | --------- | ------ | ----------- |
 | `debug` | `true` or `false` | set debug mode, show more logs |
 | `domain` | `localhost` | domain name |
-| `urlPath` | `hackmd` | sub URL path, like `www.example.com/<urlpath>` |
+| `urlPath` | `codimd` | sub URL path, like `www.example.com/<urlpath>` |
 | `port` | `80` | web app port |
 | `allowOrigin` | `['localhost']` | domain name whitelist |
 | `useSSL` | `true` or `false` | set to use SSL server (if `true`, will auto turn on `protocolUseSSL`) |
@@ -249,9 +249,9 @@ There are some config settings you need to change in the files below.
 | `allowFreeURL` | `true` or `false` | set to allow new note creation by accessing a nonexistent note URL |
 | `defaultPermission` | `freely`, `editable`, `limited`, `locked`, `protected` or `private` | set notes default permission (only applied on signed users) |
 | `dbURL` | `mysql://localhost:3306/database` | set the db URL; if set, then db config (below) won't be applied |
-| `db` | `{ "dialect": "sqlite", "storage": "./db.hackmd.sqlite" }` | set the db configs, [see more here](http://sequelize.readthedocs.org/en/latest/api/sequelize/) |
+| `db` | `{ "dialect": "sqlite", "storage": "./db.codimd.sqlite" }` | set the db configs, [see more here](http://sequelize.readthedocs.org/en/latest/api/sequelize/) |
 | `sslKeyPath` | `./cert/client.key` | SSL key path (only need when you set `useSSL`) |
-| `sslCertPath` | `./cert/hackmd_io.crt` | SSL cert path (only need when you set `useSSL`) |
+| `sslCertPath` | `./cert/codimd_io.crt` | SSL cert path (only need when you set `useSSL`) |
 | `sslCAPath` | `['./cert/COMODORSAAddTrustCA.crt']` | SSL ca chain (only need when you set `useSSL`) |
 | `dhParamPath` | `./cert/dhparam.pem` | SSL dhparam path (only need when you set `useSSL`) |
 | `tmpPath` | `./tmp/` | temp directory path |
@@ -304,7 +304,7 @@ There are some config settings you need to change in the files below.
 ## Structure
 
 ```text
-hackmd/
+codimd/
 ├── tmp/            --- temporary files
 ├── docs/           --- document files
 ├── lib/            --- server libraries
@@ -330,15 +330,15 @@ See more at [http://operational-transformation.github.io/](http://operational-tr
 
 [gitter-image]: https://badges.gitter.im/Join%20Chat.svg
 [gitter-url]: https://gitter.im/hackmdio/hackmd?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
-[matrix.org-image]: https://img.shields.io/badge/Matrix.org-%23HackMD@matrix.org-green.svg
-[matrix.org-url]: https://riot.im/app/#/room/#hackmd:matrix.org
-[travis-image]: https://travis-ci.org/hackmdio/hackmd.svg?branch=master
-[travis-url]: https://travis-ci.org/hackmdio/hackmd
-[github-version-badge]: https://img.shields.io/github/release/hackmdio/hackmd.svg
-[github-release-page]: https://github.com/hackmdio/hackmd/releases
+[matrix.org-image]: https://img.shields.io/badge/Matrix.org-%23CodiMD@matrix.org-green.svg
+[matrix.org-url]: https://riot.im/app/#/room/#codimd:matrix.org
+[travis-image]: https://travis-ci.org/hackmdio/codimd.svg?branch=master
+[travis-url]: https://travis-ci.org/hackmdio/codimd
+[github-version-badge]: https://img.shields.io/github/release/hackmdio/codimd.svg
+[github-release-page]: https://github.com/hackmdio/codimd/releases
 [standardjs-image]: https://cdn.rawgit.com/feross/standard/master/badge.svg
 [standardjs-url]: https://github.com/feross/standard
-[codetriage-image]: https://www.codetriage.com/hackmdio/hackmd/badges/users.svg
-[codetriage-url]: https://www.codetriage.com/hackmdio/hackmd
+[codetriage-image]: https://www.codetriage.com/hackmdio/codimd/badges/users.svg
+[codetriage-url]: https://www.codetriage.com/hackmdio/codimd
 [poeditor-image]: https://img.shields.io/badge/POEditor-translate-blue.svg
 [poeditor-url]: https://poeditor.com/join/project/1OpGjF2Jir
diff --git a/app.js b/app.js
index bfb5a49..a9bd2ec 100644
--- a/app.js
+++ b/app.js
@@ -234,7 +234,7 @@ process.on('uncaughtException', function (err) {
 
 // install exit handler
 function handleTermSignals () {
-  logger.info('hackmd has been killed by signal, try to exit gracefully...')
+  logger.info('CodiMD has been killed by signal, try to exit gracefully...')
   realtime.maintenance = true
   // disconnect all socket.io clients
   Object.keys(io.sockets.sockets).forEach(function (key) {
diff --git a/app.json b/app.json
index 36877e6..6a6142e 100644
--- a/app.json
+++ b/app.json
@@ -1,5 +1,5 @@
 {
-    "name": "HackMD",
+    "name": "CodiMD",
     "description": "Realtime collaborative markdown notes on all platforms",
     "keywords": [
         "Collaborative",
@@ -7,8 +7,8 @@
         "Notes"
     ],
     "website": "https://hackmd.io",
-    "repository": "https://github.com/hackmdio/hackmd",
-    "logo": "https://github.com/hackmdio/hackmd/raw/master/public/hackmd-icon-1024.png",
+    "repository": "https://github.com/hackmdio/codimd",
+    "logo": "https://github.com/hackmdio/codimd/raw/master/public/codimd-icon-1024.png",
     "success_url": "/",
     "env": {
         "BUILD_ASSETS": {
diff --git a/bin/setup b/bin/setup
index 3edffc4..122cb7a 100755
--- a/bin/setup
+++ b/bin/setup
@@ -33,11 +33,10 @@ BUILD_ASSETS=false npm install
 cat << EOF
 
 
-Edit the following config file to setup hackmd server and client.
-Read more info at https://github.com/hackmdio/hackmd#configuration-files
+Edit the following config file to setup CodiMD server and client.
+Read more info at https://github.com/hackmdio/codimd#configuration-files
 
-* config.json           -- server config
-* public/js/config.js   -- client config
+* config.json           -- CodiMD config
 * .sequelizerc          -- db config
 
 EOF
diff --git a/config.json.example b/config.json.example
index e07052b..1f2ec3d 100644
--- a/config.json.example
+++ b/config.json.example
@@ -11,7 +11,7 @@
         },
         "db": {
             "dialect": "sqlite",
-            "storage": "./db.hackmd.sqlite"
+            "storage": "./db.codimd.sqlite"
         }
     },
     "production": {
@@ -34,7 +34,7 @@
         "db": {
             "username": "",
             "password": "",
-            "database": "hackmd",
+            "database": "codimd",
             "host": "localhost",
             "port": "5432",
             "dialect": "postgres"
diff --git a/lib/models/note.js b/lib/models/note.js
index 7d8e962..ec7e2b1 100644
--- a/lib/models/note.js
+++ b/lib/models/note.js
@@ -301,7 +301,7 @@ module.exports = function (sequelize, DataTypes) {
         return title || 'Untitled'
       },
       generateWebTitle: function (title) {
-        title = !title || title === 'Untitled' ? 'HackMD - Collaborative markdown notes' : title + ' - HackMD'
+        title = !title || title === 'Untitled' ? 'CodiMD - Collaborative markdown notes' : title + ' - CodiMD'
         return title
       },
       extractNoteTags: function (meta, $) {
diff --git a/package.json b/package.json
index 20920e2..442d00a 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "hackmd",
+  "name": "CodiMD",
   "version": "1.1.1-ce",
   "description": "Realtime collaborative markdown notes on all platforms.",
   "main": "app.js",
@@ -136,7 +136,7 @@
   "engines": {
     "node": ">=6.x <10.x"
   },
-  "bugs": "https://github.com/hackmdio/hackmd/issues",
+  "bugs": "https://github.com/hackmdio/codimd/issues",
   "keywords": [
     "Collaborative",
     "Markdown",
@@ -151,7 +151,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/hackmdio/hackmd.git"
+    "url": "https://github.com/hackmdio/codimd.git"
   },
   "devDependencies": {
     "babel-cli": "^6.18.0",
diff --git a/public/hackmd-icon-1024.png b/public/codimd-icon-1024.png
similarity index 100%
rename from public/hackmd-icon-1024.png
rename to public/codimd-icon-1024.png
diff --git a/public/docs/features.md b/public/docs/features.md
index dc6ddaf..f684ca6 100644
--- a/public/docs/features.md
+++ b/public/docs/features.md
@@ -3,12 +3,12 @@ Features
 
 Introduction
 ===
-<i class="fa fa-file-text"></i> **HackMD** is a realtime, multi-platform collaborative markdown note editor.
+<i class="fa fa-file-text"></i> **CodiMD** is a real-time, multi-platform collaborative markdown note editor.
 This means that you can write notes with other people on your **desktop**, **tablet** or even on the **phone**.
 You can sign-in via multiple auth providers like **Facebook**, **Twitter**, **GitHub** and many more on the [_homepage_](/).
 
-If you experience any _issues_, feel free to report it on [**GitHub**](https://github.com/hackmdio/hackmd/issues).
-Or meet us on [**Matrix.org**](https://riot.im/app/#/room/#hackmd:matrix.org) or [**Gitter**](https://gitter.im/hackmdio/hackmd) for dev-talk and interactive help.
+If you experience any _issues_, feel free to report it on [**GitHub**](https://github.com/hackmdio/codimd/issues).
+Or meet us on [**Matrix.org**](https://riot.im/app/#/room/#codimd:matrix.org) or [**Gitter**](https://gitter.im/hackmdio/hackmd) for dev-talk and interactive help.
 **Thank you very much!**
 
 Workspace
@@ -26,7 +26,7 @@ Workspace
 <i class="fa fa-toggle-off fa-fw"></i> Edit: See only the editor.
 
 ## Night Mode:
-When you are tired of a white screen and like a night mode, click on the little moon <i class="fa fa-moon-o"></i> and turn on the night view of HackMD.
+When you are tired of a white screen and like a night mode, click on the little moon <i class="fa fa-moon-o"></i> and turn on the night view of CodiMD.
 
 The editor view, which is in night mode by default, can also be toggled between night and day view using the the little sun<i class="fa fa-sun-o fa-fw"></i>.
 
diff --git a/public/docs/yaml-metadata.md b/public/docs/yaml-metadata.md
index d49418f..888345f 100644
--- a/public/docs/yaml-metadata.md
+++ b/public/docs/yaml-metadata.md
@@ -96,7 +96,7 @@ dir: rtl
 breaks
 ---
 This option means the hardbreaks in the note will be parsed or be ignore.
-The original markdown syntax breaks only if you put space twice, but HackMD choose to breaks every time you enter a break.
+The original markdown syntax breaks only if you put space twice, but CodiMD choose to breaks every time you enter a break.
 You can only use whether `true` or `false`.
 
 > default: not set (which will be true)
@@ -125,7 +125,7 @@ This option allow you to enable Disqus with your shortname.
 
 **Example**
 ```xml
-disqus: hackmd
+disqus: codimd
 ```
 
 slideOptions
@@ -146,4 +146,4 @@ https://github.com/hakimel/reveal.js/tree/master/css/theme
 slideOptions:
   transition: fade
   theme: white
-```
\ No newline at end of file
+```
diff --git a/public/js/extra.js b/public/js/extra.js
index dbb0f45..d6bbb0c 100644
--- a/public/js/extra.js
+++ b/public/js/extra.js
@@ -105,9 +105,9 @@ function getTitle (view) {
 export function renderTitle (view) {
   let title = getTitle(view)
   if (title) {
-    title += ' - HackMD'
+    title += ' - CodiMD'
   } else {
-    title = 'HackMD - Collaborative markdown notes'
+    title = 'CodiMD - Collaborative markdown notes'
   }
   return title
 }
diff --git a/public/views/hackmd/header.ejs b/public/views/hackmd/header.ejs
index 21b632c..8fc050b 100644
--- a/public/views/hackmd/header.ejs
+++ b/public/views/hackmd/header.ejs
@@ -13,7 +13,7 @@
             <ul class="dropdown-menu list" role="menu" aria-labelledby="menu">
             </ul>
         </div>
-        <a class="navbar-brand pull-left" href="<%- url %>/"><i class="fa fa-file-text"></i> HackMD</a>
+        <a class="navbar-brand pull-left" href="<%- url %>/"><i class="fa fa-file-text"></i> CodiMD</a>
         <div class="nav-mobile pull-right visible-xs">
             <span class="btn btn-link btn-file ui-upload-image" title="Upload Image" style="display:none;">
                 <i class="fa fa-camera"></i><input type="file" accept="image/*" name="upload" multiple>
diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs
index 220e0da..a0de8c3 100644
--- a/public/views/index/body.ejs
+++ b/public/views/index/body.ejs
@@ -40,8 +40,7 @@
 
             <div id="home" class="section"<% if(signin) { %> style="display:none;"<% } %>>
                 <div class="inner cover">
-                    <h1 class="cover-heading"><i class="fa fa-file-text"></i> HackMD</h1>
-                    <p class="lead"><strong>Community Edition</strong></p>
+                    <h1 class="cover-heading"><i class="fa fa-file-text"></i> CodiMD</h1>
                     <p class="lead">
                         <%= __('Best way to write and share your knowledge in markdown.') %>
                     </p>
@@ -150,10 +149,10 @@
                         <option value="ko">한국어</option>
                     </select>
                     <p>
-                        &copy; 2018 <a href="https://hackmd.io">HackMD</a> | <a href="<%- url %>/s/release-notes" target="_blank"><%= __('Releases') %></a><% if(privacyStatement) { %> | <a href="<%- url %>/s/privacy" target="_blank"><%= __('Privacy') %></a><% } %><% if(termsOfUse) { %> | <a href="<%- url %>/s/terms-of-use" target="_blank"><%= __('Terms of Use') %></a><% } %>
+                        &copy; 2018 <a href="https://hackmd.io">CodiMD</a> | <a href="<%- url %>/s/release-notes" target="_blank"><%= __('Releases') %></a><% if(privacyStatement) { %> | <a href="<%- url %>/s/privacy" target="_blank"><%= __('Privacy') %></a><% } %><% if(termsOfUse) { %> | <a href="<%- url %>/s/terms-of-use" target="_blank"><%= __('Terms of Use') %></a><% } %>
                     </p>
                     <h6 class="social-foot">
-                        <%- __('Follow us on %s and %s.', '<a href="https://github.com/hackmdio/HackMD" target="_blank"><i class="fa fa-github"></i> GitHub</a>, <a href="https://twitter.com/hackmdio" target="_blank"><i class="fa fa-twitter"></i> Twitter</a>', '<a href="https://www.facebook.com/hackmdio" target="_blank"><i class="fa fa-facebook-square"></i> Facebook</a>') %>
+                        <%- __('Follow us on %s and %s.', '<a href="https://github.com/hackmdio/CodiMD" target="_blank"><i class="fa fa-github"></i> GitHub</a>, <a href="https://twitter.com/hackmdio" target="_blank"><i class="fa fa-twitter"></i> Twitter</a>', '<a href="https://www.facebook.com/hackmdio" target="_blank"><i class="fa fa-facebook-square"></i> Facebook</a>') %>
                     </h6>
                 </div>
             </div>
diff --git a/public/views/index/head.ejs b/public/views/index/head.ejs
index e43c57d..f826d9e 100644
--- a/public/views/index/head.ejs
+++ b/public/views/index/head.ejs
@@ -6,7 +6,7 @@
 <meta name="mobile-web-app-capable" content="yes">
 <meta name="description" content="<%= __('Best way to write and share your knowledge in markdown.') %>">
 <meta name="keywords" content="Collaborative, Markdown, Notes">
-<title>HackMD - <%= __('Collaborative markdown notes') %></title>
+<title>CodiMD - <%= __('Collaborative markdown notes') %></title>
 <link rel="icon" type="image/png" href="<%- url %>/favicon.png">
 <link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png">
 <% if(useCDN) { %>
diff --git a/public/views/shared/help-modal.ejs b/public/views/shared/help-modal.ejs
index 6bcf637..7d6576d 100644
--- a/public/views/shared/help-modal.ejs
+++ b/public/views/shared/help-modal.ejs
@@ -15,9 +15,9 @@
                                 <h3 class="panel-title"><%= __('Contacts') %></h3>
                             </div>
                             <div class="panel-body">
-                                <a href="https://github.com/hackmdio/hackmd/issues" target="_blank"><i class="fa fa-tag fa-fw"></i> <%= __('Report an issue') %></a>
+                                <a href="https://github.com/hackmdio/codimd/issues" target="_blank"><i class="fa fa-tag fa-fw"></i> <%= __('Report an issue') %></a>
                                 <br>
-                                <a href="https://riot.im/app/#/room/#hackmd:matrix.org" target="_blank"><i class="fa fa-hashtag fa-fw"></i> <%= __('Meet us on %s', 'Matrix') %></a>
+                                <a href="https://riot.im/app/#/room/#codimd:matrix.org" target="_blank"><i class="fa fa-hashtag fa-fw"></i> <%= __('Meet us on %s', 'Matrix') %></a>
                                 <br>
                                 <a href="https://gitter.im/hackmdio/hackmd" target="_blank"><i class="fa fa-comments fa-fw"></i> <%= __('Meet us on %s', 'Gitter') %></a>
                             </div>

From ddb52bf3c8fdeac4a2426862730906c5ad22e95c Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 22 Jun 2018 22:12:47 +0200
Subject: [PATCH 28/74] Remove outdated contributors file

We can remove this contributors file, since it doesn't provide any more
information than git blame does anyways.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 CONTRIBUTORS | 902 ---------------------------------------------------
 1 file changed, 902 deletions(-)
 delete mode 100644 CONTRIBUTORS

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
deleted file mode 100644
index d5e679c..0000000
--- a/CONTRIBUTORS
+++ /dev/null
@@ -1,902 +0,0 @@
-=== .babelrc
-Yukai Huang <yukaihuangtw@gmail.com>
-=== .editorconfig
-bananaappletw <bananaappletw@gmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== .gitignore
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== .sequelizerc.example
-Yukai Huang <yukaihuangtw@gmail.com>
-=== .travis.yml
-bananaappletw <bananaappletw@gmail.com>
-BoHong Li <a60814billy@gmail.com>
-Max Wu <jackymaxj@gmail.com>
-Peter Dave Hello <hsu@peterdavehello.org>
-=== AUTHORS
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== CONTRIBUTING.md
-Max Wu <jackymaxj@gmail.com>
-=== LICENSE
-Cheng-Han, Wu <jackymaxj@gmail.com>
-jackycute <jacky_cute0808@hotmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== README.md
-alecdwm <alec@owls.io>
-bananaappletw <bananaappletw@gmail.com>
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Florian Rhiem <florian.rhiem@gmail.com>
-jackycute <jackymaxj@gmail.com>
-Jannik Lorenz <dev@janniklorenz.de>
-Jason Croft <jcroft@velocity.org>
-Johannes Weißl <jargon@molb.org>
-Jun SAKATA <jun.bj141400@gmail.com>
-Laura Kyle <laura.kyle91@gmail.com>
-Max Wu <jackymaxj@gmail.com>
-neopostmodern <clemens@neopostmodern.com>
-NV <nvsofts@gmail.com>
-Sheogorath <sheogorath@shivering-isles.com>
-The Gitter Badger <badger@gitter.im>
-Wonder Chang <iwonder.tw@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-蒼時弦也 <elct9620@frost.tw>
-=== app.js
-alecdwm <alec@owls.io>
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-James Stephenson <c4p7.fl1n7@gmail.com>
-Jan Kunzmann <jan-github@phobia.de>
-Jason Croft <jcroft@velocity.org>
-Jordan Matelsky <j6k4m8@gmail.com>
-knjcode <knjcode@gmail.com>
-LluisArevalo <thorin119@gmail.com>
-Max Wu <jackymaxj@gmail.com>
-NV <nvsofts@gmail.com>
-Peter Dave Hello <hsu@peterdavehello.org>
-Raccoon Li <a60814billy@gmail.com>
-robert <ahmerov.rt@molodost.bz>
-Sheogorath <sheogorath@shivering-isles.com>
-S.Noda <noda@fenrir.co.jp>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-xnum <s000032001@gmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== app.json
-bananaappletw <bananaappletw@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== bin/heroku
-bananaappletw <bananaappletw@gmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== bin/setup
-Sheogorath <sheogorath@shivering-isles.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== config.json.example
-alecdwm <alec@owls.io>
-bananaappletw <bananaappletw@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== docs/guides/images/s3-image-upload/bucket-policy-editor.png
-Yukai Huang <yukaihuangtw@gmail.com>
-=== docs/guides/images/s3-image-upload/bucket-property.png
-Yukai Huang <yukaihuangtw@gmail.com>
-=== docs/guides/images/s3-image-upload/create-bucket.png
-Yukai Huang <yukaihuangtw@gmail.com>
-=== docs/guides/images/s3-image-upload/custom-policy.png
-Yukai Huang <yukaihuangtw@gmail.com>
-=== docs/guides/images/s3-image-upload/iam-user.png
-Yukai Huang <yukaihuangtw@gmail.com>
-=== docs/guides/images/s3-image-upload/review-policy.png
-Yukai Huang <yukaihuangtw@gmail.com>
-=== docs/guides/s3-image-upload.md
-Johannes Weißl <jargon@molb.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== lib/config/default.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/config/defaultSSL.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/config/dockerSecret.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/config/enum.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/config/environment.js
-BoHong Li <a60814billy@gmail.com>
-Raccoon Li <a60814billy@gmail.com>
-=== lib/config/index.js
-BoHong Li <a60814billy@gmail.com>
-tkykm <tkykm@users.noreply.github.com>
-=== lib/config/oldEnvironment.js
-BoHong Li <a60814billy@gmail.com>
-Raccoon Li <a60814billy@gmail.com>
-=== lib/config/utils.js
-Raccoon Li <a60814billy@gmail.com>
-=== lib/history.js
-BoHong Li <a60814billy@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/letter-avatars.js
-alecdwm <alec@owls.io>
-BoHong Li <a60814billy@gmail.com>
-=== lib/logger.js
-BoHong Li <a60814billy@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/migrations/20150504155329-create-users.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/migrations/20150508114741-create-notes.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/migrations/20150515125813-create-temp.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/migrations/20150702001020-update-to-0_3_1.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/migrations/20150915153700-change-notes-title-to-text.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/migrations/20160112220142-note-add-lastchange.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/migrations/20160420180355-note-add-alias.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/migrations/20160515114000-user-add-tokens.js
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-=== lib/migrations/20160607060246-support-revision.js
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/migrations/20160703062241-support-authorship.js
-BoHong Li <a60814billy@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/migrations/20161009040430-support-delete-note.js
-BoHong Li <a60814billy@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/migrations/20161201050312-support-email-signin.js
-BoHong Li <a60814billy@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/models/author.js
-BoHong Li <a60814billy@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/models/index.js
-bananaappletw <bananaappletw@gmail.com>
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== lib/models/note.js
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-NV <nvsofts@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-蒼時弦也 <elct9620@frost.tw>
-=== lib/models/revision.js
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/models/temp.js
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-=== lib/models/user.js
-alecdwm <alec@owls.io>
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Jason Croft <jcroft@velocity.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/ot/client.js
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/ot/editor-socketio-server.js
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/ot/index.js
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/ot/selection.js
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/ot/server.js
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/ot/simple-text-operation.js
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/ot/text-operation.js
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/ot/wrapped-operation.js
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== lib/realtime.js
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Florian Rhiem <florian.rhiem@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-蒼時弦也 <elct9620@frost.tw>
-=== lib/response.js
-alecdwm <alec@owls.io>
-BoHong Li <a60814billy@gmail.com>
-butlerx <butlerx@notthe.cloud>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Florian Rhiem <florian.rhiem@gmail.com>
-Ikumi Shimizu <193s@users.noreply.github.com>
-Jannik Lorenz <dev@janniklorenz.de>
-Jason Croft <jcroft@velocity.org>
-Sheogorath <sheogorath@shivering-isles.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-xnum <s000032001@gmail.com>
-蒼時弦也 <elct9620@frost.tw>
-=== lib/utils.js
-BoHong Li <a60814billy@gmail.com>
-butlerx <butlerx@notthe.cloud>
-LluisArevalo <thorin119@gmail.com>
-=== lib/web/auth/dropbox/index.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/web/auth/email/index.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/web/auth/facebook/index.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/web/auth/github/index.js
-BoHong Li <a60814billy@gmail.com>
-Max Wu <jackymaxj@gmail.com>
-=== lib/web/auth/gitlab/index.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/web/auth/google/index.js
-BoHong Li <a60814billy@gmail.com>
-Kaiyu Shi <skyisno.1@gmail.com>
-=== lib/web/auth/index.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/web/auth/ldap/index.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/web/auth/twitter/index.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/web/auth/utils.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/web/baseRouter.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/web/historyRouter.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/web/imageRouter.js
-BoHong Li <a60814billy@gmail.com>
-Kotaro Yamamoto <kota.crk@gmail.com>
-Raccoon Li <a60814billy@gmail.com>
-=== lib/web/middleware/checkURIValid.js
-BoHong Li <a60814billy@gmail.com>
-Max Wu <jackymaxj@gmail.com>
-=== lib/web/middleware/redirectWithoutTrailingSlashes.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/web/middleware/tooBusy.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/web/noteRouter.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/web/statusRouter.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/web/userRouter.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/web/utils.js
-BoHong Li <a60814billy@gmail.com>
-=== lib/workers/dmpWorker.js
-BoHong Li <a60814billy@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== locales/ca.json
-Xavier Marques <xaviermarques4f@gmail.com>
-=== locales/da.json
-Patrick Andersen <patrick@bacha.dk>
-=== locales/de.json
-Jannik Lorenz <dev@janniklorenz.de>
-Philipp Zumstein <zuphilip@users.noreply.github.com>
-Simon Joda Stößer <SimJoSt@users.noreply.github.com>
-=== locales/el.json
-Stratos Gerakakis <stratosgear@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-zachariast <zachariastraianos@gmail.com>
-=== locales/en.json
-alecdwm <alec@owls.io>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== locales/eo.json
-James Stephenson <c4p7.fl1n7@gmail.com>
-=== locales/es.json
-Pablo Guerrero <pablo.guerrero@sap.com>
-Sergio Valverde <svg153@users.noreply.github.com>
-=== locales/fr.json
-Colin Maudry <colin@maudry.com>
-Ho33e5 <ho33e5@gmail.com>
-=== locales/hi.json
-Paras <paraschadha2052@gmail.com>
-=== locales/hr.json
-ivanorsolic <ivanorsolic@users.noreply.github.com>
-=== locales/it.json
-GhiMax <ghina8@gmail.com>
-=== locales/ja.json
-tkqubo <tk.qubo@gmail.com>
-=== locales/nl.json
-Martijnpold <martijntje7@gmail.com>
-Tom Wyckhuys <tomwyckhuys@gmail.com>
-=== locales/pl.json
-Bartlomiej Szala <fenix440@gmail.com>
-Jakub Sygnowski <sygnowski@gmail.com>
-=== locales/pt.json
-Marcelo Alencar <marceloalves@ufpa.br>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== locales/ru.json
-Himura Kazuto <Himura2la@users.noreply.github.com>
-p0v1n0m <p0v1n0m@gmail.com>
-=== locales/sv.json
-Lars Karlsson <lars@kajes.se>
-Patrick Andersen <patrick@bacha.dk>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== locales/tr.json
-Ömer Erdinç Yağmurlu <omeryagmurlu@gmail.com>
-=== locales/uk.json
-Dmytro Kytsmen <dmitrokytsmen@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== locales/zh.json
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== package.json
-alecdwm <alec@owls.io>
-bananaappletw <bananaappletw@gmail.com>
-BoHong Li <a60814billy@gmail.com>
-Bryan Davis <bd808@wikimedia.org>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Fabien Meghazi <agr@amigrave.com>
-greenkeeperio-bot <support@greenkeeper.io>
-Jason Croft <jcroft@velocity.org>
-Max Wu <jackymaxj@gmail.com>
-Peter Dave Hello <hsu@peterdavehello.org>
-Peter Dave Hello <PeterDaveHello@users.noreply.github.com>
-Sheogorath <sheogorath@shivering-isles.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-xnum <s000032001@gmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/apple-touch-icon.png
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/css/bootstrap-social.css
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/css/center.css
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/css/cover.css
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Jason Croft <jcroft@velocity.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/css/extra.css
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/css/font.css
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/css/github-extract.css
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/css/google-font.css
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/css/index.css
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Jason Croft <jcroft@velocity.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/css/markdown.css
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/css/mermaid.css
-Cheng-Han, Wu <jackymaxj@gmail.com>
-=== public/css/site.css
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/css/slide-preview.css
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/css/slide.css
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/default.md
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/docs/features.md
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Max Wu <jackymaxj@gmail.com>
-Pablo Guerrero <pablo.guerrero@gmail.com>
-Sheogorath <sheogorath@shivering-isles.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/docs/release-notes.md
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/docs/slide-example.md
-butlerx <butlerx@notthe.cloud>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/docs/yaml-metadata.md
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/favicon.png
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/fonts/SourceCodePro-Black.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Black.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Black.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Bold.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Bold.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Bold.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-ExtraLight.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-ExtraLight.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-ExtraLight.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Light.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Light.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Light.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Medium.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Medium.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Medium.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Regular.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Regular.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Regular.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Semibold.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Semibold.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceCodePro-Semibold.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Black.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Black.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Black.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-BlackItalic.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-BlackItalic.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-BlackItalic.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Bold.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Bold.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Bold.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-BoldItalic.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-BoldItalic.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-BoldItalic.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-ExtraLight.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-ExtraLight.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-ExtraLight.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-ExtraLightItalic.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-ExtraLightItalic.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-ExtraLightItalic.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Italic.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Italic.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Italic.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Light.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Light.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Light.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-LightItalic.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-LightItalic.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-LightItalic.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Regular.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Regular.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Regular.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Semibold.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Semibold.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-Semibold.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-SemiboldItalic.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-SemiboldItalic.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSansPro-SemiboldItalic.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSerifPro-Bold.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSerifPro-Bold.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSerifPro-Bold.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSerifPro-Regular.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSerifPro-Regular.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSerifPro-Regular.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSerifPro-Semibold.eot
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSerifPro-Semibold.ttf
-Peter Dave Hello <hsu@peterdavehello.org>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/fonts/SourceSerifPro-Semibold.woff
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/hackmd-icon-1024.png
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/js/cover.js
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Jason Croft <jcroft@velocity.org>
-NV <nvsofts@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/extra.js
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-NV <nvsofts@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/google-drive-picker.js
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Max Wu <jackymaxj@gmail.com>
-=== public/js/google-drive-upload.js
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/js/history.js
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/htmlExport.js
-BoHong Li <a60814billy@gmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/index.js
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Jason Croft <jcroft@velocity.org>
-Laura Kyle <laura.kyle91@gmail.com>
-NV <nvsofts@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-xnum <s000032001@gmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-Zankio <xxoojoeooxx1@gmail.com>
-蒼時弦也 <elct9620@frost.tw>
-=== public/js/lib/appState.js
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/lib/common/constant.ejs
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/js/lib/common/login.js
-BoHong Li <a60814billy@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/lib/config/index.js
-BoHong Li <a60814billy@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/lib/editor/config.js
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/lib/editor/index.js
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/lib/editor/statusbar.html
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/lib/editor/ui-elements.js
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/lib/editor/utils.js
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/lib/modeType.js
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/lib/syncscroll.js
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/locale.js
-BoHong Li <a60814billy@gmail.com>
-Peter Dave Hello <PeterDaveHello@users.noreply.github.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/pretty.js
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/render.js
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/js/reveal-markdown.js
-BoHong Li <a60814billy@gmail.com>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/js/slide.js
-BoHong Li <a60814billy@gmail.com>
-Max Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/screenshot.png
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/uploads/.gitkeep
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/vendor/abcjs_basic_3.1.1-min.js
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/bootstrap/tooltip.min.css
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/bootstrap/tooltip.min.js
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/codemirror-spell-checker/en_US.aff
-Cheng-Han, Wu <jackymaxj@gmail.com>
-=== public/vendor/codemirror-spell-checker/en_US.dic
-Cheng-Han, Wu <jackymaxj@gmail.com>
-=== public/vendor/codemirror-spell-checker/spell-checker.min.css
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/codemirror-spell-checker/spell-checker.min.js
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/vendor/inlineAttachment/codemirror.inline-attachment.js
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/inlineAttachment/inline-attachment.js
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/jquery-textcomplete/jquery.textcomplete.js
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/jquery-ui/images/ui-bg_glass_75_dadada_1x400.png
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/jquery-ui/images/ui-icons_222222_256x240.png
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/jquery-ui/images/ui-icons_2e83ff_256x240.png
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/jquery-ui/images/ui-icons_454545_256x240.png
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/jquery-ui/images/ui-icons_888888_256x240.png
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/jquery-ui/images/ui-icons_cd0a0a_256x240.png
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/jquery-ui/jquery-ui.min.css
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/jquery-ui/jquery-ui.min.js
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/md-toc.js
-BoHong Li <a60814billy@gmail.com>
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/ot/ajax-adapter.js
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/ot/client.js
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/ot/codemirror-adapter.js
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/ot/compress.sh
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/ot/editor-client.js
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/ot/ot.min.js
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/ot/selection.js
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/ot/socketio-adapter.js
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/ot/text-operation.js
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/ot/undo-manager.js
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/ot/wrapped-operation.js
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/showup/showup.css
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/vendor/showup/showup.js
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/views/error.ejs
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/views/hackmd.ejs
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/views/hackmd/body.ejs
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Florian Rhiem <florian.rhiem@gmail.com>
-Ian Dees <ian.dees@gmail.com>
-Jason Croft <jcroft@velocity.org>
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-蒼時弦也 <elct9620@frost.tw>
-=== public/views/hackmd/foot.ejs
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Jannik Lorenz <dev@janniklorenz.de>
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/views/hackmd/footer.ejs
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/views/hackmd/head.ejs
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-xnum <s000032001@gmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/views/hackmd/header.ejs
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Jannik Lorenz <dev@janniklorenz.de>
-Jason Croft <jcroft@velocity.org>
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-xnum <s000032001@gmail.com>
-=== public/views/html.hbs
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/views/includes/header.ejs
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/views/includes/scripts.ejs
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/views/index.ejs
-alecdwm <alec@owls.io>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Florian Rhiem <florian.rhiem@gmail.com>
-James Stephenson <c4p7.fl1n7@gmail.com>
-Jannik Lorenz <dev@janniklorenz.de>
-Jason Croft <jcroft@velocity.org>
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/views/index/body.ejs
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/views/index/foot.ejs
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/views/index/footer.ejs
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/views/index/head.ejs
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-xnum <s000032001@gmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/views/index/header.ejs
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/views/pretty.ejs
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== public/views/shared/disqus.ejs
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/views/shared/ga.ejs
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/views/shared/help-modal.ejs
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/views/shared/polyfill.ejs
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/views/shared/refresh-modal.ejs
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/views/shared/revision-modal.ejs
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/views/shared/signin-modal.ejs
-alecdwm <alec@owls.io>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Jason Croft <jcroft@velocity.org>
-neopostmodern <clemens@neopostmodern.com>
-Sheogorath <sheogorath@shivering-isles.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== public/views/slide.ejs
-butlerx <butlerx@notthe.cloud>
-Cheng-Han, Wu <jackymaxj@gmail.com>
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== tmp/.keep
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-=== webpack.config.js
-BoHong Li <a60814billy@gmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== webpack.production.js
-BoHong Li <a60814billy@gmail.com>
-geekyd <singhsince94@gmail.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== webpackBaseConfig.js
-BoHong Li <a60814billy@gmail.com>
-Peter Dave Hello <hsu@peterdavehello.org>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>
-=== yarn.lock
-BoHong Li <a60814billy@gmail.com>
-Christian Schuhmann <madebyherzblut@users.noreply.github.com>
-Wu Cheng-Han <jacky_cute0808@hotmail.com>
-Yukai Huang <yukaihuangtw@gmail.com>

From 12d11f3f3f61c43aebfe77d83a17b850598000e6 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 24 Jun 2018 13:06:50 +0200
Subject: [PATCH 29/74] Add background story about the renaming

We want to communicate transparent. So we should state very clear what
CodiMD is and what makes it different from HackMD and at the same time
how we are related and that there are no bad boys involved.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index 4255e71..d9301de 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,7 @@ Thanks for using! :smile:
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 # Table of Contents
 
+- [HackMD CE became CodiMD](#hackmd-ce-became-codimd)
 - [Browsers Requirement](#browsers-requirement)
 - [Installation](#installation)
   - [Getting started (Native install)](#getting-started-native-install)
@@ -42,6 +43,16 @@ Thanks for using! :smile:
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
+# HackMD CE became CodiMD
+
+CodiMD was recently renamed from its former name was HackMD. CodiMD is the free software version of HackMD. It was the original Version of HackMD. The HackMD team initiated CodiMD and provided a solid code base. Due to the need of paying bills, A fork was created and called HackMD EE, which is a SaaS (Software as a Service) product available at [hackmd.io](https://hackmd.io).
+
+We decided to change the name to break the confusion between HackMD and CodiMD, formally known as HackMD CE, as it never was an open core project.
+
+Just to more confusion: We are still friends with HackMD :heart:
+
+*For the whole renaming story, see the [related issue](https://github.com/hackmdio/hackmd/issues/720)*
+
 # Browsers Requirement
 
 - ![Chrome](http://browserbadge.com/chrome/47/18px) Chrome >= 47, Chrome for Android >= 47

From b242b59db4b27bac345d98f982def7c54955c84c Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 24 Jun 2018 13:22:51 +0200
Subject: [PATCH 30/74] Rename environment variables and add legacy support.

As we are no longer HackMD the short tag `HMD` doesn't match anymore. We
move it to the matching prefix `CMD` and inform our users about the
change.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 README.md                       | 150 ++++++++++++++--------------
 lib/config/environment.js       | 170 ++++++++++++++++----------------
 lib/config/hackmdEnvironment.js | 124 +++++++++++++++++++++++
 lib/config/index.js             |   6 ++
 4 files changed, 291 insertions(+), 159 deletions(-)
 create mode 100644 lib/config/hackmdEnvironment.js

diff --git a/README.md b/README.md
index d9301de..4cae291 100644
--- a/README.md
+++ b/README.md
@@ -165,80 +165,82 @@ There are some config settings you need to change in the files below.
 | --------- | ------ | ----------- |
 | `NODE_ENV`  | `production` or `development` | set current environment (will apply corresponding settings in the `config.json`) |
 | `DEBUG` | `true` or `false` | set debug mode; show more logs |
-| `HMD_DOMAIN` | `codimd.org` | domain name |
-| `HMD_URL_PATH` | `codimd` | sub URL path, like `www.example.com/<URL_PATH>` |
-| `HMD_PORT` | `80` | web app port |
-| `HMD_ALLOW_ORIGIN` | `localhost, codimd.org` | domain name whitelist (use comma to separate) |
-| `HMD_PROTOCOL_USESSL` | `true` or `false` | set to use SSL protocol for resources path (only applied when domain is set) |
-| `HMD_URL_ADDPORT` | `true` or `false` | set to add port on callback URL (ports `80` or `443` won't be applied) (only applied when domain is set) |
-| `HMD_USECDN` | `true` or `false` | set to use CDN resources or not (default is `true`) |
-| `HMD_ALLOW_ANONYMOUS` | `true` or `false` | set to allow anonymous usage (default is `true`) |
-| `HMD_ALLOW_ANONYMOUS_EDITS` | `true` or `false` | if `allowAnonymous` is `true`, allow users to select `freely` permission, allowing guests to edit existing notes (default is `false`) |
-| `HMD_ALLOW_FREEURL` | `true` or `false` | set to allow new note creation by accessing a nonexistent note URL |
-| `HMD_DEFAULT_PERMISSION` | `freely`, `editable`, `limited`, `locked` or `private` | set notes default permission (only applied on signed users) |
-| `HMD_DB_URL` | `mysql://localhost:3306/database` | set the database URL |
-| `HMD_SESSION_SECRET` | no example | Secret used to sign the session cookie. If non is set, one will randomly generated on startup |
-| `HMD_SESSION_LIFE` | `1209600000` | Session life time. (milliseconds) |
-| `HMD_FACEBOOK_CLIENTID` | no example | Facebook API client id |
-| `HMD_FACEBOOK_CLIENTSECRET` | no example | Facebook API client secret |
-| `HMD_TWITTER_CONSUMERKEY` | no example | Twitter API consumer key |
-| `HMD_TWITTER_CONSUMERSECRET` | no example | Twitter API consumer secret |
-| `HMD_GITHUB_CLIENTID` | no example | GitHub API client id |
-| `HMD_GITHUB_CLIENTSECRET` | no example | GitHub API client secret |
-| `HMD_GITLAB_SCOPE` | `read_user` or `api` | GitLab API requested scope (default is `api`) (GitLab snippet import/export need `api` scope) |
-| `HMD_GITLAB_BASEURL` | no example | GitLab authentication endpoint, set to use other endpoint than GitLab.com (optional) |
-| `HMD_GITLAB_CLIENTID` | no example | GitLab API client id |
-| `HMD_GITLAB_CLIENTSECRET` | no example | GitLab API client secret |
-| `HMD_MATTERMOST_BASEURL` | no example | Mattermost authentication endpoint |
-| `HMD_MATTERMOST_CLIENTID` | no example | Mattermost API client id |
-| `HMD_MATTERMOST_CLIENTSECRET` | no example | Mattermost API client secret |
-| `HMD_DROPBOX_CLIENTID` | no example | Dropbox API client id |
-| `HMD_DROPBOX_CLIENTSECRET` | no example | Dropbox API client secret |
-| `HMD_GOOGLE_CLIENTID` | no example | Google API client id |
-| `HMD_GOOGLE_CLIENTSECRET` | no example | Google API client secret |
-| `HMD_LDAP_URL` | `ldap://example.com` | URL of LDAP server |
-| `HMD_LDAP_BINDDN` | no example | bindDn for LDAP access |
-| `HMD_LDAP_BINDCREDENTIALS` | no example | bindCredentials for LDAP access |
-| `HMD_LDAP_SEARCHBASE` | `o=users,dc=example,dc=com` | LDAP directory to begin search from |
-| `HMD_LDAP_SEARCHFILTER` | `(uid={{username}})` | LDAP filter to search with |
-| `HMD_LDAP_SEARCHATTRIBUTES` | `displayName, mail` | LDAP attributes to search with (use comma to separate) |
-| `HMD_LDAP_USERIDFIELD` | `uidNumber` or `uid` or `sAMAccountName` | The LDAP field which is used uniquely identify a user on CodiMD |
-| `HMD_LDAP_USERNAMEFIELD` | Fallback to userid | The LDAP field which is used as the username on CodiMD |
-| `HMD_LDAP_TLS_CA` | `server-cert.pem, root.pem` | Root CA for LDAP TLS in PEM format (use comma to separate) |
-| `HMD_LDAP_PROVIDERNAME` | `My institution` | Optional name to be displayed at login form indicating the LDAP provider |
-| `HMD_SAML_IDPSSOURL` | `https://idp.example.com/sso` | authentication endpoint of IdP. for details, see [guide](docs/guides/auth.md#saml-onelogin). |
-| `HMD_SAML_IDPCERT` | `/path/to/cert.pem` | certificate file path of IdP in PEM format |
-| `HMD_SAML_ISSUER` | no example | identity of the service provider (optional, default: serverurl)" |
-| `HMD_SAML_IDENTIFIERFORMAT` | no example | name identifier format (optional, default: `urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress`) |
-| `HMD_SAML_GROUPATTRIBUTE` | `memberOf` | attribute name for group list (optional) |
-| `HMD_SAML_REQUIREDGROUPS` | `Hackmd-users` | group names that allowed (use vertical bar to separate) (optional) |
-| `HMD_SAML_EXTERNALGROUPS` | `Temporary-staff` | group names that not allowed (use vertical bar to separate) (optional) |
-| `HMD_SAML_ATTRIBUTE_ID` | `sAMAccountName` | attribute map for `id` (optional, default: NameID of SAML response) |
-| `HMD_SAML_ATTRIBUTE_USERNAME` | `mailNickname` | attribute map for `username` (optional, default: NameID of SAML response) |
-| `HMD_SAML_ATTRIBUTE_EMAIL` | `mail` | attribute map for `email` (optional, default: NameID of SAML response if `HMD_SAML_IDENTIFIERFORMAT` is default) |
-| `HMD_IMGUR_CLIENTID` | no example | Imgur API client id |
-| `HMD_EMAIL` | `true` or `false` | set to allow email signin |
-| `HMD_ALLOW_PDF_EXPORT` | `true` or `false` | Enable or disable PDF exports |
-| `HMD_ALLOW_EMAIL_REGISTER` | `true` or `false` | set to allow email register (only applied when email is set, default is `true`. Note `bin/manage_users` might help you if registration is `false`.) |
-| `HMD_ALLOW_GRAVATAR` | `true` or `false` | set to `false` to disable gravatar as profile picture source on your instance |
-| `HMD_IMAGE_UPLOAD_TYPE` | `imgur`, `s3`, `minio` or `filesystem` | Where to upload images. For S3, see our Image Upload Guides for [S3](docs/guides/s3-image-upload.md) or [Minio](docs/guides/minio-image-upload.md) |
-| `HMD_S3_ACCESS_KEY_ID` | no example | AWS access key id |
-| `HMD_S3_SECRET_ACCESS_KEY` | no example | AWS secret key |
-| `HMD_S3_REGION` | `ap-northeast-1` | AWS S3 region |
-| `HMD_S3_BUCKET` | no example | AWS S3 bucket name |
-| `HMD_MINIO_ACCESS_KEY` | no example | Minio access key |
-| `HMD_MINIO_SECRET_KEY` | no example | Minio secret key |
-| `HMD_MINIO_ENDPOINT` | `minio.example.org` | Address of your Minio endpoint/instance |
-| `HMD_MINIO_PORT` | `9000` | Port that is used for your Minio instance |
-| `HMD_MINIO_SECURE` | `true` | If set to `true` HTTPS is used for Minio |
-| `HMD_AZURE_CONNECTION_STRING` | no example | Azure Blob Storage connection string |
-| `HMD_AZURE_CONTAINER` | no example | Azure Blob Storage container name (automatically created if non existent) |
-| `HMD_HSTS_ENABLE` | ` true`  | set to enable [HSTS](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) if HTTPS is also enabled (default is ` true`) |
-| `HMD_HSTS_INCLUDE_SUBDOMAINS` | `true` | set to include subdomains in HSTS (default is `true`) |
-| `HMD_HSTS_MAX_AGE` | `31536000` | max duration in seconds to tell clients to keep HSTS status (default is a year) |
-| `HMD_HSTS_PRELOAD` | `true` | whether to allow preloading of the site's HSTS status (e.g. into browsers) |
-| `HMD_CSP_ENABLE` | `true` | whether to enable Content Security Policy (directives cannot be configured with environment variables) |
-| `HMD_CSP_REPORTURI` | `https://<someid>.report-uri.com/r/d/csp/enforce` | Allows to add a URL for CSP reports in case of violations |
+| `CMD_DOMAIN` | `codimd.org` | domain name |
+| `CMD_URL_PATH` | `codimd` | sub URL path, like `www.example.com/<URL_PATH>` |
+| `CMD_PORT` | `80` | web app port |
+| `CMD_ALLOW_ORIGIN` | `localhost, codimd.org` | domain name whitelist (use comma to separate) |
+| `CMD_PROTOCOL_USESSL` | `true` or `false` | set to use SSL protocol for resources path (only applied when domain is set) |
+| `CMD_URL_ADDPORT` | `true` or `false` | set to add port on callback URL (ports `80` or `443` won't be applied) (only applied when domain is set) |
+| `CMD_USECDN` | `true` or `false` | set to use CDN resources or not (default is `true`) |
+| `CMD_ALLOW_ANONYMOUS` | `true` or `false` | set to allow anonymous usage (default is `true`) |
+| `CMD_ALLOW_ANONYMOUS_EDITS` | `true` or `false` | if `allowAnonymous` is `true`, allow users to select `freely` permission, allowing guests to edit existing notes (default is `false`) |
+| `CMD_ALLOW_FREEURL` | `true` or `false` | set to allow new note creation by accessing a nonexistent note URL |
+| `CMD_DEFAULT_PERMISSION` | `freely`, `editable`, `limited`, `locked` or `private` | set notes default permission (only applied on signed users) |
+| `CMD_DB_URL` | `mysql://localhost:3306/database` | set the database URL |
+| `CMD_SESSION_SECRET` | no example | Secret used to sign the session cookie. If non is set, one will randomly generated on startup |
+| `CMD_SESSION_LIFE` | `1209600000` | Session life time. (milliseconds) |
+| `CMD_FACEBOOK_CLIENTID` | no example | Facebook API client id |
+| `CMD_FACEBOOK_CLIENTSECRET` | no example | Facebook API client secret |
+| `CMD_TWITTER_CONSUMERKEY` | no example | Twitter API consumer key |
+| `CMD_TWITTER_CONSUMERSECRET` | no example | Twitter API consumer secret |
+| `CMD_GITHUB_CLIENTID` | no example | GitHub API client id |
+| `CMD_GITHUB_CLIENTSECRET` | no example | GitHub API client secret |
+| `CMD_GITLAB_SCOPE` | `read_user` or `api` | GitLab API requested scope (default is `api`) (GitLab snippet import/export need `api` scope) |
+| `CMD_GITLAB_BASEURL` | no example | GitLab authentication endpoint, set to use other endpoint than GitLab.com (optional) |
+| `CMD_GITLAB_CLIENTID` | no example | GitLab API client id |
+| `CMD_GITLAB_CLIENTSECRET` | no example | GitLab API client secret |
+| `CMD_MATTERMOST_BASEURL` | no example | Mattermost authentication endpoint |
+| `CMD_MATTERMOST_CLIENTID` | no example | Mattermost API client id |
+| `CMD_MATTERMOST_CLIENTSECRET` | no example | Mattermost API client secret |
+| `CMD_DROPBOX_CLIENTID` | no example | Dropbox API client id |
+| `CMD_DROPBOX_CLIENTSECRET` | no example | Dropbox API client secret |
+| `CMD_GOOGLE_CLIENTID` | no example | Google API client id |
+| `CMD_GOOGLE_CLIENTSECRET` | no example | Google API client secret |
+| `CMD_LDAP_URL` | `ldap://example.com` | URL of LDAP server |
+| `CMD_LDAP_BINDDN` | no example | bindDn for LDAP access |
+| `CMD_LDAP_BINDCREDENTIALS` | no example | bindCredentials for LDAP access |
+| `CMD_LDAP_SEARCHBASE` | `o=users,dc=example,dc=com` | LDAP directory to begin search from |
+| `CMD_LDAP_SEARCHFILTER` | `(uid={{username}})` | LDAP filter to search with |
+| `CMD_LDAP_SEARCHATTRIBUTES` | `displayName, mail` | LDAP attributes to search with (use comma to separate) |
+| `CMD_LDAP_USERIDFIELD` | `uidNumber` or `uid` or `sAMAccountName` | The LDAP field which is used uniquely identify a user on CodiMD |
+| `CMD_LDAP_USERNAMEFIELD` | Fallback to userid | The LDAP field which is used as the username on CodiMD |
+| `CMD_LDAP_TLS_CA` | `server-cert.pem, root.pem` | Root CA for LDAP TLS in PEM format (use comma to separate) |
+| `CMD_LDAP_PROVIDERNAME` | `My institution` | Optional name to be displayed at login form indicating the LDAP provider |
+| `CMD_SAML_IDPSSOURL` | `https://idp.example.com/sso` | authentication endpoint of IdP. for details, see [guide](docs/guides/auth.md#saml-onelogin). |
+| `CMD_SAML_IDPCERT` | `/path/to/cert.pem` | certificate file path of IdP in PEM format |
+| `CMD_SAML_ISSUER` | no example | identity of the service provider (optional, default: serverurl)" |
+| `CMD_SAML_IDENTIFIERFORMAT` | no example | name identifier format (optional, default: `urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress`) |
+| `CMD_SAML_GROUPATTRIBUTE` | `memberOf` | attribute name for group list (optional) |
+| `CMD_SAML_REQUIREDGROUPS` | `Hackmd-users` | group names that allowed (use vertical bar to separate) (optional) |
+| `CMD_SAML_EXTERNALGROUPS` | `Temporary-staff` | group names that not allowed (use vertical bar to separate) (optional) |
+| `CMD_SAML_ATTRIBUTE_ID` | `sAMAccountName` | attribute map for `id` (optional, default: NameID of SAML response) |
+| `CMD_SAML_ATTRIBUTE_USERNAME` | `mailNickname` | attribute map for `username` (optional, default: NameID of SAML response) |
+| `CMD_SAML_ATTRIBUTE_EMAIL` | `mail` | attribute map for `email` (optional, default: NameID of SAML response if `CMD_SAML_IDENTIFIERFORMAT` is default) |
+| `CMD_IMGUR_CLIENTID` | no example | Imgur API client id |
+| `CMD_EMAIL` | `true` or `false` | set to allow email signin |
+| `CMD_ALLOW_PDF_EXPORT` | `true` or `false` | Enable or disable PDF exports |
+| `CMD_ALLOW_EMAIL_REGISTER` | `true` or `false` | set to allow email register (only applied when email is set, default is `true`. Note `bin/manage_users` might help you if registration is `false`.) |
+| `CMD_ALLOW_GRAVATAR` | `true` or `false` | set to `false` to disable gravatar as profile picture source on your instance |
+| `CMD_IMAGE_UPLOAD_TYPE` | `imgur`, `s3`, `minio` or `filesystem` | Where to upload images. For S3, see our Image Upload Guides for [S3](docs/guides/s3-image-upload.md) or [Minio](docs/guides/minio-image-upload.md) |
+| `CMD_S3_ACCESS_KEY_ID` | no example | AWS access key id |
+| `CMD_S3_SECRET_ACCESS_KEY` | no example | AWS secret key |
+| `CMD_S3_REGION` | `ap-northeast-1` | AWS S3 region |
+| `CMD_S3_BUCKET` | no example | AWS S3 bucket name |
+| `CMD_MINIO_ACCESS_KEY` | no example | Minio access key |
+| `CMD_MINIO_SECRET_KEY` | no example | Minio secret key |
+| `CMD_MINIO_ENDPOINT` | `minio.example.org` | Address of your Minio endpoint/instance |
+| `CMD_MINIO_PORT` | `9000` | Port that is used for your Minio instance |
+| `CMD_MINIO_SECURE` | `true` | If set to `true` HTTPS is used for Minio |
+| `CMD_AZURE_CONNECTION_STRING` | no example | Azure Blob Storage connection string |
+| `CMD_AZURE_CONTAINER` | no example | Azure Blob Storage container name (automatically created if non existent) |
+| `CMD_HSTS_ENABLE` | ` true`  | set to enable [HSTS](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) if HTTPS is also enabled (default is ` true`) |
+| `CMD_HSTS_INCLUDE_SUBDOMAINS` | `true` | set to include subdomains in HSTS (default is `true`) |
+| `CMD_HSTS_MAX_AGE` | `31536000` | max duration in seconds to tell clients to keep HSTS status (default is a year) |
+| `CMD_HSTS_PRELOAD` | `true` | whether to allow preloading of the site's HSTS status (e.g. into browsers) |
+| `CMD_CSP_ENABLE` | `true` | whether to enable Content Security Policy (directives cannot be configured with environment variables) |
+| `CMD_CSP_REPORTURI` | `https://<someid>.report-uri.com/r/d/csp/enforce` | Allows to add a URL for CSP reports in case of violations |
+
+***Note:** Due to the rename process we renamed all `HMD_`-prefix variables to be `CMD_`-prefixed. The old ones continue to work.*
 
 ## Application settings `config.json`
 
diff --git a/lib/config/environment.js b/lib/config/environment.js
index 0ca3d92..d850ac9 100644
--- a/lib/config/environment.js
+++ b/lib/config/environment.js
@@ -3,123 +3,123 @@
 const {toBooleanConfig, toArrayConfig, toIntegerConfig} = require('./utils')
 
 module.exports = {
-  domain: process.env.HMD_DOMAIN,
-  urlPath: process.env.HMD_URL_PATH,
-  port: toIntegerConfig(process.env.HMD_PORT),
-  urlAddPort: toBooleanConfig(process.env.HMD_URL_ADDPORT),
-  useSSL: toBooleanConfig(process.env.HMD_USESSL),
+  domain: process.env.CMD_DOMAIN,
+  urlPath: process.env.CMD_URL_PATH,
+  port: toIntegerConfig(process.env.CMD_PORT),
+  urlAddPort: toBooleanConfig(process.env.CMD_URL_ADDPORT),
+  useSSL: toBooleanConfig(process.env.CMD_USESSL),
   hsts: {
-    enable: toBooleanConfig(process.env.HMD_HSTS_ENABLE),
-    maxAgeSeconds: process.env.HMD_HSTS_MAX_AGE,
-    includeSubdomains: toBooleanConfig(process.env.HMD_HSTS_INCLUDE_SUBDOMAINS),
-    preload: toBooleanConfig(process.env.HMD_HSTS_PRELOAD)
+    enable: toBooleanConfig(process.env.CMD_HSTS_ENABLE),
+    maxAgeSeconds: process.env.CMD_HSTS_MAX_AGE,
+    includeSubdomains: toBooleanConfig(process.env.CMD_HSTS_INCLUDE_SUBDOMAINS),
+    preload: toBooleanConfig(process.env.CMD_HSTS_PRELOAD)
   },
   csp: {
-    enable: toBooleanConfig(process.env.HMD_CSP_ENABLE),
-    reportURI: process.env.HMD_CSP_REPORTURI
+    enable: toBooleanConfig(process.env.CMD_CSP_ENABLE),
+    reportURI: process.env.CMD_CSP_REPORTURI
   },
-  protocolUseSSL: toBooleanConfig(process.env.HMD_PROTOCOL_USESSL),
-  allowOrigin: toArrayConfig(process.env.HMD_ALLOW_ORIGIN),
-  useCDN: toBooleanConfig(process.env.HMD_USECDN),
-  allowAnonymous: toBooleanConfig(process.env.HMD_ALLOW_ANONYMOUS),
-  allowAnonymousEdits: toBooleanConfig(process.env.HMD_ALLOW_ANONYMOUS_EDITS),
-  allowFreeURL: toBooleanConfig(process.env.HMD_ALLOW_FREEURL),
-  defaultPermission: process.env.HMD_DEFAULT_PERMISSION,
-  dbURL: process.env.HMD_DB_URL,
-  sessionSecret: process.env.HMD_SESSION_SECRET,
-  sessionLife: toIntegerConfig(process.env.HMD_SESSION_LIFE),
-  imageUploadType: process.env.HMD_IMAGE_UPLOAD_TYPE,
+  protocolUseSSL: toBooleanConfig(process.env.CMD_PROTOCOL_USESSL),
+  allowOrigin: toArrayConfig(process.env.CMD_ALLOW_ORIGIN),
+  useCDN: toBooleanConfig(process.env.CMD_USECDN),
+  allowAnonymous: toBooleanConfig(process.env.CMD_ALLOW_ANONYMOUS),
+  allowAnonymousEdits: toBooleanConfig(process.env.CMD_ALLOW_ANONYMOUS_EDITS),
+  allowFreeURL: toBooleanConfig(process.env.CMD_ALLOW_FREEURL),
+  defaultPermission: process.env.CMD_DEFAULT_PERMISSION,
+  dbURL: process.env.CMD_DB_URL,
+  sessionSecret: process.env.CMD_SESSION_SECRET,
+  sessionLife: toIntegerConfig(process.env.CMD_SESSION_LIFE),
+  imageUploadType: process.env.CMD_IMAGE_UPLOAD_TYPE,
   imgur: {
-    clientID: process.env.HMD_IMGUR_CLIENTID
+    clientID: process.env.CMD_IMGUR_CLIENTID
   },
   s3: {
-    accessKeyId: process.env.HMD_S3_ACCESS_KEY_ID,
-    secretAccessKey: process.env.HMD_S3_SECRET_ACCESS_KEY,
-    region: process.env.HMD_S3_REGION
+    accessKeyId: process.env.CMD_S3_ACCESS_KEY_ID,
+    secretAccessKey: process.env.CMD_S3_SECRET_ACCESS_KEY,
+    region: process.env.CMD_S3_REGION
   },
   minio: {
-    accessKey: process.env.HMD_MINIO_ACCESS_KEY,
-    secretKey: process.env.HMD_MINIO_SECRET_KEY,
-    endPoint: process.env.HMD_MINIO_ENDPOINT,
-    secure: toBooleanConfig(process.env.HMD_MINIO_SECURE),
-    port: toIntegerConfig(process.env.HMD_MINIO_PORT)
+    accessKey: process.env.CMD_MINIO_ACCESS_KEY,
+    secretKey: process.env.CMD_MINIO_SECRET_KEY,
+    endPoint: process.env.CMD_MINIO_ENDPOINT,
+    secure: toBooleanConfig(process.env.CMD_MINIO_SECURE),
+    port: toIntegerConfig(process.env.CMD_MINIO_PORT)
   },
-  s3bucket: process.env.HMD_S3_BUCKET,
+  s3bucket: process.env.CMD_S3_BUCKET,
   azure: {
-    connectionString: process.env.HMD_AZURE_CONNECTION_STRING,
-    container: process.env.HMD_AZURE_CONTAINER
+    connectionString: process.env.CMD_AZURE_CONNECTION_STRING,
+    container: process.env.CMD_AZURE_CONTAINER
   },
   facebook: {
-    clientID: process.env.HMD_FACEBOOK_CLIENTID,
-    clientSecret: process.env.HMD_FACEBOOK_CLIENTSECRET
+    clientID: process.env.CMD_FACEBOOK_CLIENTID,
+    clientSecret: process.env.CMD_FACEBOOK_CLIENTSECRET
   },
   twitter: {
-    consumerKey: process.env.HMD_TWITTER_CONSUMERKEY,
-    consumerSecret: process.env.HMD_TWITTER_CONSUMERSECRET
+    consumerKey: process.env.CMD_TWITTER_CONSUMERKEY,
+    consumerSecret: process.env.CMD_TWITTER_CONSUMERSECRET
   },
   github: {
-    clientID: process.env.HMD_GITHUB_CLIENTID,
-    clientSecret: process.env.HMD_GITHUB_CLIENTSECRET
+    clientID: process.env.CMD_GITHUB_CLIENTID,
+    clientSecret: process.env.CMD_GITHUB_CLIENTSECRET
   },
   gitlab: {
-    baseURL: process.env.HMD_GITLAB_BASEURL,
-    clientID: process.env.HMD_GITLAB_CLIENTID,
-    clientSecret: process.env.HMD_GITLAB_CLIENTSECRET,
-    scope: process.env.HMD_GITLAB_SCOPE
+    baseURL: process.env.CMD_GITLAB_BASEURL,
+    clientID: process.env.CMD_GITLAB_CLIENTID,
+    clientSecret: process.env.CMD_GITLAB_CLIENTSECRET,
+    scope: process.env.CMD_GITLAB_SCOPE
   },
   mattermost: {
-    baseURL: process.env.HMD_MATTERMOST_BASEURL,
-    clientID: process.env.HMD_MATTERMOST_CLIENTID,
-    clientSecret: process.env.HMD_MATTERMOST_CLIENTSECRET
+    baseURL: process.env.CMD_MATTERMOST_BASEURL,
+    clientID: process.env.CMD_MATTERMOST_CLIENTID,
+    clientSecret: process.env.CMD_MATTERMOST_CLIENTSECRET
   },
   oauth2: {
-    baseURL: process.env.HMD_OAUTH2_BASEURL,
-    userProfileURL: process.env.HMD_OAUTH2_USER_PROFILE_URL,
-    userProfileUsernameAttr: process.env.HMD_OAUTH2_USER_PROFILE_USERNAME_ATTR,
-    userProfileDisplayNameAttr: process.env.HMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR,
-    userProfileEmailAttr: process.env.HMD_OAUTH2_USER_PROFILE_EMAIL_ATTR,
-    tokenURL: process.env.HMD_OAUTH2_TOKEN_URL,
-    authorizationURL: process.env.HMD_OAUTH2_AUTHORIZATION_URL,
-    clientID: process.env.HMD_OAUTH2_CLIENT_ID,
-    clientSecret: process.env.HMD_OAUTH2_CLIENT_SECRET
+    baseURL: process.env.CMD_OAUTH2_BASEURL,
+    userProfileURL: process.env.CMD_OAUTH2_USER_PROFILE_URL,
+    userProfileUsernameAttr: process.env.CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR,
+    userProfileDisplayNameAttr: process.env.CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR,
+    userProfileEmailAttr: process.env.CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR,
+    tokenURL: process.env.CMD_OAUTH2_TOKEN_URL,
+    authorizationURL: process.env.CMD_OAUTH2_AUTHORIZATION_URL,
+    clientID: process.env.CMD_OAUTH2_CLIENT_ID,
+    clientSecret: process.env.CMD_OAUTH2_CLIENT_SECRET
   },
   dropbox: {
-    clientID: process.env.HMD_DROPBOX_CLIENTID,
-    clientSecret: process.env.HMD_DROPBOX_CLIENTSECRET,
-    appKey: process.env.HMD_DROPBOX_APPKEY
+    clientID: process.env.CMD_DROPBOX_CLIENTID,
+    clientSecret: process.env.CMD_DROPBOX_CLIENTSECRET,
+    appKey: process.env.CMD_DROPBOX_APPKEY
   },
   google: {
-    clientID: process.env.HMD_GOOGLE_CLIENTID,
-    clientSecret: process.env.HMD_GOOGLE_CLIENTSECRET
+    clientID: process.env.CMD_GOOGLE_CLIENTID,
+    clientSecret: process.env.CMD_GOOGLE_CLIENTSECRET
   },
   ldap: {
-    providerName: process.env.HMD_LDAP_PROVIDERNAME,
-    url: process.env.HMD_LDAP_URL,
-    bindDn: process.env.HMD_LDAP_BINDDN,
-    bindCredentials: process.env.HMD_LDAP_BINDCREDENTIALS,
-    searchBase: process.env.HMD_LDAP_SEARCHBASE,
-    searchFilter: process.env.HMD_LDAP_SEARCHFILTER,
-    searchAttributes: toArrayConfig(process.env.HMD_LDAP_SEARCHATTRIBUTES),
-    usernameField: process.env.HMD_LDAP_USERNAMEFIELD,
-    useridField: process.env.HMD_LDAP_USERIDFIELD,
-    tlsca: process.env.HMD_LDAP_TLS_CA
+    providerName: process.env.CMD_LDAP_PROVIDERNAME,
+    url: process.env.CMD_LDAP_URL,
+    bindDn: process.env.CMD_LDAP_BINDDN,
+    bindCredentials: process.env.CMD_LDAP_BINDCREDENTIALS,
+    searchBase: process.env.CMD_LDAP_SEARCHBASE,
+    searchFilter: process.env.CMD_LDAP_SEARCHFILTER,
+    searchAttributes: toArrayConfig(process.env.CMD_LDAP_SEARCHATTRIBUTES),
+    usernameField: process.env.CMD_LDAP_USERNAMEFIELD,
+    useridField: process.env.CMD_LDAP_USERIDFIELD,
+    tlsca: process.env.CMD_LDAP_TLS_CA
   },
   saml: {
-    idpSsoUrl: process.env.HMD_SAML_IDPSSOURL,
-    idpCert: process.env.HMD_SAML_IDPCERT,
-    issuer: process.env.HMD_SAML_ISSUER,
-    identifierFormat: process.env.HMD_SAML_IDENTIFIERFORMAT,
-    groupAttribute: process.env.HMD_SAML_GROUPATTRIBUTE,
-    externalGroups: toArrayConfig(process.env.HMD_SAML_EXTERNALGROUPS, '|', []),
-    requiredGroups: toArrayConfig(process.env.HMD_SAML_REQUIREDGROUPS, '|', []),
+    idpSsoUrl: process.env.CMD_SAML_IDPSSOURL,
+    idpCert: process.env.CMD_SAML_IDPCERT,
+    issuer: process.env.CMD_SAML_ISSUER,
+    identifierFormat: process.env.CMD_SAML_IDENTIFIERFORMAT,
+    groupAttribute: process.env.CMD_SAML_GROUPATTRIBUTE,
+    externalGroups: toArrayConfig(process.env.CMD_SAML_EXTERNALGROUPS, '|', []),
+    requiredGroups: toArrayConfig(process.env.CMD_SAML_REQUIREDGROUPS, '|', []),
     attribute: {
-      id: process.env.HMD_SAML_ATTRIBUTE_ID,
-      username: process.env.HMD_SAML_ATTRIBUTE_USERNAME,
-      email: process.env.HMD_SAML_ATTRIBUTE_EMAIL
+      id: process.env.CMD_SAML_ATTRIBUTE_ID,
+      username: process.env.CMD_SAML_ATTRIBUTE_USERNAME,
+      email: process.env.CMD_SAML_ATTRIBUTE_EMAIL
     }
   },
-  email: toBooleanConfig(process.env.HMD_EMAIL),
-  allowEmailRegister: toBooleanConfig(process.env.HMD_ALLOW_EMAIL_REGISTER),
-  allowGravatar: toBooleanConfig(process.env.HMD_ALLOW_GRAVATAR),
-  allowPDFExport: toBooleanConfig(process.env.HMD_ALLOW_PDF_EXPORT)
+  email: toBooleanConfig(process.env.CMD_EMAIL),
+  allowEmailRegister: toBooleanConfig(process.env.CMD_ALLOW_EMAIL_REGISTER),
+  allowGravatar: toBooleanConfig(process.env.CMD_ALLOW_GRAVATAR),
+  allowPDFExport: toBooleanConfig(process.env.CMD_ALLOW_PDF_EXPORT)
 }
diff --git a/lib/config/hackmdEnvironment.js b/lib/config/hackmdEnvironment.js
new file mode 100644
index 0000000..e1c1156
--- /dev/null
+++ b/lib/config/hackmdEnvironment.js
@@ -0,0 +1,124 @@
+'use strict'
+
+const {toBooleanConfig, toArrayConfig, toIntegerConfig} = require('./utils')
+
+module.exports = {
+  domain: process.env.HMD_DOMAIN,
+  urlPath: process.env.HMD_URL_PATH,
+  port: toIntegerConfig(process.env.HMD_PORT),
+  urlAddPort: toBooleanConfig(process.env.HMD_URL_ADDPORT),
+  useSSL: toBooleanConfig(process.env.HMD_USESSL),
+  hsts: {
+    enable: toBooleanConfig(process.env.HMD_HSTS_ENABLE),
+    maxAgeSeconds: process.env.HMD_HSTS_MAX_AGE,
+    includeSubdomains: toBooleanConfig(process.env.HMD_HSTS_INCLUDE_SUBDOMAINS),
+    preload: toBooleanConfig(process.env.HMD_HSTS_PRELOAD)
+  },
+  csp: {
+    enable: toBooleanConfig(process.env.HMD_CSP_ENABLE),
+    reportURI: process.env.HMD_CSP_REPORTURI
+  },
+  protocolUseSSL: toBooleanConfig(process.env.HMD_PROTOCOL_USESSL),
+  allowOrigin: toArrayConfig(process.env.HMD_ALLOW_ORIGIN),
+  useCDN: toBooleanConfig(process.env.HMD_USECDN),
+  allowAnonymous: toBooleanConfig(process.env.HMD_ALLOW_ANONYMOUS),
+  allowAnonymousEdits: toBooleanConfig(process.env.HMD_ALLOW_ANONYMOUS_EDITS),
+  allowFreeURL: toBooleanConfig(process.env.HMD_ALLOW_FREEURL),
+  defaultPermission: process.env.HMD_DEFAULT_PERMISSION,
+  dbURL: process.env.HMD_DB_URL,
+  sessionSecret: process.env.HMD_SESSION_SECRET,
+  sessionLife: toIntegerConfig(process.env.HMD_SESSION_LIFE),
+  imageUploadType: process.env.HMD_IMAGE_UPLOAD_TYPE,
+  imgur: {
+    clientID: process.env.HMD_IMGUR_CLIENTID
+  },
+  s3: {
+    accessKeyId: process.env.HMD_S3_ACCESS_KEY_ID,
+    secretAccessKey: process.env.HMD_S3_SECRET_ACCESS_KEY,
+    region: process.env.HMD_S3_REGION
+  },
+  minio: {
+    accessKey: process.env.HMD_MINIO_ACCESS_KEY,
+    secretKey: process.env.HMD_MINIO_SECRET_KEY,
+    endPoint: process.env.HMD_MINIO_ENDPOINT,
+    secure: toBooleanConfig(process.env.HMD_MINIO_SECURE),
+    port: toIntegerConfig(process.env.HMD_MINIO_PORT)
+  },
+  s3bucket: process.env.HMD_S3_BUCKET,
+  azure: {
+    connectionString: process.env.HMD_AZURE_CONNECTION_STRING,
+    container: process.env.HMD_AZURE_CONTAINER
+  },
+  facebook: {
+    clientID: process.env.HMD_FACEBOOK_CLIENTID,
+    clientSecret: process.env.HMD_FACEBOOK_CLIENTSECRET
+  },
+  twitter: {
+    consumerKey: process.env.HMD_TWITTER_CONSUMERKEY,
+    consumerSecret: process.env.HMD_TWITTER_CONSUMERSECRET
+  },
+  github: {
+    clientID: process.env.HMD_GITHUB_CLIENTID,
+    clientSecret: process.env.HMD_GITHUB_CLIENTSECRET
+  },
+  gitlab: {
+    baseURL: process.env.HMD_GITLAB_BASEURL,
+    clientID: process.env.HMD_GITLAB_CLIENTID,
+    clientSecret: process.env.HMD_GITLAB_CLIENTSECRET,
+    scope: process.env.HMD_GITLAB_SCOPE
+  },
+  mattermost: {
+    baseURL: process.env.HMD_MATTERMOST_BASEURL,
+    clientID: process.env.HMD_MATTERMOST_CLIENTID,
+    clientSecret: process.env.HMD_MATTERMOST_CLIENTSECRET
+  },
+  oauth2: {
+    baseURL: process.env.HMD_OAUTH2_BASEURL,
+    userProfileURL: process.env.HMD_OAUTH2_USER_PROFILE_URL,
+    userProfileUsernameAttr: process.env.HMD_OAUTH2_USER_PROFILE_USERNAME_ATTR,
+    userProfileDisplayNameAttr: process.env.HMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR,
+    userProfileEmailAttr: process.env.HMD_OAUTH2_USER_PROFILE_EMAIL_ATTR,
+    tokenURL: process.env.HMD_OAUTH2_TOKEN_URL,
+    authorizationURL: process.env.HMD_OAUTH2_AUTHORIZATION_URL,
+    clientID: process.env.HMD_OAUTH2_CLIENT_ID,
+    clientSecret: process.env.HMD_OAUTH2_CLIENT_SECRET
+  },
+  dropbox: {
+    clientID: process.env.HMD_DROPBOX_CLIENTID,
+    clientSecret: process.env.HMD_DROPBOX_CLIENTSECRET,
+    appKey: process.env.HMD_DROPBOX_APPKEY
+  },
+  google: {
+    clientID: process.env.HMD_GOOGLE_CLIENTID,
+    clientSecret: process.env.HMD_GOOGLE_CLIENTSECRET
+  },
+  ldap: {
+    providerName: process.env.HMD_LDAP_PROVIDERNAME,
+    url: process.env.HMD_LDAP_URL,
+    bindDn: process.env.HMD_LDAP_BINDDN,
+    bindCredentials: process.env.HMD_LDAP_BINDCREDENTIALS,
+    searchBase: process.env.HMD_LDAP_SEARCHBASE,
+    searchFilter: process.env.HMD_LDAP_SEARCHFILTER,
+    searchAttributes: toArrayConfig(process.env.HMD_LDAP_SEARCHATTRIBUTES),
+    usernameField: process.env.HMD_LDAP_USERNAMEFIELD,
+    useridField: process.env.HMD_LDAP_USERIDFIELD,
+    tlsca: process.env.HMD_LDAP_TLS_CA
+  },
+  saml: {
+    idpSsoUrl: process.env.HMD_SAML_IDPSSOURL,
+    idpCert: process.env.HMD_SAML_IDPCERT,
+    issuer: process.env.HMD_SAML_ISSUER,
+    identifierFormat: process.env.HMD_SAML_IDENTIFIERFORMAT,
+    groupAttribute: process.env.HMD_SAML_GROUPATTRIBUTE,
+    externalGroups: toArrayConfig(process.env.HMD_SAML_EXTERNALGROUPS, '|', []),
+    requiredGroups: toArrayConfig(process.env.HMD_SAML_REQUIREDGROUPS, '|', []),
+    attribute: {
+      id: process.env.HMD_SAML_ATTRIBUTE_ID,
+      username: process.env.HMD_SAML_ATTRIBUTE_USERNAME,
+      email: process.env.HMD_SAML_ATTRIBUTE_EMAIL
+    }
+  },
+  email: toBooleanConfig(process.env.HMD_EMAIL),
+  allowEmailRegister: toBooleanConfig(process.env.HMD_ALLOW_EMAIL_REGISTER),
+  allowPDFExport: toBooleanConfig(process.env.HMD_ALLOW_PDF_EXPORT)
+}
diff --git a/lib/config/index.js b/lib/config/index.js
index 7933044..760d94a 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -33,6 +33,7 @@ merge(config, debugConfig)
 merge(config, packageConfig)
 merge(config, fileConfig)
 merge(config, require('./oldEnvironment'))
+merge(config, require('./hackmdEnvironment'))
 merge(config, require('./environment'))
 merge(config, require('./dockerSecret'))
 
@@ -122,6 +123,11 @@ for (let i = keys.length; i--;) {
   }
 }
 
+// Notify users about the prefix change and inform them they use legacy prefix for environment variables
+if (Object.keys(process.env).toString().indexOf('HMD_') !== -1) {
+  logger.warn('Using legacy HMD prefix for environment variables. Please change your variables in future. For details see: https://github.com/hackmdio/codimd#environment-variables-will-overwrite-other-server-configs')
+}
+
 // Generate session secret if it stays on default values
 if (config.sessionSecret === 'secret') {
   logger.warn('Session secret not set. Using random generated one. Please set `sessionSecret` in your config.js file. All users will be logged out.')

From 23c33c0c046a9a27b2a31d334f6f818d8b1b3459 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 24 Jun 2018 13:37:46 +0200
Subject: [PATCH 31/74] Rename HackMD view to CodiMD

Even when it looks a bit weird in first place to rename all internals
step by step, it makes sense to do so, because we run into confusion
afterwards.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 lib/config/default.js                      |  2 +-
 lib/config/index.js                        |  2 +-
 lib/response.js                            |  2 +-
 public/views/codimd.ejs                    | 15 +++++++++++++++
 public/views/{hackmd => codimd}/body.ejs   |  0
 public/views/{hackmd => codimd}/foot.ejs   |  0
 public/views/{hackmd => codimd}/footer.ejs |  0
 public/views/{hackmd => codimd}/head.ejs   |  0
 public/views/{hackmd => codimd}/header.ejs |  0
 public/views/error.ejs                     |  8 ++++----
 public/views/hackmd.ejs                    | 15 ---------------
 11 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 public/views/codimd.ejs
 rename public/views/{hackmd => codimd}/body.ejs (100%)
 rename public/views/{hackmd => codimd}/foot.ejs (100%)
 rename public/views/{hackmd => codimd}/footer.ejs (100%)
 rename public/views/{hackmd => codimd}/head.ejs (100%)
 rename public/views/{hackmd => codimd}/header.ejs (100%)
 delete mode 100644 public/views/hackmd.ejs

diff --git a/lib/config/default.js b/lib/config/default.js
index 8e71029..5c39a4d 100644
--- a/lib/config/default.js
+++ b/lib/config/default.js
@@ -41,7 +41,7 @@ module.exports = {
   defaultNotePath: './public/default.md',
   docsPath: './public/docs',
   indexPath: './public/views/index.ejs',
-  hackmdPath: './public/views/hackmd.ejs',
+  codimdPath: './public/views/codimd.ejs',
   errorPath: './public/views/error.ejs',
   prettyPath: './public/views/pretty.ejs',
   slidePath: './public/views/slide.ejs',
diff --git a/lib/config/index.js b/lib/config/index.js
index 760d94a..8705b10 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -175,7 +175,7 @@ config.tmpPath = path.join(appRootPath, config.tmpPath)
 config.defaultNotePath = path.join(appRootPath, config.defaultNotePath)
 config.docsPath = path.join(appRootPath, config.docsPath)
 config.indexPath = path.join(appRootPath, config.indexPath)
-config.hackmdPath = path.join(appRootPath, config.hackmdPath)
+config.codimdPath = path.join(appRootPath, config.codimdPath)
 config.errorPath = path.join(appRootPath, config.errorPath)
 config.prettyPath = path.join(appRootPath, config.prettyPath)
 config.slidePath = path.join(appRootPath, config.slidePath)
diff --git a/lib/response.js b/lib/response.js
index d1e5e15..e256d47 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -119,7 +119,7 @@ function responseHackMD (res, note) {
     'Cache-Control': 'private', // only cache by client
     'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
   })
-  res.render(config.hackmdPath, {
+  res.render(config.codimdPath, {
     url: config.serverURL,
     title: title,
     useCDN: config.useCDN,
diff --git a/public/views/codimd.ejs b/public/views/codimd.ejs
new file mode 100644
index 0000000..7818346
--- /dev/null
+++ b/public/views/codimd.ejs
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <%- include codimd/head %>
+</head>
+
+<body>
+    <%- include codimd/header %>
+    <%- include codimd/body %>
+    <%- include codimd/footer %>
+    <%- include codimd/foot %>
+</body>
+
+</html>
diff --git a/public/views/hackmd/body.ejs b/public/views/codimd/body.ejs
similarity index 100%
rename from public/views/hackmd/body.ejs
rename to public/views/codimd/body.ejs
diff --git a/public/views/hackmd/foot.ejs b/public/views/codimd/foot.ejs
similarity index 100%
rename from public/views/hackmd/foot.ejs
rename to public/views/codimd/foot.ejs
diff --git a/public/views/hackmd/footer.ejs b/public/views/codimd/footer.ejs
similarity index 100%
rename from public/views/hackmd/footer.ejs
rename to public/views/codimd/footer.ejs
diff --git a/public/views/hackmd/head.ejs b/public/views/codimd/head.ejs
similarity index 100%
rename from public/views/hackmd/head.ejs
rename to public/views/codimd/head.ejs
diff --git a/public/views/hackmd/header.ejs b/public/views/codimd/header.ejs
similarity index 100%
rename from public/views/hackmd/header.ejs
rename to public/views/codimd/header.ejs
diff --git a/public/views/error.ejs b/public/views/error.ejs
index a40ed39..98c3c74 100644
--- a/public/views/error.ejs
+++ b/public/views/error.ejs
@@ -2,18 +2,18 @@
 <html lang="en">
 
 <head>
-    <%- include hackmd/head %>
+    <%- include codimd/head %>
     <link rel="stylesheet" href="<%- url %>/css/center.css">
 </head>
 
 <body>
-    <%- include hackmd/header %>
+    <%- include codimd/header %>
     <div class="container-fluid text-center">
         <div class="vertical-center-row">
                 <h1><%- code %> <%- detail %> <small><%- msg %></small></h1>
         </div>
     </div>
-    <%- include hackmd/footer %>
+    <%- include codimd/footer %>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/public/views/hackmd.ejs b/public/views/hackmd.ejs
deleted file mode 100644
index 49084a6..0000000
--- a/public/views/hackmd.ejs
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <%- include hackmd/head %>
-</head>
-
-<body>
-    <%- include hackmd/header %>
-    <%- include hackmd/body %>
-    <%- include hackmd/footer %>
-    <%- include hackmd/foot %>
-</body>
-
-</html>

From a762928e971d0a21799cd15818647518da36db93 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 24 Jun 2018 13:59:18 +0200
Subject: [PATCH 32/74] Do final internal renameing

A little minor change, by moving the CodiMD version header in its own
middleware. Should simplify to determine the version number of the
Backend in future.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 app.js                              |  1 +
 lib/response.js                     |  4 ++--
 lib/web/middleware/codiMDVersion.js | 10 ++++++++++
 lib/web/statusRouter.js             |  6 ++----
 4 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 lib/web/middleware/codiMDVersion.js

diff --git a/app.js b/app.js
index a9bd2ec..e247913 100644
--- a/app.js
+++ b/app.js
@@ -163,6 +163,7 @@ app.use(passport.session())
 app.use(require('./lib/web/middleware/checkURIValid'))
 // redirect url without trailing slashes
 app.use(require('./lib/web/middleware/redirectWithoutTrailingSlashes'))
+app.use(require('./lib/web/middleware/codiMDVersion'))
 
 // routes need sessions
 // template files
diff --git a/lib/response.js b/lib/response.js
index e256d47..252208b 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -109,7 +109,7 @@ function showIndex (req, res, next) {
   }
 }
 
-function responseHackMD (res, note) {
+function responseCodiMD (res, note) {
   var body = note.content
   var extracted = models.Note.extractMeta(body)
   var meta = models.Note.parseMeta(extracted.meta)
@@ -214,7 +214,7 @@ function showNote (req, res, next) {
     var noteId = req.params.noteId
     var id = models.Note.encodeNoteId(note.id)
     if ((note.alias && noteId !== note.alias) || (!note.alias && noteId !== id)) { return res.redirect(config.serverURL + '/' + (note.alias || id)) }
-    return responseHackMD(res, note)
+    return responseCodiMD(res, note)
   })
 }
 
diff --git a/lib/web/middleware/codiMDVersion.js b/lib/web/middleware/codiMDVersion.js
new file mode 100644
index 0000000..e777587
--- /dev/null
+++ b/lib/web/middleware/codiMDVersion.js
@@ -0,0 +1,10 @@
+'use strict'
+
+const config = require('../../config')
+
+module.exports = function (req, res, next) {
+  res.set({
+    'CodiMD-Version': config.version
+  })
+  return next()
+}
diff --git a/lib/web/statusRouter.js b/lib/web/statusRouter.js
index 4495a28..256fead 100644
--- a/lib/web/statusRouter.js
+++ b/lib/web/statusRouter.js
@@ -17,8 +17,7 @@ statusRouter.get('/status', function (req, res, next) {
   realtime.getStatus(function (data) {
     res.set({
       'Cache-Control': 'private', // only cache by client
-      'X-Robots-Tag': 'noindex, nofollow', // prevent crawling
-      'HackMD-Version': config.version
+      'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
     })
     res.send(data)
   })
@@ -102,8 +101,7 @@ statusRouter.get('/config', function (req, res) {
   }
   res.set({
     'Cache-Control': 'private', // only cache by client
-    'X-Robots-Tag': 'noindex, nofollow', // prevent crawling
-    'HackMD-Version': config.version
+    'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
   })
   res.render(config.constantsPath, data)
 })

From 97a08e7954af01719bb2519e863fdf5990d4d56f Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 24 Jun 2018 14:04:35 +0200
Subject: [PATCH 33/74] Add note about renaming to docs

It's way easier to add a note to the guides than to redo all the images,
etc. We have more important things to spend our time on, but if someone
wants to redo them, you are very welcome!

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 docs/guides/auth/github.md             | 2 ++
 docs/guides/auth/gitlab-self-hosted.md | 2 ++
 docs/guides/auth/saml-onelogin.md      | 2 ++
 docs/guides/auth/saml.md               | 2 ++
 docs/guides/auth/twitter.md            | 2 ++
 docs/guides/minio-image-upload.md      | 4 +++-
 docs/guides/s3-image-upload.md         | 4 +++-
 7 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/docs/guides/auth/github.md b/docs/guides/auth/github.md
index 62910cb..d6a1095 100644
--- a/docs/guides/auth/github.md
+++ b/docs/guides/auth/github.md
@@ -1,6 +1,8 @@
 Authentication guide - GitHub
 ===
 
+***Note:** This guide was written before the renaming. Just replace `HackMD` with `CodiMD` in your mind :smile: thanks!*
+
 1. Sign-in or sign-up for a GitHub account
 2. Navigate to developer settings in your GitHub account [here](https://github.com/settings/developers) and select the "OAuth Apps" tab
 3. Click on the **New OAuth App** button, to create a new OAuth App:
diff --git a/docs/guides/auth/gitlab-self-hosted.md b/docs/guides/auth/gitlab-self-hosted.md
index 361ee95..89bc996 100644
--- a/docs/guides/auth/gitlab-self-hosted.md
+++ b/docs/guides/auth/gitlab-self-hosted.md
@@ -1,6 +1,8 @@
 # GitLab (self-hosted)
 ===
 
+***Note:** This guide was written before the renaming. Just replace `HackMD` with `CodiMD` in your mind :smile: thanks!*
+
 1. Sign in to your GitLab
 2. Navigate to the application management page at `https://your.gitlab.domain/admin/applications` (admin permissions required)
 3. Click **New application** to create a new application and fill out the registration form:
diff --git a/docs/guides/auth/saml-onelogin.md b/docs/guides/auth/saml-onelogin.md
index 245876c..02a5ffa 100644
--- a/docs/guides/auth/saml-onelogin.md
+++ b/docs/guides/auth/saml-onelogin.md
@@ -1,6 +1,8 @@
 Authentication guide - SAML (OneLogin)
 ===
 
+***Note:** This guide was written before the renaming. Just replace `HackMD` with `CodiMD` in your mind :smile: thanks!*
+
 1. Sign-in or sign-up for an OneLogin account. (available free trial for 2 weeks)
 2. Go to the administration page.
 3. Select the **APPS** menu and click on the **Add Apps**.
diff --git a/docs/guides/auth/saml.md b/docs/guides/auth/saml.md
index 9a51667..97ac9d3 100644
--- a/docs/guides/auth/saml.md
+++ b/docs/guides/auth/saml.md
@@ -1,6 +1,8 @@
 Authentication guide - SAML
 ===
 
+***Note:** This guide was written before the renaming. Just replace `HackMD` with `CodiMD` in your mind :smile: thanks!*
+
 The basic procedure is the same as the case of OneLogin which is mentioned in [OneLogin-Guide](./saml-onelogin.md). If you want to match your IdP, you can use more configurations as below.
 
 * If your IdP accepts metadata XML of the service provider to ease configuraion, use this url to download metadata XML.
diff --git a/docs/guides/auth/twitter.md b/docs/guides/auth/twitter.md
index 02309ca..1b96288 100644
--- a/docs/guides/auth/twitter.md
+++ b/docs/guides/auth/twitter.md
@@ -1,6 +1,8 @@
 Authentication guide - Twitter
 ===
 
+***Note:** This guide was written before the renaming. Just replace `HackMD` with `CodiMD` in your mind :smile: thanks!*
+
 1. Sign-in or sign-up for a Twitter account
 2. Go to the Twitter Application management page [here](https://apps.twitter.com/)
 3. Click on the **Create New App** button to create a new Twitter app:
diff --git a/docs/guides/minio-image-upload.md b/docs/guides/minio-image-upload.md
index c2ba25b..7f5796c 100644
--- a/docs/guides/minio-image-upload.md
+++ b/docs/guides/minio-image-upload.md
@@ -1,6 +1,8 @@
-Minio Guide for HackMD
+Minio Guide for CodiMD
 ===
 
+***Note:** This guide was written before the renaming. Just replace `HackMD` with `CodiMD` in your mind :smile: thanks!*
+
 1. First of all you need to setup Minio itself.
 
    Please refer to the [official Minio docs](https://docs.minio.io/) for an
diff --git a/docs/guides/s3-image-upload.md b/docs/guides/s3-image-upload.md
index ff9598a..dc5e420 100644
--- a/docs/guides/s3-image-upload.md
+++ b/docs/guides/s3-image-upload.md
@@ -1,4 +1,6 @@
-# Guide - Setup HackMD S3 image upload
+# Guide - Setup CodiMD S3 image upload
+
+***Note:** This guide was written before the renaming. Just replace `HackMD` with `CodiMD` in your mind :smile: thanks!*
 
 1. Go to [AWS S3 console](https://console.aws.amazon.com/s3/home) and create a new bucket.
 

From 2184491f4ac4b224e26fcc4b54d792dd4e82178f Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 24 Jun 2018 14:13:38 +0200
Subject: [PATCH 34/74] Final replacements

Looks like I missed a few. This should be complete now. And make us
ready for the repo rename and merging.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 lib/csp.js                     | 2 +-
 lib/response.js                | 2 +-
 public/docs/privacy.md.example | 6 +++---
 public/js/cover.js             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/csp.js b/lib/csp.js
index d0f906a..a49c748 100644
--- a/lib/csp.js
+++ b/lib/csp.js
@@ -6,7 +6,7 @@ var CspStrategy = {}
 var defaultDirectives = {
   defaultSrc: ['\'self\''],
   scriptSrc: ['\'self\'', 'vimeo.com', 'https://gist.github.com', 'www.slideshare.net', 'https://query.yahooapis.com', '\'unsafe-eval\''],
-  // ^ TODO: Remove unsafe-eval - webpack script-loader issues https://github.com/hackmdio/hackmd/issues/594
+  // ^ TODO: Remove unsafe-eval - webpack script-loader issues https://github.com/hackmdio/codimd/issues/594
   imgSrc: ['*'],
   styleSrc: ['\'self\'', '\'unsafe-inline\'', 'https://assets-cdn.github.com'], // unsafe-inline is required for some libs, plus used in views
   fontSrc: ['\'self\'', 'https://public.slidesharecdn.com'],
diff --git a/lib/response.js b/lib/response.js
index 252208b..3a31c51 100644
--- a/lib/response.js
+++ b/lib/response.js
@@ -527,7 +527,7 @@ function githubActionGist (req, res, note) {
           request({
             url: gistUrl,
             headers: {
-              'User-Agent': 'HackMD',
+              'User-Agent': 'CodiMD',
               'Authorization': 'token ' + accessToken
             },
             method: 'POST',
diff --git a/public/docs/privacy.md.example b/public/docs/privacy.md.example
index 08bf909..ff65d82 100644
--- a/public/docs/privacy.md.example
+++ b/public/docs/privacy.md.example
@@ -6,9 +6,9 @@ We process the following data, for the following purposes:
 |your data|our usage|
 |---------|---------|
 |IP-Address|Used to communicate with your browser and our servers. It's may exposed to third-parties which provide resources for this service. These services are, depending on your login method, the document you visit and the setup of this instance: Google, Disqus, MathJax, GitHub, SlideShare/LinkedIn, yahoo, Gravatar, Imgur, Amazon, and Cloudflare.|
-|Usernames and profiles|Your username as well as user profiles that are connected with it are transmitted and stored by us to provide a useful login integration with services like GitHub, Facebook, Twitter, GitLab, Dropbox, Google. Depending on the setup of this HackMD instance there are maybe other third-parties involved using SAML, LDAP or the integration with a Mattermost instance.|
-|Profile pictures| Your profile picture is either loaded from the service you used to login, the HackMD instance or Gravatar.|
-|Uploaded pictures| Pictures that are uploaded for documents are either uploaded to Amazon S3, Imgur, a minio instance or the local filesystem of the HackMD server.|
+|Usernames and profiles|Your username as well as user profiles that are connected with it are transmitted and stored by us to provide a useful login integration with services like GitHub, Facebook, Twitter, GitLab, Dropbox, Google. Depending on the setup of this CodiMD instance there are maybe other third-parties involved using SAML, LDAP or the integration with a Mattermost instance.|
+|Profile pictures| Your profile picture is either loaded from the service you used to login, the CodiMD instance or Gravatar.|
+|Uploaded pictures| Pictures that are uploaded for documents are either uploaded to Amazon S3, Imgur, a minio instance or the local filesystem of the CodiMD server.|
 
 All account data and notes are stored in a mysql/postgres/sqlite database. Besides the user accounts and the document themselves also relationships between the documents and the user accounts are stored. This includes ownership, authorship and revisions of all changes made during the creation of a note.
 
diff --git a/public/js/cover.js b/public/js/cover.js
index 6ca05f6..79fb3a2 100644
--- a/public/js/cover.js
+++ b/public/js/cover.js
@@ -318,7 +318,7 @@ $('.ui-save-history').click(() => {
     const blob = new Blob([history], {
       type: 'application/json;charset=utf-8'
     })
-    saveAs(blob, `hackmd_history_${moment().format('YYYYMMDDHHmmss')}`, true)
+    saveAs(blob, `codimd_history_${moment().format('YYYYMMDDHHmmss')}`, true)
   })
 })
 

From 04d16e4d6efa771ece8770c726beca29b9d2ca61 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sun, 24 Jun 2018 23:50:19 +0200
Subject: [PATCH 35/74] Add Print icon to slide view

It redirects the user to the print view of the document. I claim that
people should either be smart enough to use ctrl+P or ask someone who
knows how to print a webpage. I don't want to babysit our users.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 public/docs/slide-example.md | 8 ++++++++
 public/js/slide.js           | 1 +
 public/views/slide.ejs       | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/public/docs/slide-example.md b/public/docs/slide-example.md
index e2e024b..411f31d 100644
--- a/public/docs/slide-example.md
+++ b/public/docs/slide-example.md
@@ -266,4 +266,12 @@ Press `B` or `.` on your keyboard to pause the presentation. This is helpful whe
 
 ---
 
+## Print your Slides
+
+Down below you can find a print icon<i class="fa fa-fw fa-print"></i>.
+
+After you click on it, use the print function of your browser (either CTRL+P or cmd+P) to print the slides as PDF.
+
+---
+
 # The End
diff --git a/public/js/slide.js b/public/js/slide.js
index 59a352e..1eb8dfd 100644
--- a/public/js/slide.js
+++ b/public/js/slide.js
@@ -14,6 +14,7 @@ window.lastchangetime = window.lastchangeui.time.attr('data-updatetime')
 updateLastChange()
 const url = window.location.pathname
 $('.ui-edit').attr('href', `${url}/edit`)
+$('.ui-print').attr('href', `${url}?print-pdf`)
 
 $(document).ready(() => {
     // tooltip
diff --git a/public/views/slide.ejs b/public/views/slide.ejs
index 7b9ae29..d9be51f 100644
--- a/public/views/slide.ejs
+++ b/public/views/slide.ejs
@@ -69,7 +69,7 @@
                             &nbsp;<span class="text-uppercase ui-status-lastchange"></span>
                             <span class="ui-lastchange text-uppercase" data-createtime="<%- createtime %>" data-updatetime="<%- updatetime %>"></span>
                         </span>
-                        <span class="pull-right"><%- viewcount %> views <a href="#" class="ui-edit" title="Edit this note"><i class="fa fa-fw fa-pencil"></i></a></span>
+                        <span class="pull-right"><%- viewcount %> views <a href="#" class="ui-edit" title="Edit this note"><i class="fa fa-fw fa-pencil"></i></a><a class="ui-print" href="" title="Open print view"><i class="fa fa-fw fa-print"></i></a></span>
                         <br>
                         <% if(ownerprofile && owner !== lastchangeuser) { %>
                         <span class="ui-owner">

From 1c92524c08d99a9233cc38b6055e243cc429ac35 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Tue, 26 Jun 2018 22:25:11 +0200
Subject: [PATCH 36/74] Fix broken unicode urls

It wasn't possible to create unicode based URLs in freeurl mode, because
the noteid used for the websocket connection is double escaped. When we
decode it and let socketio-client reencode it, we get the real
shortid/noteid and can find the note in the database and open the
connection.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 public/js/lib/config/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/lib/config/index.js b/public/js/lib/config/index.js
index 4758ffe..6133e2c 100644
--- a/public/js/lib/config/index.js
+++ b/public/js/lib/config/index.js
@@ -7,7 +7,7 @@ export const debug = window.debug || false
 export const port = window.location.port
 export const serverurl = `${window.location.protocol}//${domain || window.location.hostname}${port ? ':' + port : ''}${urlpath ? '/' + urlpath : ''}`
 window.serverurl = serverurl
-export const noteid = urlpath ? window.location.pathname.slice(urlpath.length + 1, window.location.pathname.length).split('/')[1] : window.location.pathname.split('/')[1]
+export const noteid = decodeURIComponent(urlpath ? window.location.pathname.slice(urlpath.length + 1, window.location.pathname.length).split('/')[1] : window.location.pathname.split('/')[1])
 export const noteurl = `${serverurl}/${noteid}`
 
 export const version = window.version

From 3b9e29a14a1f5214d0ad90af40d199618265de4f Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Tue, 26 Jun 2018 22:56:05 +0200
Subject: [PATCH 37/74] Update install instructions to cover sequelize

We instruct people to run db migrations on inital setup. We should do
that!

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4cae291..34d52b5 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,10 @@ Just to more confusion: We are still friends with HackMD :heart:
 3. Setup the configs, see more below
 4. Setup environment variables which will overwrite the configs
 5. Build front-end bundle by `npm run build` (use `npm run dev` if you are in development)
-6. Run the server as you like (node, forever, pm2)
+6. Modify the file named `.sequelizerc`, change the value of the variable `url` with your db connection string
+   For example: `postgres://username:password@localhost:5432/codimd`
+7. Run `node_modules/.bin/sequelize db:migrate`, this step will migrate your db to the latest schema
+8. Run the server as you like (node, forever, pm2)
 
 ## Heroku Deployment
 

From 20b75a492473fc1f929fb066c4dc54ffb4f26390 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Wed, 27 Jun 2018 22:31:11 +0200
Subject: [PATCH 38/74] Add docs for usage of terms and privacy policy

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 docs/guides/providing-terms.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 docs/guides/providing-terms.md

diff --git a/docs/guides/providing-terms.md b/docs/guides/providing-terms.md
new file mode 100644
index 0000000..1e580df
--- /dev/null
+++ b/docs/guides/providing-terms.md
@@ -0,0 +1,17 @@
+Setup your terms of use
+===
+
+To setup your terms of use, you need to provide a document called `terms-of-use.md` which contains them. Of course written in Markdown.
+
+It has to be provided under `./public/docs/` and will be automatically turned into a CodiMD document. It will also automatically updated as soon as you change the document on disk.
+
+As soon as the file exists a link will show up in the bottom part along with the release notes and link to them.
+
+Setup your privacy policy
+===
+
+To add a privacy policy you can use the same technique as for the terms of use. The main difference is that the document is called `privacy.md`.
+
+See our example file `./public/docs/privacy.md.example` container some useful hints for writing your own privacy policy.
+
+As with the terms of use, a link to the privacy notices will show up in the area where the release notes are provided on the index page.

From 76b2ba49547bfc39941a8b4979bec30099c3c167 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 15:03:00 +0200
Subject: [PATCH 39/74] Update markdown-pdf

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 442d00a..a031b03 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "markdown-it-regexp": "^0.4.0",
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "^1.0.0",
-    "markdown-pdf": "^7.0.0",
+    "markdown-pdf": "^8.0.0",
     "mathjax": "~2.7.0",
     "mermaid": "~7.1.0",
     "mattermost": "^3.4.0",

From d8df6e43427f627b35c910455260a8dfe9bf6cb0 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 15:03:17 +0200
Subject: [PATCH 40/74] Update minio

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a031b03..e12371c 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "meta-marked": "^0.4.2",
     "method-override": "^2.3.7",
     "minimist": "^1.2.0",
-    "minio": "^3.1.3",
+    "minio": "^6.0.0",
     "moment": "^2.17.1",
     "morgan": "^1.7.0",
     "mysql": "^2.12.0",

From fd3733e7d1faf31906d4599652bf7051ff6e54da Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 15:03:38 +0200
Subject: [PATCH 41/74] Update password-gitlab2

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e12371c..721a1cd 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "passport-dropbox-oauth2": "^1.1.0",
     "passport-facebook": "^2.1.1",
     "passport-github": "^1.1.0",
-    "passport-gitlab2": "^2.2.0",
+    "passport-gitlab2": "^4.0.0",
     "passport-google-oauth20": "^1.0.0",
     "passport-ldapauth": "^0.6.0",
     "passport-local": "^1.0.0",

From f51de7f3bb55d298cfc50a779d6a8d36a0b6667a Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 15:03:52 +0200
Subject: [PATCH 42/74] Update validator

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 721a1cd..afc0377 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
     "toobusy-js": "^0.5.1",
     "uuid": "^3.1.0",
     "uws": "~0.14.1",
-    "validator": "^6.2.0",
+    "validator": "^10.4.0",
     "velocity-animate": "^1.4.0",
     "visibilityjs": "^1.2.4",
     "viz.js": "^1.7.0",

From 562985a115cb62cc380dc5905e8e95d2d41c4a0e Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 15:04:15 +0200
Subject: [PATCH 43/74] Update passport-ldap

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 lib/web/auth/ldap/index.js | 2 +-
 package.json               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/web/auth/ldap/index.js b/lib/web/auth/ldap/index.js
index ab1cb4c..8d71c18 100644
--- a/lib/web/auth/ldap/index.js
+++ b/lib/web/auth/ldap/index.js
@@ -15,7 +15,7 @@ let ldapAuth = module.exports = Router()
 passport.use(new LDAPStrategy({
   server: {
     url: config.ldap.url || null,
-    bindDn: config.ldap.bindDn || null,
+    bindDN: config.ldap.bindDn || null,
     bindCredentials: config.ldap.bindCredentials || null,
     searchBase: config.ldap.searchBase || null,
     searchFilter: config.ldap.searchFilter || null,
diff --git a/package.json b/package.json
index afc0377..931385c 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
     "passport-github": "^1.1.0",
     "passport-gitlab2": "^4.0.0",
     "passport-google-oauth20": "^1.0.0",
-    "passport-ldapauth": "^0.6.0",
+    "passport-ldapauth": "^2.0.0",
     "passport-local": "^1.0.0",
     "passport-oauth2": "^1.4.0",
     "passport-twitter": "^1.0.4",

From b6e1144627c13b6a8fd7965621bb2a7cbbd72223 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 15:08:36 +0200
Subject: [PATCH 44/74] Update to octicon 4.4.0

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 package.json                 | 2 +-
 public/views/codimd/head.ejs | 2 +-
 public/views/html.hbs        | 2 +-
 public/views/pretty.ejs      | 2 +-
 public/views/slide.ejs       | 2 +-
 webpackBaseConfig.js         | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 931385c..dc7c377 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "morgan": "^1.7.0",
     "mysql": "^2.12.0",
     "node-uuid": "^1.4.7",
-    "octicons": "~3.5.0",
+    "octicons": "~4.4.0",
     "passport": "^0.3.2",
     "passport-dropbox-oauth2": "^1.1.0",
     "passport-facebook": "^2.1.1",
diff --git a/public/views/codimd/head.ejs b/public/views/codimd/head.ejs
index 8dfef43..1f44625 100644
--- a/public/views/codimd/head.ejs
+++ b/public/views/codimd/head.ejs
@@ -12,7 +12,7 @@
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css" integrity="sha256-02JtFTurpwBjQJ6q13iJe82/NF0RbZlJroDegK5g87Y=" crossorigin="anonymous" />
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css" integrity="sha256-QiWfLIsCT02Sdwkogf6YMiQlj4NE84MKkzEMkZnMGdg=" crossorigin="anonymous" />
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/octicons.min.css" integrity="sha256-4eCms8tUm+iL29tUvmRhNRnz/7lNI4oTtQzqa/uM2dI=" crossorigin="anonymous" />
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />
 <%- include ../build/index-header %>
 <%- include ../shared/polyfill %>
diff --git a/public/views/html.hbs b/public/views/html.hbs
index a300ddd..e3d557f 100644
--- a/public/views/html.hbs
+++ b/public/views/html.hbs
@@ -18,7 +18,7 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha256-916EbMg70RQy9LHiGkXzG8hSg9EdNy97GazNG/aiY1w=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css" integrity="sha256-QiWfLIsCT02Sdwkogf6YMiQlj4NE84MKkzEMkZnMGdg=" crossorigin="anonymous" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/octicons.min.css" integrity="sha256-4eCms8tUm+iL29tUvmRhNRnz/7lNI4oTtQzqa/uM2dI=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.5.1/themes/prism.min.css" integrity="sha256-vtR0hSWRc3Tb26iuN2oZHt3KRUomwTufNIf5/4oeCyg=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/github-gist.min.css" integrity="sha256-tAflq+ymku3Khs+I/WcAneIlafYgDiOQ9stIHH985Wo=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />
diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs
index 395f921..885844b 100644
--- a/public/views/pretty.ejs
+++ b/public/views/pretty.ejs
@@ -21,7 +21,7 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha256-916EbMg70RQy9LHiGkXzG8hSg9EdNy97GazNG/aiY1w=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css" integrity="sha256-QiWfLIsCT02Sdwkogf6YMiQlj4NE84MKkzEMkZnMGdg=" crossorigin="anonymous" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/octicons.min.css" integrity="sha256-4eCms8tUm+iL29tUvmRhNRnz/7lNI4oTtQzqa/uM2dI=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />
     <%- include build/pretty-header %>
     <%- include shared/polyfill %>
diff --git a/public/views/slide.ejs b/public/views/slide.ejs
index d9be51f..8f66bf5 100644
--- a/public/views/slide.ejs
+++ b/public/views/slide.ejs
@@ -18,7 +18,7 @@
         <% if(useCDN) { %>
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/3.5.0/octicons.min.css" integrity="sha256-QiWfLIsCT02Sdwkogf6YMiQlj4NE84MKkzEMkZnMGdg=" crossorigin="anonymous" />
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/octicons.min.css" integrity="sha256-4eCms8tUm+iL29tUvmRhNRnz/7lNI4oTtQzqa/uM2dI=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/reveal.js/3.6.0/css/reveal.min.css" integrity="sha256-ol2N5Xr80jdDqxK0lte3orKGb9Ja3sOnpAUV7TTADmg=" crossorigin="anonymous" />
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />
         <%- include build/slide-header %>
diff --git a/webpackBaseConfig.js b/webpackBaseConfig.js
index 2c6a56f..798b64e 100644
--- a/webpackBaseConfig.js
+++ b/webpackBaseConfig.js
@@ -234,7 +234,7 @@ module.exports = {
       path.join(__dirname, 'node_modules/font-awesome/css/font-awesome.min.css'),
       path.join(__dirname, 'public/css/bootstrap-social.css'),
       path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'),
-      path.join(__dirname, 'node_modules/octicons/octicons/octicons.css')
+      path.join(__dirname, 'node_modules/octicons/build/octicons.css')
     ],
     'index-pack': [
       'babel-polyfill',
@@ -284,7 +284,7 @@ module.exports = {
       path.join(__dirname, 'node_modules/bootstrap/dist/css/bootstrap.min.css'),
       path.join(__dirname, 'node_modules/font-awesome/css/font-awesome.min.css'),
       path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'),
-      path.join(__dirname, 'node_modules/octicons/octicons/octicons.css')
+      path.join(__dirname, 'node_modules/octicons/build/octicons.css')
     ],
     'pretty-pack': [
       'babel-polyfill',
@@ -321,7 +321,7 @@ module.exports = {
     'slide-styles-pack': [
       path.join(__dirname, 'node_modules/font-awesome/css/font-awesome.min.css'),
       path.join(__dirname, 'node_modules/ionicons/css/ionicons.min.css'),
-      path.join(__dirname, 'node_modules/octicons/octicons/octicons.css')
+      path.join(__dirname, 'node_modules/octicons/build/octicons.css')
     ],
     'slide-pack': [
       'babel-polyfill',

From 0cebeb68d726fc63b631e61aeff65c3dfb84afcb Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 15:29:13 +0200
Subject: [PATCH 45/74] Update passport

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dc7c377..ad9ab20 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "mysql": "^2.12.0",
     "node-uuid": "^1.4.7",
     "octicons": "~4.4.0",
-    "passport": "^0.3.2",
+    "passport": "^0.4.0",
     "passport-dropbox-oauth2": "^1.1.0",
     "passport-facebook": "^2.1.1",
     "passport-github": "^1.1.0",

From 3f49aee63fd3e27f4ce989a386fba8b21098f063 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 15:32:17 +0200
Subject: [PATCH 46/74] Update shortid

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ad9ab20..ef1a27e 100644
--- a/package.json
+++ b/package.json
@@ -114,7 +114,7 @@
     "select2": "^3.5.2-browserify",
     "sequelize": "^3.28.0",
     "sequelize-cli": "^2.5.1",
-    "shortid": "2.2.6",
+    "shortid": "2.2.8",
     "socket.io": "~2.0.4",
     "socket.io-client": "~2.0.4",
     "spin.js": "^2.3.2",

From 459fe2da07bd72104e10038c8fee3877cb5c728d Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 15:32:29 +0200
Subject: [PATCH 47/74] Update sqlite

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ef1a27e..bd9f4e6 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,7 @@
     "socket.io": "~2.0.4",
     "socket.io-client": "~2.0.4",
     "spin.js": "^2.3.2",
-    "sqlite3": "^3.1.8",
+    "sqlite3": "^4.0.1",
     "store": "^1.3.20",
     "string": "^3.3.3",
     "tedious": "^1.14.0",

From 565cdc0197bd76df516204948ab4ec658f0dfc58 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 15:32:43 +0200
Subject: [PATCH 48/74] Update xss protection

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bd9f4e6..9bae4f5 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "visibilityjs": "^1.2.4",
     "viz.js": "^1.7.0",
     "winston": "^2.3.0",
-    "xss": "^0.3.3"
+    "xss": "^1.0.3"
   },
   "engines": {
     "node": ">=6.x <10.x"

From 1812b1aaca4127e1640f107a7bd3d67f5f5afe47 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 15:37:07 +0200
Subject: [PATCH 49/74] Update highlight.js

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 package.json                 | 2 +-
 public/views/codimd/foot.ejs | 2 +-
 public/views/html.hbs        | 2 +-
 public/views/pretty.ejs      | 2 +-
 public/views/slide.ejs       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 9bae4f5..445f2a0 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "graceful-fs": "^4.1.11",
     "handlebars": "^4.0.6",
     "helmet": "^3.3.0",
-    "highlight.js": "~9.9.0",
+    "highlight.js": "~9.12.0",
     "i18n": "^0.8.3",
     "imgur": "git+https://github.com/hackmdio/node-imgur.git",
     "ionicons": "~2.0.1",
diff --git a/public/views/codimd/foot.ejs b/public/views/codimd/foot.ejs
index 4d73d05..000ccb6 100644
--- a/public/views/codimd/foot.ejs
+++ b/public/views/codimd/foot.ejs
@@ -14,7 +14,7 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.2/lodash.min.js" integrity="sha256-Cv5v4i4SuYvwRYzIONifZjoc99CkwfncROMSWat1cVA=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.0.4/socket.io.js" integrity="sha256-WPeFPWD3PZQUDrpFnDM1N2KadNVwCfNS4cCZ78b76T8=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.6/handlebars.min.js" integrity="sha256-1O3BtOwnPyyRzOszK6P+gqaRoXHV6JXj8HkjZmPYhCI=" crossorigin="anonymous" defer></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js" integrity="sha256-KbfTjB0WZ8vvXngdpJGY3Yp3xKk+tttbqClO11anCIU=" crossorigin="anonymous" defer></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" integrity="sha256-/BfiIkHlHoVihZdc6TFuj7MmJ0TWcWsMXkeDFwhi0zw=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/gist-embed/2.6.0/gist-embed.min.js" integrity="sha256-KyF2D6xPIJUW5sUDSs93vWyZm+1RzIpKCexxElmxl8g=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/1.7.0/viz.js" integrity="sha256-8t+rndrF+TU4JtelmOH1lDHTMe2ovhO2UbzDArp5lY8=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.8/validator.min.js" integrity="sha256-LHeY7YoYJ0SSXbCx7sR14Pqna+52moaH3bhv0Mjzd/M=" crossorigin="anonymous" defer></script>
diff --git a/public/views/html.hbs b/public/views/html.hbs
index e3d557f..a87bf81 100644
--- a/public/views/html.hbs
+++ b/public/views/html.hbs
@@ -20,7 +20,7 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css" integrity="sha256-3iu9jgsy9TpTwXKb7bNQzqWekRX7pPK+2OLj3R922fo=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/octicons/4.4.0/octicons.min.css" integrity="sha256-4eCms8tUm+iL29tUvmRhNRnz/7lNI4oTtQzqa/uM2dI=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.5.1/themes/prism.min.css" integrity="sha256-vtR0hSWRc3Tb26iuN2oZHt3KRUomwTufNIf5/4oeCyg=" crossorigin="anonymous" />
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/github-gist.min.css" integrity="sha256-tAflq+ymku3Khs+I/WcAneIlafYgDiOQ9stIHH985Wo=" crossorigin="anonymous" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/github-gist.min.css" integrity="sha256-tAflq+ymku3Khs+I/WcAneIlafYgDiOQ9stIHH985Wo=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/css/basic/emojify.min.css" integrity="sha256-UOrvMOsSDSrW6szVLe8ZDZezBxh5IoIfgTwdNDgTjiU=" crossorigin="anonymous" />
     <style>
         {{{css}}}
diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs
index 885844b..4c2fc0a 100644
--- a/public/views/pretty.ejs
+++ b/public/views/pretty.ejs
@@ -85,7 +85,7 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/7.1.0/mermaid.min.js" integrity="sha256-M3OC0Q6g4/+Q4j73OvnsnA+lMkdAE5KgupRHqTiPbnI=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/js/emojify.min.js" integrity="sha256-VAB5tAlKBvgaxw8oJ1crWMVbdmBVl4mP/2M8MNRl+4E=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.6/handlebars.min.js" integrity="sha256-1O3BtOwnPyyRzOszK6P+gqaRoXHV6JXj8HkjZmPYhCI=" crossorigin="anonymous" defer></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js" integrity="sha256-KbfTjB0WZ8vvXngdpJGY3Yp3xKk+tttbqClO11anCIU=" crossorigin="anonymous" defer></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" integrity="sha256-/BfiIkHlHoVihZdc6TFuj7MmJ0TWcWsMXkeDFwhi0zw=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/gist-embed/2.6.0/gist-embed.min.js" integrity="sha256-KyF2D6xPIJUW5sUDSs93vWyZm+1RzIpKCexxElmxl8g=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/1.7.0/viz.js" integrity="sha256-8t+rndrF+TU4JtelmOH1lDHTMe2ovhO2UbzDArp5lY8=" crossorigin="anonymous" defer></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/abcjs/3.1.1/abcjs_basic-min.js" integrity="sha256-Sq1r2XXWXQoShQKsS0Wrf5r7fRkErd9Fat9vHYeU68s=" crossorigin="anonymous"></script>
diff --git a/public/views/slide.ejs b/public/views/slide.ejs
index 8f66bf5..c11d298 100644
--- a/public/views/slide.ejs
+++ b/public/views/slide.ejs
@@ -101,7 +101,7 @@
         <script src="https://cdnjs.cloudflare.com/ajax/libs/mermaid/7.1.0/mermaid.min.js" integrity="sha256-M3OC0Q6g4/+Q4j73OvnsnA+lMkdAE5KgupRHqTiPbnI=" crossorigin="anonymous" defer></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/emojify.js/1.1.0/js/emojify.min.js" integrity="sha256-VAB5tAlKBvgaxw8oJ1crWMVbdmBVl4mP/2M8MNRl+4E=" crossorigin="anonymous" defer></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.6/handlebars.min.js" integrity="sha256-1O3BtOwnPyyRzOszK6P+gqaRoXHV6JXj8HkjZmPYhCI=" crossorigin="anonymous" defer></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js" integrity="sha256-KbfTjB0WZ8vvXngdpJGY3Yp3xKk+tttbqClO11anCIU=" crossorigin="anonymous" defer></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js" integrity="sha256-/BfiIkHlHoVihZdc6TFuj7MmJ0TWcWsMXkeDFwhi0zw=" crossorigin="anonymous" defer></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/gist-embed/2.6.0/gist-embed.min.js" integrity="sha256-KyF2D6xPIJUW5sUDSs93vWyZm+1RzIpKCexxElmxl8g=" crossorigin="anonymous" defer></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/viz.js/1.7.0/viz.js" integrity="sha256-8t+rndrF+TU4JtelmOH1lDHTMe2ovhO2UbzDArp5lY8=" crossorigin="anonymous" defer></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/abcjs/3.1.1/abcjs_basic-min.js" integrity="sha256-Sq1r2XXWXQoShQKsS0Wrf5r7fRkErd9Fat9vHYeU68s=" crossorigin="anonymous"></script>

From dea62cf31031819b3fd6542e7317109f522a45cf Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 16:47:37 +0200
Subject: [PATCH 50/74] Update store

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 package.json         |  2 +-
 public/js/history.js | 79 +++++++++++---------------------------------
 2 files changed, 21 insertions(+), 60 deletions(-)

diff --git a/package.json b/package.json
index 445f2a0..0d229ac 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
     "socket.io-client": "~2.0.4",
     "spin.js": "^2.3.2",
     "sqlite3": "^4.0.1",
-    "store": "^1.3.20",
+    "store": "^2.0.12",
     "string": "^3.3.3",
     "tedious": "^1.14.0",
     "to-markdown": "^3.0.3",
diff --git a/public/js/history.js b/public/js/history.js
index 7132281..b4c26b4 100644
--- a/public/js/history.js
+++ b/public/js/history.js
@@ -1,5 +1,5 @@
 /* eslint-env browser, jquery */
-/* global serverurl, Cookies, moment */
+/* global serverurl, moment */
 
 import store from 'store'
 import S from 'string'
@@ -64,13 +64,7 @@ export function saveHistory (notehistory) {
 }
 
 function saveHistoryToStorage (notehistory) {
-  if (store.enabled) { store.set('notehistory', JSON.stringify(notehistory)) } else { saveHistoryToCookie(notehistory) }
-}
-
-function saveHistoryToCookie (notehistory) {
-  Cookies.set('notehistory', notehistory, {
-    expires: 365
-  })
+  store.set('notehistory', JSON.stringify(notehistory))
 }
 
 function saveHistoryToServer (notehistory) {
@@ -150,35 +144,17 @@ export function writeHistory (title, tags) {
     )
 }
 
-function writeHistoryToCookie (title, tags) {
-  var notehistory
-  try {
-    notehistory = Cookies.getJSON('notehistory')
-  } catch (err) {
+function writeHistoryToStorage (title, tags) {
+  let data = store.get('notehistory')
+  let notehistory
+  if (data && typeof data === 'string') {
+    notehistory = JSON.parse(data)
+  } else {
     notehistory = []
   }
-  if (!notehistory) { notehistory = [] }
+
   const newnotehistory = generateHistory(title, tags, notehistory)
-  saveHistoryToCookie(newnotehistory)
-}
-
-function writeHistoryToStorage (title, tags) {
-  if (store.enabled) {
-    let data = store.get('notehistory')
-    var notehistory
-    if (data) {
-      if (typeof data === 'string') { data = JSON.parse(data) }
-      notehistory = data
-    } else {
-      notehistory = []
-    }
-    if (!notehistory) { notehistory = [] }
-
-    const newnotehistory = generateHistory(title, tags, notehistory)
-    saveHistoryToStorage(newnotehistory)
-  } else {
-    writeHistoryToCookie(title, tags)
-  }
+  saveHistoryToStorage(newnotehistory)
 }
 
 if (!Array.isArray) {
@@ -236,20 +212,13 @@ function getServerHistory (callback) {
         })
 }
 
-function getCookieHistory (callback) {
-  callback(Cookies.getJSON('notehistory'))
-}
-
 export function getStorageHistory (callback) {
-  if (store.enabled) {
-    let data = store.get('notehistory')
-    if (data) {
-      if (typeof data === 'string') { data = JSON.parse(data) }
-      callback(data)
-    } else { getCookieHistory(callback) }
-  } else {
-    getCookieHistory(callback)
+  let data = store.get('notehistory')
+  if (data) {
+    if (typeof data === 'string') { data = JSON.parse(data) }
+    callback(data)
   }
+  callback([])
 }
 
 export function parseHistory (list, callback) {
@@ -275,21 +244,13 @@ export function parseServerToHistory (list, callback) {
         })
 }
 
-function parseCookieToHistory (list, callback) {
-  const notehistory = Cookies.getJSON('notehistory')
-  parseToHistory(list, notehistory, callback)
-}
-
 export function parseStorageToHistory (list, callback) {
-  if (store.enabled) {
-    let data = store.get('notehistory')
-    if (data) {
-      if (typeof data === 'string') { data = JSON.parse(data) }
-      parseToHistory(list, data, callback)
-    } else { parseCookieToHistory(list, callback) }
-  } else {
-    parseCookieToHistory(list, callback)
+  let data = store.get('notehistory')
+  if (data) {
+    if (typeof data === 'string') { data = JSON.parse(data) }
+    parseToHistory(list, data, callback)
   }
+  parseToHistory(list, [], callback)
 }
 
 function parseToHistory (list, notehistory, callback) {

From 4d4163c1705af7dbdeeac3e788e72f6683221680 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 16:47:51 +0200
Subject: [PATCH 51/74] Update pg

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0d229ac..12cfd58 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "passport-saml": "^0.31.0",
     "passport.socketio": "^3.7.0",
     "pdfobject": "^2.0.201604172",
-    "pg": "^6.1.2",
+    "pg": "^7.4.3",
     "pg-hstore": "^2.3.2",
     "prismjs": "^1.6.0",
     "randomcolor": "^0.4.4",

From f30cc3044ac8b7f70689444cbb076be4b2cfcaac Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 16:48:09 +0200
Subject: [PATCH 52/74] Update randomcolor

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 12cfd58..246147a 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "pg": "^7.4.3",
     "pg-hstore": "^2.3.2",
     "prismjs": "^1.6.0",
-    "randomcolor": "^0.4.4",
+    "randomcolor": "^0.5.3",
     "raphael": "git+https://github.com/dmitrybaranovskiy/raphael",
     "readline-sync": "^1.4.7",
     "request": "^2.79.0",

From fe5248acbd24ce43488d0e155dc0add4ffe895f0 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 17:07:43 +0200
Subject: [PATCH 53/74] Update yarn.lock

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 yarn.lock | 392 +++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 286 insertions(+), 106 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 8bacf95..76856ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,79 @@
 # yarn lockfile v1
 
 
+"@types/body-parser@*":
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c"
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
+"@types/connect@*":
+  version "3.4.32"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28"
+  dependencies:
+    "@types/node" "*"
+
+"@types/events@*":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
+
+"@types/express-serve-static-core@*":
+  version "4.16.0"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.0.tgz#fdfe777594ddc1fe8eb8eccce52e261b496e43e7"
+  dependencies:
+    "@types/events" "*"
+    "@types/node" "*"
+    "@types/range-parser" "*"
+
+"@types/express@*":
+  version "4.16.0"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.16.0.tgz#6d8bc42ccaa6f35cf29a2b7c3333cb47b5a32a19"
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "*"
+    "@types/serve-static" "*"
+
 "@types/geojson@^1.0.0":
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-1.0.4.tgz#f6e011bf3f7eea616cce79b6f1a0722010822f3a"
 
+"@types/ldapjs@^1.0.0":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.3.tgz#eb2acbe603845136196dd25fba77e476d6d7db56"
+  dependencies:
+    "@types/events" "*"
+    "@types/node" "*"
+
+"@types/mime@*":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b"
+
+"@types/node@*":
+  version "10.5.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.1.tgz#d578446f4abff5c0b49ade9b4e5274f6badaadfc"
+
+"@types/node@^7.0.21", "@types/node@^7.0.23":
+  version "7.0.66"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.66.tgz#3d1dc4d6f52e484e843806ff456379f7e6ad5553"
+
+"@types/passport@^0.3.3":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@types/passport/-/passport-0.3.5.tgz#2089c7046d120e8bb92aa4ed86338c9c62ef7853"
+  dependencies:
+    "@types/express" "*"
+
+"@types/range-parser@*":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.2.tgz#fa8e1ad1d474688a757140c91de6dace6f4abc8d"
+
+"@types/serve-static@*":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48"
+  dependencies:
+    "@types/express-serve-static-core" "*"
+    "@types/mime" "*"
+
 "Idle.Js@git+https://github.com/shawnmclean/Idle.js":
   version "0.0.1"
   resolved "git+https://github.com/shawnmclean/Idle.js#db9beb3483a460ad638ec947867720f0ed066a62"
@@ -897,9 +966,9 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-bcryptjs@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.3.0.tgz#5826900cfef7abaf3425c72e4d464de509b8c2ec"
+bcryptjs@^2.4.0:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
 
 beeper@^1.0.0:
   version "1.1.1"
@@ -1267,6 +1336,10 @@ chokidar@^1.0.0, chokidar@^1.6.1:
   optionalDependencies:
     fsevents "^1.0.0"
 
+chownr@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+
 circular-json@^0.3.1:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
@@ -1820,7 +1893,7 @@ debug-log@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
 
-debug@*, debug@2, debug@2.6.9, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6, debug@~2.6.9:
+debug@*, debug@2, debug@2.6.9, debug@^2.1.1, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6, debug@~2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
@@ -1846,6 +1919,10 @@ deep-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
 
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+
 deep-extend@~0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
@@ -1934,6 +2011,10 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+
 "diff-match-patch@git+https://github.com/hackmdio/diff-match-patch.git":
   version "1.0.0"
   resolved "git+https://github.com/hackmdio/diff-match-patch.git#0fba40fc6d9565a4afdfb7aa1eb0bf39aa0d942c"
@@ -2037,12 +2118,6 @@ dottie@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/dottie/-/dottie-1.1.1.tgz#45c2a3f48bd6528eeed267a69a848eaaca6faa6a"
 
-dtrace-provider@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.7.1.tgz#c06b308f2f10d5d5838aec9c571e5d588dc71d04"
-  dependencies:
-    nan "^2.3.3"
-
 dtrace-provider@~0.8:
   version "0.8.5"
   resolved "https://registry.yarnpkg.com/dtrace-provider/-/dtrace-provider-0.8.5.tgz#98ebba221afac46e1c39fd36858d8f9367524b92"
@@ -2886,6 +2961,12 @@ fs-extra@~1.0.0:
     jsonfile "^2.1.0"
     klaw "^1.0.0"
 
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  dependencies:
+    minipass "^2.2.1"
+
 fs-readdir-recursive@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz#8cd1745c8b4f8a29c8caec392476921ba195f560"
@@ -2955,10 +3036,6 @@ generic-pool@2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.2.tgz#886bc5bf0beb7db96e81bcbba078818de5a62683"
 
-generic-pool@2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff"
-
 get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -3359,10 +3436,14 @@ hide-powered-by@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hide-powered-by/-/hide-powered-by-1.0.0.tgz#4a85ad65881f62857fc70af7174a1184dccce32b"
 
-highlight.js@^9.1.0, highlight.js@~9.9.0:
+highlight.js@^9.1.0:
   version "9.9.0"
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.9.0.tgz#b9995dcfdc2773e307a34f0460d92b9a474782c0"
 
+highlight.js@~9.12.0:
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
+
 hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
@@ -3508,6 +3589,12 @@ iconv-lite@0.4.19, iconv-lite@^0.4.11:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
+iconv-lite@^0.4.4:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
@@ -3520,6 +3607,12 @@ ienoopen@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ienoopen/-/ienoopen-1.0.0.tgz#346a428f474aac8f50cf3784ea2d0f16f62bda6b"
 
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  dependencies:
+    minimatch "^3.0.4"
+
 ignore@^3.0.9, ignore@^3.2.0:
   version "3.3.5"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.5.tgz#c4e715455f6073a8d7e5dae72d2fc9d71663dba6"
@@ -3935,10 +4028,6 @@ js-sequence-diagrams@^1000000.0.6:
     raphael "~2.1.x"
     underscore "~1.4.x"
 
-js-string-escape@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
-
 js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
@@ -4160,17 +4249,19 @@ ldap-filter@0.2.2:
   dependencies:
     assert-plus "0.1.5"
 
-ldapauth-fork@~2.5.0:
-  version "2.5.5"
-  resolved "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-2.5.5.tgz#aac2b47022e5a23d6760b1d518a9696958eee67b"
+ldapauth-fork@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-4.0.2.tgz#f87d55908ba4917cca06d8ed6e173cdd65e908c9"
   dependencies:
-    bcryptjs "2.3.0"
-    ldapjs "~1.0.1"
-    lru-cache "3.2.0"
+    "@types/ldapjs" "^1.0.0"
+    "@types/node" "^7.0.21"
+    bcryptjs "^2.4.0"
+    ldapjs "^1.0.1"
+    lru-cache "^4.0.2"
 
-ldapjs@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ldapjs/-/ldapjs-1.0.1.tgz#352b812ae74b0a8e96549a4b896060eee1b9a546"
+ldapjs@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/ldapjs/-/ldapjs-1.0.2.tgz#544ff7032b7b83c68f0701328d9297aa694340f9"
   dependencies:
     asn1 "0.2.3"
     assert-plus "^1.0.0"
@@ -4182,7 +4273,7 @@ ldapjs@~1.0.1:
     vasync "^1.6.4"
     verror "^1.8.1"
   optionalDependencies:
-    dtrace-provider "^0.7.0"
+    dtrace-provider "~0.8"
 
 less-loader@^2.2.3:
   version "2.2.3"
@@ -4487,7 +4578,7 @@ lru-cache@2:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
 
-lru-cache@3.2.0, lru-cache@^3.2.0:
+lru-cache@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee"
   dependencies:
@@ -4500,6 +4591,13 @@ lru-cache@^4.0.1:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
+lru-cache@^4.0.2:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
 lru-queue@0.1:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
@@ -4592,19 +4690,19 @@ markdown-it@^8.2.2:
     mdurl "^1.0.1"
     uc.micro "^1.0.3"
 
-markdown-pdf@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/markdown-pdf/-/markdown-pdf-7.0.0.tgz#3c70e09a6ef3dae2c5059b3a2294bd6581d269ce"
+markdown-pdf@^8.0.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/markdown-pdf/-/markdown-pdf-8.1.1.tgz#25c025d4f4f91869ac0f3f6fd7f7d32237669438"
   dependencies:
     commander "^2.2.0"
     duplexer "^0.1.1"
     extend "^3.0.0"
     highlight.js "^9.1.0"
     phantomjs-prebuilt "^2.1.3"
-    remarkable "^1.6.0"
+    remarkable "^1.7.1"
     stream-from-to "^1.4.2"
     through2 "^2.0.0"
-    tmp "0.0.28"
+    tmp "0.0.33"
 
 markdown-table@^0.4.0:
   version "0.4.0"
@@ -4842,9 +4940,9 @@ minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
 
-minio@^3.1.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/minio/-/minio-3.2.3.tgz#00a2ec46cba41596cf73fca162192718d0197c49"
+minio@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/minio/-/minio-6.0.0.tgz#7e514d38eaacf2264556b232f1c2c063cc6ca7ba"
   dependencies:
     async "^1.5.2"
     block-stream2 "^1.0.0"
@@ -4861,6 +4959,19 @@ minio@^3.1.3:
     xml "^1.0.0"
     xml2js "^0.4.15"
 
+minipass@^2.2.1, minipass@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+  dependencies:
+    minipass "^2.2.1"
+
 mkdirp@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
@@ -4932,10 +5043,14 @@ mysql@^2.12.0:
     safe-buffer "5.1.1"
     sqlstring "2.2.0"
 
-nan@^2.0.8, nan@^2.3.0, nan@^2.3.3, nan@~2.7.0:
+nan@^2.0.8, nan@^2.3.0, nan@^2.3.3:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"
 
+nan@~2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+
 natives@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31"
@@ -4954,6 +5069,14 @@ ncp@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
 
+needle@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
+  dependencies:
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
@@ -5010,7 +5133,7 @@ node-libs-browser@^0.7.0:
     util "^0.10.3"
     vm-browserify "0.0.4"
 
-node-pre-gyp@^0.6.36, node-pre-gyp@~0.6.38:
+node-pre-gyp@^0.6.36:
   version "0.6.38"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz#e92a20f83416415bb4086f6d1fb78b3da73d113d"
   dependencies:
@@ -5025,6 +5148,21 @@ node-pre-gyp@^0.6.36, node-pre-gyp@~0.6.38:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
+node-pre-gyp@~0.10.1:
+  version "0.10.2"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz#e8945c20ef6795a20aac2b44f036eb13cf5146e3"
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.0"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4"
+
 node-static@0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/node-static/-/node-static-0.6.0.tgz#e8543a897f3c82048220b39569284d44796eb1e2"
@@ -5081,6 +5219,17 @@ normalize-url@^1.4.0:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
+npm-bundled@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
+
+npm-packlist@^1.1.6:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -5122,14 +5271,14 @@ oauth@0.9.x:
   version "0.9.15"
   resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1"
 
-object-assign@4.1.0, object-assign@^4.0.1, object-assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
-
 object-assign@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
 
+object-assign@^4.0.1, object-assign@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
+
 object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
@@ -5160,9 +5309,9 @@ object.pick@^1.2.0:
   dependencies:
     isobject "^3.0.1"
 
-octicons@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/octicons/-/octicons-3.5.0.tgz#f7ff5935674d8b114f6d80c454bfaa01797a4e30"
+octicons@~4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/octicons/-/octicons-4.4.0.tgz#aca3bd32f5dc1d907a8d0de744f78e0c54e19446"
 
 on-finished@~2.3.0:
   version "2.3.0"
@@ -5244,7 +5393,7 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
@@ -5372,11 +5521,11 @@ passport-github@^1.1.0:
   dependencies:
     passport-oauth2 "1.x.x"
 
-passport-gitlab2@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/passport-gitlab2/-/passport-gitlab2-2.2.0.tgz#7380c364cdb4e8a9536ba02dd04ca97acb908da9"
+passport-gitlab2@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/passport-gitlab2/-/passport-gitlab2-4.0.0.tgz#08de8b54d58cbe6f22f577f977f7874df3c26efb"
   dependencies:
-    passport-oauth2 "^1.3.0"
+    passport-oauth2 "^1.4.0"
 
 passport-google-oauth20@^1.0.0:
   version "1.0.0"
@@ -5384,12 +5533,14 @@ passport-google-oauth20@^1.0.0:
   dependencies:
     passport-oauth2 "1.x.x"
 
-passport-ldapauth@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/passport-ldapauth/-/passport-ldapauth-0.6.0.tgz#4829eb073e1f4632fae3d1795e7e0f49af46bf92"
+passport-ldapauth@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/passport-ldapauth/-/passport-ldapauth-2.0.0.tgz#42dff004417185d0a4d9f776a3eed8d4731fd689"
   dependencies:
-    ldapauth-fork "~2.5.0"
-    passport-strategy "1.x.x"
+    "@types/node" "^7.0.23"
+    "@types/passport" "^0.3.3"
+    ldapauth-fork "^4.0.1"
+    passport-strategy "^1.0.0"
 
 passport-local@^1.0.0:
   version "1.0.0"
@@ -5405,7 +5556,7 @@ passport-oauth1@1.x.x:
     passport-strategy "1.x.x"
     utils-merge "1.x.x"
 
-passport-oauth2@1.x.x, passport-oauth2@^1.3.0, passport-oauth2@^1.4.0:
+passport-oauth2@1.x.x, passport-oauth2@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.4.0.tgz#f62f81583cbe12609be7ce6f160b9395a27b86ad"
   dependencies:
@@ -5433,7 +5584,7 @@ passport-saml@^0.31.0:
     xmlbuilder "^9.0.4"
     xmldom "0.1.x"
 
-passport-strategy@*, passport-strategy@1.x.x:
+passport-strategy@*, passport-strategy@1.x.x, passport-strategy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
 
@@ -5450,9 +5601,9 @@ passport.socketio@^3.7.0:
   dependencies:
     xtend "^4.0.0"
 
-passport@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/passport/-/passport-0.3.2.tgz#9dd009f915e8fe095b0124a01b8f82da07510102"
+passport@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/passport/-/passport-0.4.0.tgz#c5095691347bd5ad3b5e180238c3914d16f05811"
   dependencies:
     passport-strategy "1.x.x"
     pause "0.0.1"
@@ -5549,14 +5700,11 @@ pg-hstore@^2.3.2:
   dependencies:
     underscore "^1.7.0"
 
-pg-pool@1.*:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-1.8.0.tgz#f7ec73824c37a03f076f51bfdf70e340147c4f37"
-  dependencies:
-    generic-pool "2.4.3"
-    object-assign "4.1.0"
+pg-pool@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.3.tgz#c022032c8949f312a4f91fb6409ce04076be3257"
 
-pg-types@1.*:
+pg-types@~1.12.1:
   version "1.12.1"
   resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-1.12.1.tgz#d64087e3903b58ffaad279e7595c52208a14c3d2"
   dependencies:
@@ -5565,20 +5713,19 @@ pg-types@1.*:
     postgres-date "~1.0.0"
     postgres-interval "^1.1.0"
 
-pg@^6.1.2:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-6.4.2.tgz#c364011060eac7a507a2ae063eb857ece910e27f"
+pg@^7.4.3:
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-7.4.3.tgz#f7b6f93f5340ecc2596afbb94a13e3d6b609834b"
   dependencies:
     buffer-writer "1.0.1"
-    js-string-escape "1.0.1"
     packet-reader "0.3.1"
     pg-connection-string "0.1.3"
-    pg-pool "1.*"
-    pg-types "1.*"
-    pgpass "1.*"
+    pg-pool "~2.0.3"
+    pg-types "~1.12.1"
+    pgpass "1.x"
     semver "4.3.2"
 
-pgpass@1.*:
+pgpass@1.x:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz#2a7bb41b6065b67907e91da1b07c1847c877b306"
   dependencies:
@@ -6056,9 +6203,9 @@ randomatic@^1.1.3:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-randomcolor@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/randomcolor/-/randomcolor-0.4.4.tgz#5ff56862e97ba03beb0419ff0536ec7aff59eeeb"
+randomcolor@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/randomcolor/-/randomcolor-0.5.3.tgz#7f90f2f2a7f6d5a52232161eeaeeaea9ac3b5815"
 
 range-parser@~1.2.0:
   version "1.2.0"
@@ -6098,6 +6245,15 @@ rc@^1.1.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -6341,7 +6497,7 @@ remark@^5.0.1:
     remark-stringify "^1.1.0"
     unified "^4.1.1"
 
-remarkable@^1.6.0:
+remarkable@^1.7.1:
   version "1.7.1"
   resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.1.tgz#aaca4972100b66a642a63a1021ca4bac1be3bff6"
   dependencies:
@@ -6558,7 +6714,7 @@ safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
-safe-buffer@^5.1.1:
+safe-buffer@^5.1.1, safe-buffer@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
 
@@ -6572,6 +6728,10 @@ safefs@^3.1.2:
   dependencies:
     graceful-fs "*"
 
+"safer-buffer@>= 2.1.2 < 3":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+
 sax@0.5.x:
   version "0.5.8"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
@@ -6580,6 +6740,10 @@ sax@1.2.1, sax@>=0.6.0, sax@^1.2.1, sax@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
 
+sax@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+
 scandirectory@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/scandirectory/-/scandirectory-2.5.0.tgz#6ce03f54a090b668e3cbedbf20edf9e310593e72"
@@ -6735,9 +6899,9 @@ shimmer@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.1.0.tgz#97d7377137ffbbab425522e429fe0aa89a488b35"
 
-shortid@2.2.6:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.6.tgz#3abbefc6c51074cf2c1f1e72f6216a1b45876d72"
+shortid@2.2.8:
+  version "2.2.8"
+  resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.8.tgz#033b117d6a2e975804f6f0969dbe7d3d0b355131"
 
 sigmund@^1.0.1, sigmund@~1.0.0:
   version "1.0.1"
@@ -6868,12 +7032,12 @@ sprintf@0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/sprintf/-/sprintf-0.1.5.tgz#8f83e39a9317c1a502cb7db8050e51c679f6edcf"
 
-sqlite3@^3.1.8:
-  version "3.1.12"
-  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-3.1.12.tgz#2b3a14b17162e39e8aa6e1e2487a41d0795396d8"
+sqlite3@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-4.0.1.tgz#78e815bb50d7320fd90f03f1d7c3a920010d7ce3"
   dependencies:
-    nan "~2.7.0"
-    node-pre-gyp "~0.6.38"
+    nan "~2.10.0"
+    node-pre-gyp "~0.10.1"
 
 sqlstring@2.2.0:
   version "2.2.0"
@@ -6923,9 +7087,9 @@ standard@^9.0.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
-store@^1.3.20:
-  version "1.3.20"
-  resolved "https://registry.yarnpkg.com/store/-/store-1.3.20.tgz#13ea7e3fb2d6c239868265d686b1d84e99c5be3e"
+store@^2.0.12:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/store/-/store-2.0.12.tgz#8c534e2a0b831f72b75fc5f1119857c44ef5d593"
 
 stream-browserify@^2.0.1:
   version "2.0.1"
@@ -7176,6 +7340,18 @@ tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
+tar@^4:
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd"
+  dependencies:
+    chownr "^1.0.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.3.3"
+    minizlib "^1.1.0"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
+
 taskgroup@^4.0.5, taskgroup@^4.2.0:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/taskgroup/-/taskgroup-4.3.1.tgz#7de193febd768273c457730497024d512c27915a"
@@ -7266,18 +7442,18 @@ tiny-emitter@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.2.tgz#82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c"
 
-tmp@0.0.28:
-  version "0.0.28"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120"
-  dependencies:
-    os-tmpdir "~1.0.1"
-
 tmp@0.0.29:
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz#f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"
   dependencies:
     os-tmpdir "~1.0.1"
 
+tmp@0.0.33:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  dependencies:
+    os-tmpdir "~1.0.2"
+
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
@@ -7642,14 +7818,14 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
+validator@^10.4.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-10.4.0.tgz#ee99a44afb3bb5ed350a159f056ca72a204cfc3c"
+
 validator@^5.2.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/validator/-/validator-5.7.0.tgz#7a87a58146b695ac486071141c0c49d67da05e5c"
 
-validator@^6.2.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-6.3.0.tgz#47ce23ed8d4eaddfa9d4b8ef0071b6cf1078d7c8"
-
 validator@~9.4.1:
   version "9.4.1"
   resolved "https://registry.yarnpkg.com/validator/-/validator-9.4.1.tgz#abf466d398b561cd243050112c6ff1de6cc12663"
@@ -8001,9 +8177,9 @@ xregexp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
 
-xss@^0.3.3:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/xss/-/xss-0.3.4.tgz#f4eca4e83e10a91a578ef8caa10fb416c38ce15b"
+xss@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.3.tgz#d04bd2558fd6c29c46113824d5e8b2a910054e23"
   dependencies:
     commander "^2.9.0"
     cssfilter "0.0.10"
@@ -8026,6 +8202,10 @@ yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
+
 yargs-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"

From a26c142ade4dabd1d9be17b38a2eb402613323a0 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 17:43:08 +0200
Subject: [PATCH 54/74] Revert "Update pg"

This reverts commit 4d4163c1705af7dbdeeac3e788e72f6683221680.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 246147a..03cd43f 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "passport-saml": "^0.31.0",
     "passport.socketio": "^3.7.0",
     "pdfobject": "^2.0.201604172",
-    "pg": "^7.4.3",
+    "pg": "^6.1.2",
     "pg-hstore": "^2.3.2",
     "prismjs": "^1.6.0",
     "randomcolor": "^0.5.3",

From bd93269daebe7cdf89959213dbf70862073cf634 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 17:45:26 +0200
Subject: [PATCH 55/74] Update yarn.lock

---
 yarn.lock | 51 ++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 76856ca..796c2bd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3036,6 +3036,10 @@ generic-pool@2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.2.tgz#886bc5bf0beb7db96e81bcbba078818de5a62683"
 
+generic-pool@2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-2.4.3.tgz#780c36f69dfad05a5a045dd37be7adca11a4f6ff"
+
 get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -4028,6 +4032,10 @@ js-sequence-diagrams@^1000000.0.6:
     raphael "~2.1.x"
     underscore "~1.4.x"
 
+js-string-escape@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+
 js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
@@ -5271,14 +5279,14 @@ oauth@0.9.x:
   version "0.9.15"
   resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1"
 
+object-assign@4.1.0, object-assign@^4.0.1, object-assign@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
+
 object-assign@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
 
-object-assign@^4.0.1, object-assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
-
 object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
@@ -5700,32 +5708,41 @@ pg-hstore@^2.3.2:
   dependencies:
     underscore "^1.7.0"
 
-pg-pool@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.3.tgz#c022032c8949f312a4f91fb6409ce04076be3257"
+pg-int8@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
 
-pg-types@~1.12.1:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-1.12.1.tgz#d64087e3903b58ffaad279e7595c52208a14c3d2"
+pg-pool@1.*:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-1.8.0.tgz#f7ec73824c37a03f076f51bfdf70e340147c4f37"
   dependencies:
+    generic-pool "2.4.3"
+    object-assign "4.1.0"
+
+pg-types@1.*:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-1.13.0.tgz#75f490b8a8abf75f1386ef5ec4455ecf6b345c63"
+  dependencies:
+    pg-int8 "1.0.1"
     postgres-array "~1.0.0"
     postgres-bytea "~1.0.0"
     postgres-date "~1.0.0"
     postgres-interval "^1.1.0"
 
-pg@^7.4.3:
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-7.4.3.tgz#f7b6f93f5340ecc2596afbb94a13e3d6b609834b"
+pg@^6.1.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-6.4.2.tgz#c364011060eac7a507a2ae063eb857ece910e27f"
   dependencies:
     buffer-writer "1.0.1"
+    js-string-escape "1.0.1"
     packet-reader "0.3.1"
     pg-connection-string "0.1.3"
-    pg-pool "~2.0.3"
-    pg-types "~1.12.1"
-    pgpass "1.x"
+    pg-pool "1.*"
+    pg-types "1.*"
+    pgpass "1.*"
     semver "4.3.2"
 
-pgpass@1.x:
+pgpass@1.*:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz#2a7bb41b6065b67907e91da1b07c1847c877b306"
   dependencies:

From 7cfade712f35fb77c001615768379e0840d34045 Mon Sep 17 00:00:00 2001
From: "Christoph (Sheogorath) Kern" <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 19:14:15 +0200
Subject: [PATCH 56/74] Update de.json (POEditor.com)

---
 locales/de.json | 222 +++++++++++++++++++++++++-----------------------
 1 file changed, 114 insertions(+), 108 deletions(-)

diff --git a/locales/de.json b/locales/de.json
index b253910..40d5546 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -1,109 +1,115 @@
 {
-	"Collaborative markdown notes": "Gemeinschaftliche Markdown Notizen",
-	"Realtime collaborative markdown notes on all platforms.": "Gemeinschaftliche  Notizen in Echtzeit auf allen Plattformen.",
-	"Best way to write and share your knowledge in markdown.": "Der beste Weg, Notizen zu schreiben und teilen.",
-	"Intro": "Intro",
-	"History": "Verlauf",
-	"New guest note": "Neue Gast Notiz",
-	"Collaborate with URL": "Zusammenarbeiten mit URL",
-	"Support charts and MathJax": "Unterstützt charts und Mathjax",
-	"Support slide mode": "Unterstützt Präsentationsmodus",
-	"Sign In": "Einloggen",
-	"Below is the history from browser": "Lokaler Browserverlauf",
-	"Welcome!": "Willkommen!",
-	"New note": "Neue Notiz",
-	"or": "oder",
-	"Sign Out": "Ausloggen",
-	"Explore all features": "Alle Funktionen",
-	"Select tags...": "Tags auswählen ...",
-	"Search keyword...": "Suche nach Stichwort ...",
-	"Sort by title": "Nach Titel sortieren",
-	"Title": "Titel",
-	"Sort by time": "Nach Uhrzeit sortieren",
-	"Time": "Uhrzeit",
-	"Export history": "Verlauf exportieren",
-	"Import history": "Verlauf importieren",
-	"Clear history": "Verlauf löschen",
-	"Refresh history": "Verlauf aktualisieren",
-	"No history": "Kein Verlauf",
-	"Import from browser": "Vom Browser importieren",
-	"Releases": "Versionen",
-	"Are you sure?": "Sind sie sicher?",
-	"Do you really want to delete this note?": "Möchten Sie diese Notiz wirklich löschen?",
-	"All users will lose their connection.": "Alle Benutzer werden getrennt.",
-	"Cancel": "Abbrechen",
-	"Yes, do it!": "Ja, mach es!",
-	"Choose method": "Methode wählen",
-	"Sign in via %s": "Einloggen über %s",
-	"New": "Neu",
-	"Publish": "Veröffentlichen",
-	"Extra": "Extra",
-	"Revision": "Version",
-	"Slide Mode": "Präsentationsmodus",
-	"Export": "Exportieren",
-	"Import": "Importieren",
-	"Clipboard": "Zwischenablage",
-	"Download": "Download",
-	"Raw HTML": "Reines HTML",
-	"Edit": "Bearbeiten",
-	"View": "Anzeigen",
-	"Both": "Beides",
-	"Help": "Hilfe",
-	"Upload Image": "Foto hochladen",
-	"Menu": "Menü",
-	"This page need refresh": "Bitte laden Sie die Seite neu",
-	"You have an incompatible client version.": "Ihre Client Version ist nicht mit dem Server kompatibel",
-	"Refresh to update.": "Neu laden zum Updaten.",
-	"New version available!": "Neue Version verfügbar.",
-	"See releases notes here": "Versionshinweise",
-	"Refresh to enjoy new features.": "Neu laden für neue Funktionen",
-	"Your user state has changed.": "Ihr Nutzerstatus hat sich geändert.",
-	"Refresh to load new user state.": "Neu laden für neuen Nutzerstatus.",
-	"Refresh": "Neu laden",
-	"Contacts": "Kontakte",
-	"Report an issue": "Fehlerbericht senden",
-	"Meet us on %s": "Triff uns auf %s",
-	"Send us email": "Kontakt",
-	"Documents": "Dokumente",
-	"Features": "Funktionen",
-	"YAML Metadata": "YAML Metadaten",
-	"Slide Example": "Beispiel Präsentation",
-	"Cheatsheet": "Cheatsheet",
-	"Example": "Beispiel",
-	"Syntax": "Syntax",
-	"Header": "Überschrift",
-	"Unordered List": "Stichpunkte",
-	"Ordered List": "Nummeriert",
-	"Todo List": "To Do Liste",
-	"Blockquote": "Zitat",
-	"Bold font": "Fett",
-	"Italics font": "Kursiv",
-	"Strikethrough": "Durchgestrichen",
-	"Inserted text": "Unterstrichen",
-	"Marked text": "Markiert",
-	"Link": "Link",
-	"Image": "Foto",
-	"Code": "Code",
-	"Externals": "Extern",
-	"This is a alert area.": "Hinweisfeld",
-	"Revert": "Zurücksetzen",
-	"Import from clipboard": "Importieren aus der Zwischenablage",
-	"Paste your markdown or webpage here...": "Markdown oder Website hier einfügen",
-	"Clear": "Zurücksetzen",
-	"This note is locked": "Diese Notiz ist gesperrt",
-	"Sorry, only owner can edit this note.": "Entschuldigung, nur der Besitzer darf die Notiz bearbeiten.",
-	"OK": "Ok",
-	"Reach the limit": "Limit erreicht",
-	"Sorry, you've reached the max length this note can be.": "Entschuldigung, die maximale Länge der Notiz ist erreicht.",
-	"Please reduce the content or divide it to more notes, thank you!": "Bitte reduzieren Sie den Inhalt oder nutzen zwei Notizen, danke.",
-	"Import from Gist": "Aus GitHub Gist importieren",
-	"Paste your gist url here...": "gist URL hier einfügen ...",
-	"Import from Snippet": "Aus Snippet importieren",
-	"Select From Available Projects": "Aus verfügbaren Projekten wählen",
-	"Select From Available Snippets": "Aus verfügbaren Snippets wählen",
-	"OR": "Oder",
-	"Export to Snippet": "Zu Snippet exportieren",
-	"Select Visibility Level": "Sichtbarkeit bestimmen",
-	"Night Theme": "Nachtmodus",
-	"Follow us on %s and %s.": "Folge uns auf %s und %s."
-}
+    "Collaborative markdown notes": "Gemeinschaftliche Markdown Notizen",
+    "Realtime collaborative markdown notes on all platforms.": "Gemeinschaftliche  Notizen in Echtzeit auf allen Plattformen.",
+    "Best way to write and share your knowledge in markdown.": "Der beste Weg, Notizen zu schreiben und teilen.",
+    "Intro": "Intro",
+    "History": "Verlauf",
+    "New guest note": "Neue Gast Notiz",
+    "Collaborate with URL": "Zusammenarbeiten mit URL",
+    "Support charts and MathJax": "Unterstützt charts und Mathjax",
+    "Support slide mode": "Unterstützt Präsentationsmodus",
+    "Sign In": "Einloggen",
+    "Below is the history from browser": "Lokaler Browserverlauf",
+    "Welcome!": "Willkommen!",
+    "New note": "Neue Notiz",
+    "or": "oder",
+    "Sign Out": "Ausloggen",
+    "Explore all features": "Alle Funktionen",
+    "Select tags...": "Tags auswählen ...",
+    "Search keyword...": "Suche nach Stichwort ...",
+    "Sort by title": "Nach Titel sortieren",
+    "Title": "Titel",
+    "Sort by time": "Nach Uhrzeit sortieren",
+    "Time": "Uhrzeit",
+    "Export history": "Verlauf exportieren",
+    "Import history": "Verlauf importieren",
+    "Clear history": "Verlauf löschen",
+    "Refresh history": "Verlauf aktualisieren",
+    "No history": "Kein Verlauf",
+    "Import from browser": "Vom Browser importieren",
+    "Releases": "Versionen",
+    "Are you sure?": "Sind sie sicher?",
+    "Do you really want to delete this note?": "Möchten Sie diese Notiz wirklich löschen?",
+    "All users will lose their connection.": "Alle Benutzer werden getrennt.",
+    "Cancel": "Abbrechen",
+    "Yes, do it!": "Ja, mach es!",
+    "Choose method": "Methode wählen",
+    "Sign in via %s": "Einloggen über %s",
+    "New": "Neu",
+    "Publish": "Veröffentlichen",
+    "Extra": "Extra",
+    "Revision": "Version",
+    "Slide Mode": "Präsentationsmodus",
+    "Export": "Exportieren",
+    "Import": "Importieren",
+    "Clipboard": "Zwischenablage",
+    "Download": "Download",
+    "Raw HTML": "Reines HTML",
+    "Edit": "Bearbeiten",
+    "View": "Anzeigen",
+    "Both": "Beides",
+    "Help": "Hilfe",
+    "Upload Image": "Foto hochladen",
+    "Menu": "Menü",
+    "This page need refresh": "Bitte laden Sie die Seite neu",
+    "You have an incompatible client version.": "Ihre Client Version ist nicht mit dem Server kompatibel",
+    "Refresh to update.": "Neu laden zum Updaten.",
+    "New version available!": "Neue Version verfügbar.",
+    "See releases notes here": "Versionshinweise",
+    "Refresh to enjoy new features.": "Neu laden für neue Funktionen",
+    "Your user state has changed.": "Ihr Nutzerstatus hat sich geändert.",
+    "Refresh to load new user state.": "Neu laden für neuen Nutzerstatus.",
+    "Refresh": "Neu laden",
+    "Contacts": "Kontakte",
+    "Report an issue": "Fehlerbericht senden",
+    "Meet us on %s": "Triff uns auf %s",
+    "Send us email": "Kontakt",
+    "Documents": "Dokumente",
+    "Features": "Funktionen",
+    "YAML Metadata": "YAML Metadaten",
+    "Slide Example": "Beispiel Präsentation",
+    "Cheatsheet": "Cheatsheet",
+    "Example": "Beispiel",
+    "Syntax": "Syntax",
+    "Header": "Überschrift",
+    "Unordered List": "Stichpunkte",
+    "Ordered List": "Nummeriert",
+    "Todo List": "To Do Liste",
+    "Blockquote": "Zitat",
+    "Bold font": "Fett",
+    "Italics font": "Kursiv",
+    "Strikethrough": "Durchgestrichen",
+    "Inserted text": "Unterstrichen",
+    "Marked text": "Markiert",
+    "Link": "Link",
+    "Image": "Foto",
+    "Code": "Code",
+    "Externals": "Extern",
+    "This is a alert area.": "Hinweisfeld",
+    "Revert": "Zurücksetzen",
+    "Import from clipboard": "Importieren aus der Zwischenablage",
+    "Paste your markdown or webpage here...": "Markdown oder Website hier einfügen",
+    "Clear": "Zurücksetzen",
+    "This note is locked": "Diese Notiz ist gesperrt",
+    "Sorry, only owner can edit this note.": "Entschuldigung, nur der Besitzer darf die Notiz bearbeiten.",
+    "OK": "Ok",
+    "Reach the limit": "Limit erreicht",
+    "Sorry, you've reached the max length this note can be.": "Entschuldigung, die maximale Länge der Notiz ist erreicht.",
+    "Please reduce the content or divide it to more notes, thank you!": "Bitte reduzieren Sie den Inhalt oder nutzen zwei Notizen, danke.",
+    "Import from Gist": "Aus GitHub Gist importieren",
+    "Paste your gist url here...": "gist URL hier einfügen ...",
+    "Import from Snippet": "Aus Snippet importieren",
+    "Select From Available Projects": "Aus verfügbaren Projekten wählen",
+    "Select From Available Snippets": "Aus verfügbaren Snippets wählen",
+    "OR": "Oder",
+    "Export to Snippet": "Zu Snippet exportieren",
+    "Select Visibility Level": "Sichtbarkeit bestimmen",
+    "Night Theme": "Nachtmodus",
+    "Follow us on %s and %s.": "Folge uns auf %s und %s.",
+    "Privacy": "Privatsphäre",
+    "Terms of Use": "Nutzungsbedingungen",
+    "Do you really want to delete your user account?": "Möchten Sie wirklich Ihr Nutzeraccount löschen?",
+    "This will delete your account, all notes that are owned by you and remove all references to your account from other notes.": "Hiermit löschen Sie Ihren Account, alle Ihre Dokumente und alle Verweise auf Ihren Account aus anderen Dokumenten.",
+    "Delete user": "Benutzer löschen",
+    "Export user data": "Exportiere Nutzerdaten"
+}
\ No newline at end of file

From 2fc4e911fb99a93c96e43bdd8bb2ec9850a6602c Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Wed, 27 Jun 2018 22:06:30 +0200
Subject: [PATCH 57/74] Release notes for 1.2.0

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 public/docs/release-notes.md | 48 ++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/public/docs/release-notes.md b/public/docs/release-notes.md
index 891c506..6620200 100644
--- a/public/docs/release-notes.md
+++ b/public/docs/release-notes.md
@@ -1,6 +1,54 @@
 Release Notes
 ===
 
+<i class="fa fa-tag"></i> 1.2.0 <i class="fa fa-clock-o"></i> 2018-06-28 00:00
+---
+
+### Announcement
+* HackMD CE is renamed to CodiMD to prevent confusion. [For details see here](https://github.com/hackmdio/codimd#hackmd-ce-became-codimd)
+
+### Enhancements
+* Show full title by hovering over to table of contents entries
+* Add generic OAUTH2 support for authentication
+* Redirect unauthenticated user to login page on "forbidden" pages
+* Add ability to add ToS and privacy documents without code changes
+* Add account deletion as part of user self-management
+* Add download of all own notes
+* Add privacy policy example (no legal advice)
+* Increase checkbox size on slides
+* Add support for Azure blob storage for image uploads
+* Add Korean translation
+* Add note about official K8s chart for deployment
+* Add toolbar for markdown shortcuts in editor
+* Add ability to disable Gravatar integration
+* Add print icon to slide menu which leads to the print view.
+* Add sequelize to setup instructions
+* Update various packages
+
+### Fixes
+* Fix local writes for non-existing translations in production
+* Fix wrong documentation about default image upload type
+* Fix possible error if CodiMD is started with wrong working directory
+* Fix issues caused by cached/cacheeable client config
+* Fix issues caused by notes created via curl/API with CRLF line endings
+* Fix broken images for downloaded PDFs while using `filesystem` as `imageUploadType`
+* Fix Unicode URLs when using `allowFreeURL=true`
+
+### Refactors
+* Split auth documentation into multiple documents
+
+### Removes
+* Remove polyfill for `useCDN=false` setups
+* Remove unused and no longer needed symlink from translations
+
+### Honorable mentions
+* [Adam Hoka (ahoka)](https://github.com/ahoka)
+* [Edgar Z. Alvarenga (aivuk)](https://github.com/aivuk)
+* [Jacob Burden (jekrb)](https://github.com/jekrb)
+* [Pedro Ferreira (pferreir)](https://github.com/pferreir)
+* [TC Liu (liuderchi)](https://github.com/liuderchi)
+
+
 <i class="fa fa-tag"></i> 1.1.1-ce <i class="fa fa-clock-o"></i> 2018-05-23 12:00
 ---
 

From 33a4b88dab6cab699c85e669820d7fbd037d98ba Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Sat, 30 Jun 2018 19:36:33 +0200
Subject: [PATCH 58/74] Release 1.2.0

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 03cd43f..88bef3e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CodiMD",
-  "version": "1.1.1-ce",
+  "version": "1.2.0",
   "description": "Realtime collaborative markdown notes on all platforms.",
   "main": "app.js",
   "license": "AGPL-3.0",

From 4e38d1836e49fb80fecb95726b30cb637e1fbaa6 Mon Sep 17 00:00:00 2001
From: "Christoph (Sheogorath) Kern" <sheogorath@shivering-isles.com>
Date: Mon, 2 Jul 2018 09:41:12 +0200
Subject: [PATCH 59/74] Update it.json (POEditor.com)

---
 locales/it.json | 217 +++++++++++++++++++++++++-----------------------
 1 file changed, 114 insertions(+), 103 deletions(-)

diff --git a/locales/it.json b/locales/it.json
index 5c97208..207f3e7 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -1,104 +1,115 @@
 {
-	"Collaborative markdown notes": "Note collaborative in markdown",
-	"Realtime collaborative markdown notes on all platforms.": "Note markdown collaborative per tutte le piattaforme.",
-	"Best way to write and share your knowledge in markdown.": "Miglior modo per scrivere e condividere le tue conoscenze in markdown.",
-	"Intro": "Intro",
-	"History": "Cronologia",
-	"New guest note": "Nuova nota ospite",
-	"Collaborate with URL": "Collabora tramite URL",
-	"Support charts and MathJax": "Supporta grafici e MathJax",
-	"Support slide mode": "Supporta slide",
-	"Sign In": "Registrati",
-	"Below is the history from browser": "Below is the history from browser",
-	"Welcome!": "Benvenuto!",
-	"New note": "Nuova nota",
-	"or": "o",
-	"Sign Out": "Disconettiti",
-	"Explore all features": "Escplora tutte le funzioni",
-	"Select tags...": "Seleziona tag...",
-	"Search keyword...": "Cerca...",
-	"Sort by title": "Ordina per titolo",
-	"Title": "Titolo",
-	"Sort by time": "Ordina per data",
-	"Time": "Data",
-	"Export history": "Esporta cronologia",
-	"Import history": "Importa cronologia",
-	"Clear history": "Cancella cronologia",
-	"Refresh history": "Aggiorna cronologia",
-	"No history": "Nessuna cronologia",
-	"Import from browser": "Importa da browser",
-	"Releases": "Versioni",
-	"Are you sure?": "Sei sicuro?",
-	"Cancel": "Cancella",
-	"Yes, do it!": "SI, fallo!",
-	"Choose method": "Scegli metodo",
-	"Sign in via %s": "Registrati con %s",
-	"New": "Nuovo",
-	"Publish": "Pubblica",
-	"Extra": "Extra",
-	"Revision": "Revisione",
-	"Slide Mode": "Modalità slide",
-	"Export": "Esporta",
-	"Import": "Importa",
-	"Clipboard": "Appunti",
-	"Download": "Scarica",
-	"Raw HTML": "Raw HTML",
-	"Edit": "Modifica",
-	"View": "Visualizza",
-	"Both": "Entrambi",
-	"Help": "Aiuto",
-	"Upload Image": "Carica Immagine",
-	"Menu": "Menu",
-	"This page need refresh": "Questa pagina deve essere aggiornata",
-	"You have an incompatible client version.": "Hai una versione incompatibile.",
-	"Refresh to update.": "Ricarica per aggiornare.",
-	"New version available!": "Nuova versione disponibile!",
-	"See releases notes here": "Vedi note di rilascio qui",
-	"Refresh to enjoy new features.": "Ricarica per godere delle nuove funzioni.",
-	"Your user state has changed.": "Il tuo stato utente è cambiato.",
-	"Refresh to load new user state.": "Aggiorna per caricare il nuovo stato utente.",
-	"Refresh": "Ricarica",
-	"Contacts": "Contatti",
-	"Report an issue": "Segnala un problema",
-	"Send us email": "Inviaci una email",
-	"Documents": "Documenti",
-	"Features": "Caratteristiche",
-	"YAML Metadata": "YAML Metadata",
-	"Slide Example": "Esempio Slide",
-	"Cheatsheet": "Cheatsheet",
-	"Example": "Esempio",
-	"Syntax": "Sintassi",
-	"Header": "Intestazione",
-	"Unordered List": "Lista non ordinata",
-	"Ordered List": "Lista ordinata",
-	"Todo List": "Elenco",
-	"Blockquote": "Blockquote",
-	"Bold font": "Grassetto",
-	"Italics font": "Corsivo",
-	"Strikethrough": "Barrato",
-	"Inserted text": "Sottolineato",
-	"Marked text": "Evidenziato",
-	"Link": "Link",
-	"Image": "Immagine",
-	"Code": "Codice",
-	"Externals": "Esterno",
-	"This is a alert area.": "Questa è un avviso.",
-	"Revert": "Revert",
-	"Import from clipboard": "Imposta dagli Appunti",
-	"Paste your markdown or webpage here...": "Incollare il markdown o una pagina web qui...",
-	"Clear": "Pulisci",
-	"This note is locked": "Questa nota è bloccata",
-	"Sorry, only owner can edit this note.": "Siamo spiacenti, solo il proprietario può modificare questa nota.",
-	"OK": "OK",
-	"Reach the limit": "Limite raggiunto",
-	"Sorry, you've reached the max length this note can be.": "Siamo spiacenti, hai raggiunto la lunghezza massima per questa nota.",
-	"Please reduce the content or divide it to more notes, thank you!": "Si prega di ridurre il contenuto o dividerlo in più note, grazie!",
-	"Import from Gist": "Importa da Gist",
-	"Paste your gist url here...": "Incolla il tuo link gist qui...",
-	"Import from Snippet": "Importa da Snippet",
-	"Select From Available Projects": "Seleziona da progetti disponibili",
-	"Select From Available Snippets": "Seleziona da snippets disponibili",
-	"OR": "O",
-	"Export to Snippet": "Esporta Snippet",
-	"Select Visibility Level": "Seleziona livello visibilità"
-}
+    "Collaborative markdown notes": "Note collaborative in markdown",
+    "Realtime collaborative markdown notes on all platforms.": "Note markdown collaborative in tempo reale per tutte le piattaforme.",
+    "Best way to write and share your knowledge in markdown.": "Miglior modo per scrivere e condividere le tue conoscenze in markdown.",
+    "Intro": "Intro",
+    "History": "Cronologia",
+    "New guest note": "Nuova nota ospite",
+    "Collaborate with URL": "Collabora tramite URL",
+    "Support charts and MathJax": "Supporta grafici e MathJax",
+    "Support slide mode": "Supporta modalità slide",
+    "Sign In": "Registrati",
+    "Below is the history from browser": "Qui sotto c'è la cronologia del browser",
+    "Welcome!": "Benvenuto!",
+    "New note": "Nuova nota",
+    "or": "o",
+    "Sign Out": "Disconettiti",
+    "Explore all features": "Esplora tutte le funzioni",
+    "Select tags...": "Seleziona tag...",
+    "Search keyword...": "Cerca...",
+    "Sort by title": "Ordina per titolo",
+    "Title": "Titolo",
+    "Sort by time": "Ordina per data",
+    "Time": "Data",
+    "Export history": "Esporta cronologia",
+    "Import history": "Importa cronologia",
+    "Clear history": "Cancella cronologia",
+    "Refresh history": "Aggiorna cronologia",
+    "No history": "Nessuna cronologia",
+    "Import from browser": "Importa da browser",
+    "Releases": "Versioni",
+    "Are you sure?": "Sei sicuro?",
+    "Do you really want to delete this note?": "Vuoi veramente eliminare questa nota?",
+    "All users will lose their connection.": "Tutti gli utenti perderanno la loro connessione.",
+    "Cancel": "Annulla",
+    "Yes, do it!": "SI, fallo!",
+    "Choose method": "Scegli metodo",
+    "Sign in via %s": "Registrati con %s",
+    "New": "Nuovo",
+    "Publish": "Pubblica",
+    "Extra": "Extra",
+    "Revision": "Revisione",
+    "Slide Mode": "Modalità slide",
+    "Export": "Esporta",
+    "Import": "Importa",
+    "Clipboard": "Appunti",
+    "Download": "Scarica",
+    "Raw HTML": "Raw HTML",
+    "Edit": "Modifica",
+    "View": "Visualizza",
+    "Both": "Entrambi",
+    "Help": "Aiuto",
+    "Upload Image": "Carica Immagine",
+    "Menu": "Menu",
+    "This page need refresh": "Questa pagina deve essere aggiornata",
+    "You have an incompatible client version.": "La versione del tuo client è incompatibile.",
+    "Refresh to update.": "Ricarica per aggiornare.",
+    "New version available!": "Nuova versione disponibile!",
+    "See releases notes here": "Vedi note di rilascio qui",
+    "Refresh to enjoy new features.": "Ricarica per godere delle nuove funzioni.",
+    "Your user state has changed.": "Il tuo stato utente è cambiato.",
+    "Refresh to load new user state.": "Aggiorna per caricare il nuovo stato utente.",
+    "Refresh": "Ricarica",
+    "Contacts": "Contatti",
+    "Report an issue": "Segnala un problema",
+    "Meet us on %s": "Vieni a trovarci su %s",
+    "Send us email": "Inviaci una email",
+    "Documents": "Documenti",
+    "Features": "Caratteristiche",
+    "YAML Metadata": "YAML Metadata",
+    "Slide Example": "Esempio Slide",
+    "Cheatsheet": "Cheatsheet",
+    "Example": "Esempio",
+    "Syntax": "Sintassi",
+    "Header": "Intestazione",
+    "Unordered List": "Lista non ordinata",
+    "Ordered List": "Lista ordinata",
+    "Todo List": "Elenco",
+    "Blockquote": "Citazione",
+    "Bold font": "Grassetto",
+    "Italics font": "Corsivo",
+    "Strikethrough": "Barrato",
+    "Inserted text": "Sottolineato",
+    "Marked text": "Evidenziato",
+    "Link": "Link",
+    "Image": "Immagine",
+    "Code": "Codice",
+    "Externals": "Esterni",
+    "This is a alert area.": "Questa è un area di avviso.",
+    "Revert": "Annulla",
+    "Import from clipboard": "Importa dagli appunti",
+    "Paste your markdown or webpage here...": "Incollare il markdown o una pagina web qui...",
+    "Clear": "Pulisci",
+    "This note is locked": "Questa nota è bloccata",
+    "Sorry, only owner can edit this note.": "Siamo spiacenti, solo il proprietario può modificare questa nota.",
+    "OK": "OK",
+    "Reach the limit": "Limite raggiunto",
+    "Sorry, you've reached the max length this note can be.": "Siamo spiacenti, hai raggiunto la lunghezza massima per questa nota.",
+    "Please reduce the content or divide it to more notes, thank you!": "Si prega di ridurre il contenuto o dividerlo in più note, grazie!",
+    "Import from Gist": "Importa da Gist",
+    "Paste your gist url here...": "Incolla il tuo link gist qui...",
+    "Import from Snippet": "Importa da Snippet",
+    "Select From Available Projects": "Seleziona da progetti disponibili",
+    "Select From Available Snippets": "Seleziona da snippets disponibili",
+    "OR": "O",
+    "Export to Snippet": "Esporta Snippet",
+    "Select Visibility Level": "Seleziona livello visibilità",
+    "Night Theme": "Tema Scuro",
+    "Follow us on %s and %s.": "Seguici su %s, e %s.",
+    "Privacy": "Privacy",
+    "Terms of Use": "Termini di Utilizzo",
+    "Do you really want to delete your user account?": "Vuoi veramente cancellare il tuo account utente?",
+    "This will delete your account, all notes that are owned by you and remove all references to your account from other notes.": "Questo cancellerà il tuo account, tutte le note di cui sei proprietario e rimuoverà i riferimenti al tuo account dalle altre note.",
+    "Delete user": "Elimina utente",
+    "Export user data": "Esporta dati utente"
+}
\ No newline at end of file

From d76ea5440a25e76d0aa5d8b3c95a4776be800347 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Tue, 3 Jul 2018 20:36:40 +0200
Subject: [PATCH 60/74] Fixing content types in status router

As it turns out, expressjs doesn't detect the right mimetype and it
seems like I didn't bother to test this enough. So lets fix it for the
next release.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 lib/web/statusRouter.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/web/statusRouter.js b/lib/web/statusRouter.js
index 256fead..7ecf383 100644
--- a/lib/web/statusRouter.js
+++ b/lib/web/statusRouter.js
@@ -17,7 +17,8 @@ statusRouter.get('/status', function (req, res, next) {
   realtime.getStatus(function (data) {
     res.set({
       'Cache-Control': 'private', // only cache by client
-      'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
+      'X-Robots-Tag': 'noindex, nofollow', // prevent crawling
+      'Content-Type': 'application/json'
     })
     res.send(data)
   })
@@ -101,7 +102,8 @@ statusRouter.get('/config', function (req, res) {
   }
   res.set({
     'Cache-Control': 'private', // only cache by client
-    'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
+    'X-Robots-Tag': 'noindex, nofollow', // prevent crawling
+    'Content-Type': 'application/javascript'
   })
   res.render(config.constantsPath, data)
 })

From 1de81600083ed5f4a0813010ddf24e22744176c6 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Tue, 3 Jul 2018 21:25:32 +0200
Subject: [PATCH 61/74] Fix some night mode colors

We have some issues with night mode and the font color. This should fix
this in the permission table and the delete node modal. As well as some
picture styling.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 public/css/index.css         | 11 ++++++++++-
 public/css/markdown.css      |  4 ++++
 public/views/codimd/body.ejs |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/public/css/index.css b/public/css/index.css
index 9cc1766..d9ebf6d 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -310,7 +310,16 @@ body.night{
     overflow: hidden;
 }
 
-.night .dropdown-menu{
+.night .dropdown-menu > li > a {
+    color: #eee;
+}
+
+.night .dropdown-menu > li > a:focus,
+.night .dropdown-menu > li > a:hover {
+  color: #262626
+}
+
+.night .dropdown-menu {
     background: #222;
 }
 
diff --git a/public/css/markdown.css b/public/css/markdown.css
index 85a4c59..23ed6ba 100644
--- a/public/css/markdown.css
+++ b/public/css/markdown.css
@@ -214,3 +214,7 @@
 .markdown-body figure {
     margin: 1em 40px;
 }
+
+.markdown-body img {
+    background-color: transparent;
+}
diff --git a/public/views/codimd/body.ejs b/public/views/codimd/body.ejs
index 4960437..b5932a6 100644
--- a/public/views/codimd/body.ejs
+++ b/public/views/codimd/body.ejs
@@ -233,7 +233,7 @@
                 </button>
                 <h4 class="modal-title" id="myModalLabel"><%= __('Are you sure?') %></h4>
             </div>
-            <div class="modal-body" style="color:black;">
+            <div class="modal-body">
                 <h5 class="ui-delete-modal-msg"><%= __('Do you really want to delete this note?') %></h5>
                 <strong class="ui-delete-modal-item"><%= __('All users will lose their connection.') %></strong>
             </div>

From 734e7b01a55ec2a70227effde61dc0e866de01d5 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Tue, 3 Jul 2018 21:34:45 +0200
Subject: [PATCH 62/74] Remove some unneeded defined inline-stylings

These have no really useful point here. Let's just remove them.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 public/views/index/body.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/views/index/body.ejs b/public/views/index/body.ejs
index a0de8c3..29fa318 100644
--- a/public/views/index/body.ejs
+++ b/public/views/index/body.ejs
@@ -168,7 +168,7 @@
                 </button>
                 <h4 class="modal-title" id="myModalLabel"><%= __('Are you sure?') %></h4>
             </div>
-            <div class="modal-body" style="color:black;">
+            <div class="modal-body">
                 <h5 class="ui-delete-history-modal-msg"></h5>
                 <strong class="ui-delete-history-modal-item"></strong>
             </div>
@@ -188,7 +188,7 @@
                 </button>
                 <h4 class="modal-title" id="myModalLabel"><%= __('Are you sure?') %></h4>
             </div>
-            <div class="modal-body" style="color:black;">
+            <div class="modal-body">
                 <h5 class="ui-delete-user-modal-msg"><%= __('Do you really want to delete your user account?') %></h5>
                 <strong class="ui-delete-user-modal-item"><%= __('This will delete your account, all notes that are owned by you and remove all references to your account from other notes.') %></strong>
             </div>

From 4fe062085324c50f2cfa062258559cf31858ef5f Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Wed, 4 Jul 2018 02:22:48 +0200
Subject: [PATCH 63/74] Refactor generation of ToC

This replaces the existing iterative implementation of the ToC
generation with an recursive one.

This also solves the problem of skipped headers which causes wrong
leveling of them.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 public/vendor/md-toc.js | 100 ++++++++++++++++++++++------------------
 1 file changed, 55 insertions(+), 45 deletions(-)

diff --git a/public/vendor/md-toc.js b/public/vendor/md-toc.js
index 3457d46..5581783 100644
--- a/public/vendor/md-toc.js
+++ b/public/vendor/md-toc.js
@@ -44,59 +44,69 @@
     }
   }
 
-  Toc.prototype._createTocContent = function () {
-    this._elTitleElementsLen = this.elTitleElements.length
-    if (!this._elTitleElementsLen) return
+  Toc.prototype._createTocContent = function recursiveToc(level = 0, titleElements = [], titleNames = [], ulClass = undefined) {
+    // Inititalize our elements from the toc object
+    // which is only available on level 0
+    if (level === 0) {
+      titleElements = this.elTitleElements
+      titleNames = this._elTitlesNames
+      ulClass = this.ulClass
+    }
+    var titleElementsLen = titleElements.length
+    // No need to do anything for an empty ToC
+    if (!titleElementsLen) return
+
     this.tocContent = ''
-    this._tempLists = []
+    var content = '<ul'
+    if (ulClass) {
+      content += ' class="' + ulClass + '"'
+    }
+    content += '>'
+    var iterTag = titleNames[level]
+    var recurse = false
 
-    for (var i = 0; i < this._elTitleElementsLen; i++) {
-      var j = i + 1
-      this._elTitleElement = this.elTitleElements[i]
-      this._elTitleElementName = this._elTitleElement.tagName
-      this._elTitleElementTitle = this._elTitleElement.textContent.replace(/"/g, '&quot;')
-      this._elTitleElementText = (typeof this.process === 'function' ? this.process(this._elTitleElement) : this._elTitleElement.innerHTML).replace(/<(?:.|\n)*?>/gm, '')
-      var id = this._elTitleElement.getAttribute('id')
-      if (!id) {
-        this._elTitleElement.setAttribute('id', 'tip' + i)
-        id = '#tip' + i
-      } else {
-        id = '#' + id
-      }
+    for (var element; element = titleElements.shift();) {
+      var elementTag = element.tagName.toLowerCase()
 
-      this.tocContent += '<li><a href="' + id + '" title="'+ this._elTitleElementTitle +'">' + this._elTitleElementText + '</a>'
-
-      if (j !== this._elTitleElementsLen) {
-        this._elNextTitleElementName = this.elTitleElements[j].tagName
-        if (this._elTitleElementName !== this._elNextTitleElementName) {
-          var checkColse = false
-          var y = 1
-          for (var t = this._tempLists.length - 1; t >= 0; t--) {
-            if (this._tempLists[t].tagName === this._elNextTitleElementName) {
-              checkColse = true
-              break
-            }
-            y++
-          }
-          if (checkColse) {
-            this.tocContent += new Array(y + 1).join('</li></ul>')
-            this._tempLists.length = this._tempLists.length - y
-          } else {
-            this._tempLists.push(this._elTitleElement)
-            if (this.ulClass) { this.tocContent += '<ul class="' + this.ulClass + '">' } else { this.tocContent += '<ul>' }
-          }
+      // We only care about tags on our level to add them as list item
+      if (elementTag == iterTag) {
+        // Let's do some cleaning
+        var elementTitle = element.textContent.replace(/"/g, '&quot;')
+        var elementText = (typeof this.process === 'function' ? this.process(element) : element.innerHTML).replace(/<(?:.|\n)*?>/gm, '')
+        var id = element.getAttribute('id')
+        if (!id) {
+          element.setAttribute('id', 'tip' + i)
+          id = '#tip' + i
         } else {
-          this.tocContent += '</li>'
+          id = '#' + id
         }
+        content += '<li><a href="' + id + '" title="'+ elementTitle +'">' + elementText + '</a>'
+        // Reset recursion. We need it for the next subsections
+        recurse = false
+
+      // Check if the current element has a lower level than ours, if so, we have to go down the rabbithole!
+      } else if (!recurse && titleNames.indexOf(elementTag.toLowerCase()) > level) {
+        recurse = true
+        // This element is for the lower lever, we have to re-add it before we send the list down there.
+        titleElements.unshift(element)
+        // Let's call ourself and get to the next level
+        content += recursiveToc(level + 1, titleElements, titleNames, ulClass)
       } else {
-        if (this._tempLists.length) {
-          this.tocContent += new Array(this._tempLists.length + 1).join('</li></ul>')
-        } else {
-          this.tocContent += '</li>'
-        }
+        // When we end up here, met a higher level element
+        // This is not our business so back into the list with the element and let's end this loop
+        titleElements.unshift(element)
+        break
       }
     }
-    if (this.ulClass) { this.tocContent = '<ul class="' + this.ulClass + '">' + this.tocContent + '</ul>' } else { this.tocContent = '<ul>' + this.tocContent + '</ul>' }
+
+    content += '</ul>'
+
+    // Set ToC content of the level 0 everything else pass things to the upper level!
+    if (level === 0) {
+      this.tocContent = content
+    } else {
+      return content
+    }
   }
 
   Toc.prototype._showToc = function () {

From cf934a4e5120b6d62cc8798aed52be2c424de91f Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Wed, 4 Jul 2018 11:20:59 +0200
Subject: [PATCH 64/74] Ignore h6 headers

h6 headers are used for tags in CodiMD. So we should ignore them for the
ToC generation.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 public/vendor/md-toc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/vendor/md-toc.js b/public/vendor/md-toc.js
index 5581783..661f7f8 100644
--- a/public/vendor/md-toc.js
+++ b/public/vendor/md-toc.js
@@ -28,7 +28,7 @@
   Toc.prototype._collectTitleElements = function () {
     this._elTitlesNames = []
     this.elTitleElements = []
-    for (var i = 1; i < 7; i++) {
+    for (var i = 1; i < 6; i++) {
       if (this.el.getElementsByTagName('h' + i).length) {
         this._elTitlesNames.push('h' + i)
       }

From df05bff82a32dc2f535cd72f4624006bdc10f904 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Wed, 4 Jul 2018 21:08:57 +0200
Subject: [PATCH 65/74] ToC: Some HTML improvements and style fixes

The ToC generated broken HTML with unclosed `<li>` tags. This got fixed
as well as some minor optimisation and adding list elements for the
subentries so the elements appear in the ToC while scrolling.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 public/css/extra.css    |  4 ++++
 public/vendor/md-toc.js | 22 ++++++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/public/css/extra.css b/public/css/extra.css
index 1b13290..3954c04 100644
--- a/public/css/extra.css
+++ b/public/css/extra.css
@@ -93,6 +93,10 @@
     color: #777;
 }
 
+.toc .invisable-node {
+  list-style-type: none;
+}
+
 .ui-toc {
     position: fixed;
     bottom: 20px;
diff --git a/public/vendor/md-toc.js b/public/vendor/md-toc.js
index 661f7f8..876978f 100644
--- a/public/vendor/md-toc.js
+++ b/public/vendor/md-toc.js
@@ -52,18 +52,17 @@
       titleNames = this._elTitlesNames
       ulClass = this.ulClass
     }
-    var titleElementsLen = titleElements.length
     // No need to do anything for an empty ToC
-    if (!titleElementsLen) return
+    if (!titleElements.length) return
 
-    this.tocContent = ''
     var content = '<ul'
     if (ulClass) {
       content += ' class="' + ulClass + '"'
     }
-    content += '>'
+    content += '>\n'
     var iterTag = titleNames[level]
     var recurse = false
+    var openTag = false
 
     for (var element; element = titleElements.shift();) {
       var elementTag = element.tagName.toLowerCase()
@@ -80,13 +79,21 @@
         } else {
           id = '#' + id
         }
+        if (openTag) {
+          content += '</li>\n'
+          openTag = false
+        }
         content += '<li><a href="' + id + '" title="'+ elementTitle +'">' + elementText + '</a>'
         // Reset recursion. We need it for the next subsections
         recurse = false
-
+        openTag = true
       // Check if the current element has a lower level than ours, if so, we have to go down the rabbithole!
       } else if (!recurse && titleNames.indexOf(elementTag.toLowerCase()) > level) {
         recurse = true
+        if (!openTag) {
+          content += '<li class="invisable-node">'
+          openTag = true
+        }
         // This element is for the lower lever, we have to re-add it before we send the list down there.
         titleElements.unshift(element)
         // Let's call ourself and get to the next level
@@ -99,7 +106,10 @@
       }
     }
 
-    content += '</ul>'
+    if (openTag) {
+      content += '</li>\n'
+    }
+    content += '</ul>\n'
 
     // Set ToC content of the level 0 everything else pass things to the upper level!
     if (level === 0) {

From b7e5a82f52f23039743bf552ad802a8aa3d0f46d Mon Sep 17 00:00:00 2001
From: Max Wu <jackymaxj@gmail.com>
Date: Thu, 5 Jul 2018 17:35:21 +0800
Subject: [PATCH 66/74] Add script src hash for speaker note to CSP directives

Signed-off-by: Max Wu <jackymaxj@gmail.com>
---
 lib/csp.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/csp.js b/lib/csp.js
index a49c748..0987df8 100644
--- a/lib/csp.js
+++ b/lib/csp.js
@@ -71,7 +71,7 @@ function addInlineScriptExceptions (directives) {
   directives.scriptSrc.push(getCspNonce)
   // TODO: This is the SHA-256 hash of the inline script in build/reveal.js/plugins/notes/notes.html
   // Any more clean solution appreciated.
-  directives.scriptSrc.push('\'sha256-EtvSSxRwce5cLeFBZbvZvDrTiRoyoXbWWwvEVciM5Ag=\'')
+  directives.scriptSrc.push('\'sha256-L0TsyAQLAc0koby5DCbFAwFfRs9ZxesA+4xg0QDSrdI=\'')
 }
 
 function getCspNonce (req, res) {

From 97c23302641305683fb97b12af11f6a95288819f Mon Sep 17 00:00:00 2001
From: Alexander Wellbrock <a.wellbrock@mailbox.org>
Date: Sun, 8 Jul 2018 20:41:46 +0200
Subject: [PATCH 67/74] Fix some false titles

Signed-off-by: Alexander Wellbrock <a.wellbrock@mailbox.org>
---
 public/js/lib/editor/toolbar.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/lib/editor/toolbar.html b/public/js/lib/editor/toolbar.html
index 2894eef..a2ac476 100644
--- a/public/js/lib/editor/toolbar.html
+++ b/public/js/lib/editor/toolbar.html
@@ -13,7 +13,7 @@
       <a id="makeHeader" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Heading">
           <i class="fa fa-h1 fa-fw">H</i>
       </a>
-      <a id="makeCode" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Quote">
+      <a id="makeCode" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Code">
           <i class="fa fa-code fa-fw"></i>
       </a>
       <a id="makeQuote" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Quote">
@@ -40,7 +40,7 @@
       <a id="makeLine" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Line">
           <i class="fa fa-minus fa-fw"></i>
       </a>
-      <a id="makeComment" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Line">
+      <a id="makeComment" class="btn btn-sm btn-dark text-uppercase" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" title="Comment">
           <i class="fa fa-comment fa-fw"></i>
       </a>
     </div>

From 972a81aa6fb2fb3883f7877c9c141cb68b50b871 Mon Sep 17 00:00:00 2001
From: Maxence Ahlouche <maxence.ahlouche@gmail.com>
Date: Mon, 9 Jul 2018 20:27:15 +0200
Subject: [PATCH 68/74] Upload images to the filesystem by default, rather than
 to imgur

Signed-off-by: Maxence Ahlouche <maxence.ahlouche@gmail.com>
---
 lib/config/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/config/index.js b/lib/config/index.js
index 8705b10..ac03fcd 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -139,7 +139,7 @@ if (config.sessionSecret === 'secret') {
 // Validate upload upload providers
 if (['filesystem', 's3', 'minio', 'imgur', 'azure'].indexOf(config.imageUploadType) === -1) {
   logger.error('"imageuploadtype" is not correctly set. Please use "filesystem", "s3", "minio", "azure" or "imgur". Defaulting to "imgur"')
-  config.imageUploadType = 'imgur'
+  config.imageUploadType = 'filesystem'
 }
 
 // figure out mime types for image uploads

From e45f8bb692bfde559e35516dff44573f61a27806 Mon Sep 17 00:00:00 2001
From: "Christoph (Sheogorath) Kern" <sheogorath@shivering-isles.com>
Date: Tue, 10 Jul 2018 11:53:09 +0200
Subject: [PATCH 69/74] Update ja.json (POEditor.com)

---
 locales/ja.json | 217 +++++++++++++++++++++++++-----------------------
 1 file changed, 114 insertions(+), 103 deletions(-)

diff --git a/locales/ja.json b/locales/ja.json
index fb3de58..80623c8 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -1,104 +1,115 @@
 {
-	"Collaborative markdown notes": "共同編集できるMarkdownノート",
-	"Realtime collaborative markdown notes on all platforms.": "マルチプラットフォーム、リアルタイムで共同編集できるMarkdownノート",
-	"Best way to write and share your knowledge in markdown.": "Markdownでナレッジを蓄積・共有できるベストツール",
-	"Intro": "サービスの紹介",
-	"History": "履歴",
-	"New guest note": "新規ゲストノート",
-	"Collaborate with URL": "URLで共同編集",
-	"Support charts and MathJax": "グラフとMathJaxのサポート",
-	"Support slide mode": "スライドモードのサポート",
-	"Sign In": "サインイン",
-	"Below is the history from browser": "ブラウザからの履歴",
-	"Welcome!": "ようこそ！",
-	"New note": "新規ノート",
-	"or": "または",
-	"Sign Out": "サインアウト",
-	"Explore all features": "すべての機能をチェック",
-	"Select tags...": "タグで検索",
-	"Search keyword...": "キーワードで検索",
-	"Sort by title": "タイトル順でソート",
-	"Title": "タイトル",
-	"Sort by time": "日時順でソート",
-	"Time": "日時",
-	"Export history": "履歴をエクスポート",
-	"Import history": "履歴をインポート",
-	"Clear history": "履歴をクリア",
-	"Refresh history": "履歴を更新",
-	"No history": "履歴はありません",
-	"Import from browser": "ブラウザからインポート",
-	"Releases": "リリース",
-	"Are you sure?": "本当にいいですか？",
-	"Cancel": "キャンセル",
-	"Yes, do it!": "はい",
-	"Choose method": "選択してください",
-	"Sign in via %s": "%sでサインイン",
-	"New": "新規作成",
-	"Publish": "公開する",
-	"Extra": "その他",
-	"Revision": "編集履歴",
-	"Slide Mode": "スライドモード",
-	"Export": "エクスポート",
-	"Import": "インポート",
-	"Clipboard": "クリップボード",
-	"Download": "ダウンロード",
-	"Raw HTML": "HTMLパーツ",
-	"Edit": "編集モード",
-	"View": "表示モード",
-	"Both": "分割モード",
-	"Help": "ヘルプ",
-	"Upload Image": "画像をアップロード",
-	"Menu": "メニュー",
-	"This page need refresh": "ページをリロードしてください",
-	"You have an incompatible client version.": "クライアントのバージョンが一致しません",
-	"Refresh to update.": "リロードして更新を反映させてください",
-	"New version available!": "新しいバージョンが利用できます！",
-	"See releases notes here": "リリースノートをごらんください",
-	"Refresh to enjoy new features.": "リロードして新しい機能を試してみましょう",
-	"Your user state has changed.": "ユーザー情報が変更されました",
-	"Refresh to load new user state.": "リロードすると最新のユーザー情報が反映されます",
-	"Refresh": "リロード",
-	"Contacts": "コンタクト",
-	"Report an issue": "問題を報告する",
-	"Send us email": "メールを送る",
-	"Documents": "ドキュメント",
-	"Features": "機能",
-	"YAML Metadata": "YAMLメタデータ",
-	"Slide Example": "スライドサンプル",
-	"Cheatsheet": "チートシート",
-	"Example": "例",
-	"Syntax": "構文",
-	"Header": "見出し",
-	"Unordered List": "番号なしリスト",
-	"Ordered List": "番号付きリスト",
-	"Todo List": "TODOリスト",
-	"Blockquote": "引用文",
-	"Bold font": "太字",
-	"Italics font": "斜体",
-	"Strikethrough": "打ち消し線",
-	"Inserted text": "挿入文",
-	"Marked text": "マーカー",
-	"Link": "リンク",
-	"Image": "画像",
-	"Code": "コード",
-	"Externals": "モジュール",
-	"This is a alert area.": "これはアラートエリアです",
-	"Revert": "戻す",
-	"Import from clipboard": "クリップボードからインポート",
-	"Paste your markdown or webpage here...": "Markdownまたはウェブページを貼り付けてください",
-	"Clear": "クリア",
-	"This note is locked": "このノートはロックされています",
-	"Sorry, only owner can edit this note.": "このノートはオーナーのみが編集できます",
-	"OK": "OK",
-	"Reach the limit": "上限に達しました",
-	"Sorry, you've reached the max length this note can be.": "ノートの文字数が上限に達しました。",
-	"Please reduce the content or divide it to more notes, thank you!": "内容を減らすか、別のノートに分けてください",
-	"Import from Gist": "gistからインポート",
-	"Paste your gist url here...": "gistのURLを貼り付けてください",
-	"Import from Snippet": "スニペットからインポート",
-	"Select From Available Projects": "プロジェクトを一覧から選択してください",
-	"Select From Available Snippets": "スニペットを一覧から選択してください",
-	"OR": "または",
-	"Export to Snippet": "スニペットにエクスポート",
-	"Select Visibility Level": "公開範囲を選んでください"
-}
+    "Collaborative markdown notes": "共同編集できるMarkdownノート",
+    "Realtime collaborative markdown notes on all platforms.": "マルチプラットフォーム、リアルタイムで共同編集できるMarkdownノート",
+    "Best way to write and share your knowledge in markdown.": "Markdownでナレッジを蓄積・共有できるベストツール",
+    "Intro": "サービスの紹介",
+    "History": "履歴",
+    "New guest note": "新規ゲストノート",
+    "Collaborate with URL": "URLで共同編集",
+    "Support charts and MathJax": "グラフとMathJaxのサポート",
+    "Support slide mode": "スライドモードのサポート",
+    "Sign In": "サインイン",
+    "Below is the history from browser": "ブラウザからの履歴",
+    "Welcome!": "ようこそ！",
+    "New note": "新規ノート",
+    "or": "または",
+    "Sign Out": "サインアウト",
+    "Explore all features": "すべての機能をチェック",
+    "Select tags...": "タグで検索",
+    "Search keyword...": "キーワードで検索",
+    "Sort by title": "タイトル順でソート",
+    "Title": "タイトル",
+    "Sort by time": "日時順でソート",
+    "Time": "日時",
+    "Export history": "履歴をエクスポート",
+    "Import history": "履歴をインポート",
+    "Clear history": "履歴をクリア",
+    "Refresh history": "履歴を更新",
+    "No history": "履歴はありません",
+    "Import from browser": "ブラウザからインポート",
+    "Releases": "リリース",
+    "Are you sure?": "本当にいいですか？",
+    "Do you really want to delete this note?": "本当にこのノートを削除しますか？",
+    "All users will lose their connection.": "すべてのユーザーの接続が切断されます。",
+    "Cancel": "キャンセル",
+    "Yes, do it!": "はい",
+    "Choose method": "選択してください",
+    "Sign in via %s": "%sでサインイン",
+    "New": "新規作成",
+    "Publish": "公開する",
+    "Extra": "その他",
+    "Revision": "編集履歴",
+    "Slide Mode": "スライドモード",
+    "Export": "エクスポート",
+    "Import": "インポート",
+    "Clipboard": "クリップボード",
+    "Download": "ダウンロード",
+    "Raw HTML": "HTMLパーツ",
+    "Edit": "編集モード",
+    "View": "表示モード",
+    "Both": "分割モード",
+    "Help": "ヘルプ",
+    "Upload Image": "画像をアップロード",
+    "Menu": "メニュー",
+    "This page need refresh": "ページをリロードしてください",
+    "You have an incompatible client version.": "クライアントのバージョンが一致しません",
+    "Refresh to update.": "リロードして更新を反映させてください",
+    "New version available!": "新しいバージョンが利用できます！",
+    "See releases notes here": "リリースノートをごらんください",
+    "Refresh to enjoy new features.": "リロードして新しい機能を試してみましょう",
+    "Your user state has changed.": "ユーザー情報が変更されました",
+    "Refresh to load new user state.": "リロードすると最新のユーザー情報が反映されます",
+    "Refresh": "リロード",
+    "Contacts": "コンタクト",
+    "Report an issue": "問題を報告する",
+    "Meet us on %s": "%sでチャットする",
+    "Send us email": "メールを送る",
+    "Documents": "ドキュメント",
+    "Features": "機能",
+    "YAML Metadata": "YAMLメタデータ",
+    "Slide Example": "スライドサンプル",
+    "Cheatsheet": "チートシート",
+    "Example": "例",
+    "Syntax": "構文",
+    "Header": "見出し",
+    "Unordered List": "番号なしリスト",
+    "Ordered List": "番号付きリスト",
+    "Todo List": "TODOリスト",
+    "Blockquote": "引用文",
+    "Bold font": "太字",
+    "Italics font": "斜体",
+    "Strikethrough": "打ち消し線",
+    "Inserted text": "挿入文",
+    "Marked text": "マーカー",
+    "Link": "リンク",
+    "Image": "画像",
+    "Code": "コード",
+    "Externals": "モジュール",
+    "This is a alert area.": "これはアラートエリアです",
+    "Revert": "戻す",
+    "Import from clipboard": "クリップボードからインポート",
+    "Paste your markdown or webpage here...": "Markdownまたはウェブページを貼り付けてください",
+    "Clear": "クリア",
+    "This note is locked": "このノートはロックされています",
+    "Sorry, only owner can edit this note.": "このノートはオーナーのみが編集できます",
+    "OK": "OK",
+    "Reach the limit": "上限に達しました",
+    "Sorry, you've reached the max length this note can be.": "ノートの文字数が上限に達しました。",
+    "Please reduce the content or divide it to more notes, thank you!": "内容を減らすか、別のノートに分けてください",
+    "Import from Gist": "gistからインポート",
+    "Paste your gist url here...": "gistのURLを貼り付けてください",
+    "Import from Snippet": "スニペットからインポート",
+    "Select From Available Projects": "プロジェクトを一覧から選択してください",
+    "Select From Available Snippets": "スニペットを一覧から選択してください",
+    "OR": "または",
+    "Export to Snippet": "スニペットにエクスポート",
+    "Select Visibility Level": "公開範囲を選んでください",
+    "Night Theme": "ナイトテーマ",
+    "Follow us on %s and %s.": "%s と %s でフォローしてください。",
+    "Privacy": "プライバシー",
+    "Terms of Use": "利用条件",
+    "Do you really want to delete your user account?": "本当にアカウントを削除しますか？",
+    "This will delete your account, all notes that are owned by you and remove all references to your account from other notes.": "この操作はあなたのアカウントとあなたの所有するすべてのノートを削除し、さらに他の人のノートからあなたのアカウントへの参照を除去します。",
+    "Delete user": "ユーザーの削除",
+    "Export user data": "ユーザーデータをエクスポート"
+}
\ No newline at end of file

From 23bd1a18bb65dc49c55f755b02c9083ecdff1344 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 27 Jul 2018 13:21:42 +0200
Subject: [PATCH 70/74] Add mailmap for contributors

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 .mailmap | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..8f14718
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,14 @@
+Max Wu <jackymaxj@gmail.com>                 Wu Cheng-Han <jacky_cute0808@hotmail.com>
+Max Wu <jackymaxj@gmail.com>                 Cheng-Han, Wu <jackymaxj@gmail.com>
+Max Wu <jackymaxj@gmail.com>                 jackycute <jackymaxj@gmail.com>
+Max Wu <jackymaxj@gmail.com>                 Wu, Cheng-Han <jackymaxj@gmail.com>
+Max Wu <jackymaxj@gmail.com>                 jackycute <jacky_cute0808@hotmail.com>
+
+Sheogorath <sheogorath@shivering-isles.com>  Christoph (Sheogorath) Kern <sheogorath@shivering-isles.com>
+
+Raccoon <raccoon@hackmd.io>                  Raccoon Li <a60814billy@gmail.com>
+Raccoon <raccoon@hackmd.io>                  Raccoon <a60814billy@gmail.com>
+
+Peter Dave Hello <hsu@peterdavehello.org>    Peter Dave Hello <PeterDaveHello@users.noreply.github.com>
+
+Claudius Coenen <github@amenthes.de>         Claudius Coenen <opensource@amenthes.de>

From 1f85017625bfd414f3b1a0d94ecbc37dc70d712a Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 27 Jul 2018 13:44:45 +0200
Subject: [PATCH 71/74] Minimize number of errors in LZString parsing errors
 for history

Right now we still see a lot of LZString parsing errors in the logs.
They probably come from the user history. We should minimize the number
by add the basic length check there as well.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 lib/history.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/history.js b/lib/history.js
index c7d2472..63be452 100644
--- a/lib/history.js
+++ b/lib/history.js
@@ -31,6 +31,15 @@ function getHistory (userid, callback) {
       history = JSON.parse(user.history)
       // migrate LZString encoded note id to base64url encoded note id
       for (let i = 0, l = history.length; i < l; i++) {
+        // Calculate minimal string length for an UUID that is encoded
+        // base64 encoded and optimize comparsion by using -1
+        // this should make a lot of LZ-String parsing errors obsolete
+        // as we can assume that a nodeId that is 48 chars or longer is a
+        // noteID.
+        const base64UuidLength = ((4 * 36) / 3) - 1
+        if (!(history[i].id.length > base64UuidLength)) {
+          continue
+        }
         try {
           let id = LZString.decompressFromBase64(history[i].id)
           if (id && models.Note.checkNoteIdValid(id)) {

From 53a846bdc56b5b108825451c3c248aead2712e97 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 27 Jul 2018 14:15:36 +0200
Subject: [PATCH 72/74] Update markdown-pdf

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 88bef3e..1740500 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "markdown-it-regexp": "^0.4.0",
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "^1.0.0",
-    "markdown-pdf": "^8.0.0",
+    "markdown-pdf": "^9.0.0",
     "mathjax": "~2.7.0",
     "mermaid": "~7.1.0",
     "mattermost": "^3.4.0",
diff --git a/yarn.lock b/yarn.lock
index 796c2bd..f3d2eda 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4698,9 +4698,9 @@ markdown-it@^8.2.2:
     mdurl "^1.0.1"
     uc.micro "^1.0.3"
 
-markdown-pdf@^8.0.0:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/markdown-pdf/-/markdown-pdf-8.1.1.tgz#25c025d4f4f91869ac0f3f6fd7f7d32237669438"
+markdown-pdf@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/markdown-pdf/-/markdown-pdf-9.0.0.tgz#d699f29c3b6c41da4b9a2ec7d09ea8895daef146"
   dependencies:
     commander "^2.2.0"
     duplexer "^0.1.1"

From 70e8df5c04274ac4ee9d3eb2462fed12a85f6ccd Mon Sep 17 00:00:00 2001
From: Miranda Kastemaa <miranda@foldplop.com>
Date: Mon, 23 Jul 2018 03:27:51 +0300
Subject: [PATCH 73/74] Support 'host' & 'path' config options

Signed-off-by: Miranda Kastemaa <miranda@foldplop.com>
---
 README.md                 |  4 ++++
 app.js                    | 16 +++++++++++++---
 lib/config/default.js     |  1 +
 lib/config/environment.js |  2 ++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 34d52b5..a9f0d4b 100644
--- a/README.md
+++ b/README.md
@@ -170,7 +170,9 @@ There are some config settings you need to change in the files below.
 | `DEBUG` | `true` or `false` | set debug mode; show more logs |
 | `CMD_DOMAIN` | `codimd.org` | domain name |
 | `CMD_URL_PATH` | `codimd` | sub URL path, like `www.example.com/<URL_PATH>` |
+| `CMD_HOST` | `localhost` | host to listen on |
 | `CMD_PORT` | `80` | web app port |
+| `CMD_PATH` | `/var/run/codimd.sock` | path to UNIX domain socket to listen on (if specified, `CMD_HOST` and `CMD_PORT` are ignored) |
 | `CMD_ALLOW_ORIGIN` | `localhost, codimd.org` | domain name whitelist (use comma to separate) |
 | `CMD_PROTOCOL_USESSL` | `true` or `false` | set to use SSL protocol for resources path (only applied when domain is set) |
 | `CMD_URL_ADDPORT` | `true` or `false` | set to add port on callback URL (ports `80` or `443` won't be applied) (only applied when domain is set) |
@@ -252,7 +254,9 @@ There are some config settings you need to change in the files below.
 | `debug` | `true` or `false` | set debug mode, show more logs |
 | `domain` | `localhost` | domain name |
 | `urlPath` | `codimd` | sub URL path, like `www.example.com/<urlpath>` |
+| `host` | `localhost` | host to listen on |
 | `port` | `80` | web app port |
+| `path` | `/var/run/codimd.sock` | path to UNIX domain socket to listen on (if specified, `host` and `port` are ignored) |
 | `allowOrigin` | `['localhost']` | domain name whitelist |
 | `useSSL` | `true` or `false` | set to use SSL server (if `true`, will auto turn on `protocolUseSSL`) |
 | `hsts` | `{"enable": true, "maxAgeSeconds": 31536000, "includeSubdomains": true, "preload": true}` | [HSTS](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) options to use with HTTPS (default is the example value, max age is a year) |
diff --git a/app.js b/app.js
index e247913..24f0516 100644
--- a/app.js
+++ b/app.js
@@ -205,11 +205,21 @@ io.sockets.on('connection', realtime.connection)
 
 // listen
 function startListen () {
-  server.listen(config.port, function () {
+  var address
+  var listenCallback = function () {
     var schema = config.useSSL ? 'HTTPS' : 'HTTP'
-    logger.info('%s Server listening at port %d', schema, config.port)
+    logger.info('%s Server listening at %s', schema, address)
     realtime.maintenance = false
-  })
+  }
+
+  // use unix domain socket if 'path' is specified
+  if (config.path) {
+    address = config.path
+    server.listen(config.path, listenCallback)
+  } else {
+    address = config.host + ':' + config.port
+    server.listen(config.port, config.host, listenCallback)
+  }
 }
 
 // sync db then start listen
diff --git a/lib/config/default.js b/lib/config/default.js
index 5c39a4d..6096bce 100644
--- a/lib/config/default.js
+++ b/lib/config/default.js
@@ -3,6 +3,7 @@
 module.exports = {
   domain: '',
   urlPath: '',
+  host: '0.0.0.0',
   port: 3000,
   urlAddPort: false,
   allowOrigin: ['localhost'],
diff --git a/lib/config/environment.js b/lib/config/environment.js
index d850ac9..6c4ce92 100644
--- a/lib/config/environment.js
+++ b/lib/config/environment.js
@@ -5,7 +5,9 @@ const {toBooleanConfig, toArrayConfig, toIntegerConfig} = require('./utils')
 module.exports = {
   domain: process.env.CMD_DOMAIN,
   urlPath: process.env.CMD_URL_PATH,
+  host: process.env.CMD_HOST,
   port: toIntegerConfig(process.env.CMD_PORT),
+  path: process.env.CMD_PATH,
   urlAddPort: toBooleanConfig(process.env.CMD_URL_ADDPORT),
   useSSL: toBooleanConfig(process.env.CMD_USESSL),
   hsts: {

From db5b86df4c735a4ed80e1ae683dc58e15f819e0b Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 27 Jul 2018 13:56:07 +0200
Subject: [PATCH 74/74] Further improvement of error handling for LZString

This does some more in depth check on the error message and minimizes
the log noise that is caused by LZString.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 lib/history.js     | 6 +++++-
 lib/models/note.js | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/history.js b/lib/history.js
index 63be452..9c389bf 100644
--- a/lib/history.js
+++ b/lib/history.js
@@ -47,7 +47,11 @@ function getHistory (userid, callback) {
           }
         } catch (err) {
           // most error here comes from LZString, ignore
-          logger.error(err)
+          if (err.message === 'Cannot read property \'charAt\' of undefined') {
+            logger.warning('Looks like we can not decode "' + history[i].id + '" with LZString. Can be ignored.')
+          } else {
+            logger.error(err)
+          }
         }
       }
       history = parseHistoryToObject(history)
diff --git a/lib/models/note.js b/lib/models/note.js
index ec7e2b1..0e8dd4d 100644
--- a/lib/models/note.js
+++ b/lib/models/note.js
@@ -227,7 +227,11 @@ module.exports = function (sequelize, DataTypes) {
               var id = LZString.decompressFromBase64(noteId)
               if (id && Note.checkNoteIdValid(id)) { return callback(null, id) } else { return _callback(null, null) }
             } catch (err) {
-              logger.error(err)
+              if (err.message === 'Cannot read property \'charAt\' of undefined') {
+                logger.warning('Looks like we can not decode "' + noteId + '" with LZString. Can be ignored.')
+              } else {
+                logger.error(err)
+              }
               return _callback(null, null)
             }
           },