From e98278492e3c80816d54e1a6841548409c8a4d80 Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han
Date: Sat, 21 Jan 2017 12:50:02 +0800
Subject: Fix meta error not clear on before rendering

---
 public/js/index.js  | 1 +
 public/js/pretty.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/public/js/index.js b/public/js/index.js
index a018e513..6e55fa17 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -3445,6 +3445,7 @@ function updateViewInner() {
     var value = editor.getValue();
     var lastMeta = md.meta;
     md.meta = {};
+    delete md.metaError;
     var rendered = md.render(value);
     if (md.meta.type && md.meta.type === 'slide') {
         var slideOptions = {
diff --git a/public/js/pretty.js b/public/js/pretty.js
index c1a471a1..b946d423 100644
--- a/public/js/pretty.js
+++ b/public/js/pretty.js
@@ -22,6 +22,7 @@ var markdown = $("#doc.markdown-body");
 var text = markdown.text();
 var lastMeta = md.meta;
 md.meta = {};
+delete md.metaError;
 var rendered = md.render(text);
 if (md.meta.type && md.meta.type === 'slide') {
     var slideOptions = {
-- 
cgit v1.2.3


From 5e1d022e13a56786f40216c5485554d9e8b13c05 Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han
Date: Sat, 21 Jan 2017 12:52:26 +0800
Subject: Add screenshot on index page

---
 public/css/cover.css   |   6 ++++++
 public/screenshot.png  | Bin 0 -> 238635 bytes
 public/views/index.ejs |   1 +
 3 files changed, 7 insertions(+)
 create mode 100644 public/screenshot.png

diff --git a/public/css/cover.css b/public/css/cover.css
index a1527bfa..6e191d2b 100644
--- a/public/css/cover.css
+++ b/public/css/cover.css
@@ -354,6 +354,12 @@ input {
     color: white;
 }
 
+.screenshot {
+    margin: 30px auto;
+    width: 100%;
+    border-radius: 3px;
+}
+
 select {
     color: black;
 }
diff --git a/public/screenshot.png b/public/screenshot.png
new file mode 100644
index 00000000..e1e77431
Binary files /dev/null and b/public/screenshot.png differ
diff --git a/public/views/index.ejs b/public/views/index.ejs
index 25139907..4bcea0eb 100644
--- a/public/views/index.ejs
+++ b/public/views/index.ejs
@@ -87,6 +87,7 @@
                             <a type="button" href="<%- url %>/features" class="btn btn-lg btn-primary" style="min-width: 200px;"><%= __('Explore all features') %></a>
                             <br>
                             <br>
+                            <img src="<%- url %>/screenshot.png" class="screenshot ui-signin">
                         </span>
                         <div class="lead row" style="width: 90%; margin: 0 auto;">
                             <div class="col-md-4 inner">
-- 
cgit v1.2.3


From 6e8ff3de234471375836ba907e86bf39804c308e Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han
Date: Sat, 21 Jan 2017 12:53:18 +0800
Subject: Fix redundant parameter to removeColumn in db migration scripts

---
 lib/migrations/20161009040430-support-delete-note.js  | 2 +-
 lib/migrations/20161201050312-support-email-signin.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/migrations/20161009040430-support-delete-note.js b/lib/migrations/20161009040430-support-delete-note.js
index f478b6fe..92ff6f7b 100644
--- a/lib/migrations/20161009040430-support-delete-note.js
+++ b/lib/migrations/20161009040430-support-delete-note.js
@@ -6,6 +6,6 @@ module.exports = {
   },
 
   down: function (queryInterface, Sequelize) {
-    queryInterface.removeColumn('Notes', 'deletedAt', Sequelize.DATE);
+    queryInterface.removeColumn('Notes', 'deletedAt');
   }
 };
diff --git a/lib/migrations/20161201050312-support-email-signin.js b/lib/migrations/20161201050312-support-email-signin.js
index bdea7c8c..b5aaf777 100644
--- a/lib/migrations/20161201050312-support-email-signin.js
+++ b/lib/migrations/20161201050312-support-email-signin.js
@@ -7,7 +7,7 @@ module.exports = {
   },
 
   down: function (queryInterface, Sequelize) {
-    queryInterface.removeColumn('Users', 'email', Sequelize.TEXT);
-    queryInterface.removeColumn('Users', 'password', Sequelize.TEXT);
+    queryInterface.removeColumn('Users', 'email');
+    queryInterface.removeColumn('Users', 'password');
   }
 };
-- 
cgit v1.2.3