Merge branch 'master' into es6-integration

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');
   }
 };

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', 'email');
-    queryInterface.removeColumn('Users', 'password', Sequelize.TEXT);
+    queryInterface.removeColumn('Users', 'password');
   }
 };

public/css/cover.css

@@ -354,6 +354,12 @@ input {
     color: white;
 }
 
+.screenshot {
+    margin: 30px auto;
+    width: 100%;
+    border-radius: 3px;
+}
+
 select {
     color: black;
 }

public/js/index.js

@@ -3452,6 +3452,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 = {

public/js/pretty.js

@@ -24,6 +24,7 @@ const markdown = $("#doc.markdown-body");
 const text = markdown.text();
 const lastMeta = md.meta;
 md.meta = {};
+delete md.metaError;
 let rendered = md.render(text);
 if (md.meta.type && md.meta.type === 'slide') {
     const slideOptions = {

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">