Merge branch 'master' into disabled-publish

frontend/components/Editor/plugins.js

@@ -1,5 +1,5 @@
 // @flow
-import DropOrPasteImages from 'slate-drop-or-paste-images';
+import DropOrPasteImages from '@tommoor/slate-drop-or-paste-images';
 import PasteLinkify from 'slate-paste-linkify';
 import EditList from 'slate-edit-list';
 import CollapseOnEscape from 'slate-collapse-on-escape';

frontend/components/Layout/Layout.js

@@ -69,9 +69,13 @@ type Props = {
   }
 
   @keydown('e')
-  goToEdit() {
-    if (!this.props.documents.active) return;
-    this.props.history.push(documentEditUrl(this.props.documents.active));
+  goToEdit(ev) {
+    const activeDocument = this.props.documents.active;
+    if (!activeDocument) return;
+
+    ev.preventDefault();
+    ev.stopPropagation();
+    this.props.history.push(documentEditUrl(activeDocument));
   }
 
   handleLogout = () => {

package.json

@@ -60,6 +60,7 @@
     "url": "git+ssh://git@github.com/jorilallo/atlas.git"
   },
   "dependencies": {
+    "@tommoor/slate-drop-or-paste-images": "0.5.1",
     "babel-core": "^6.24.1",
     "babel-eslint": "^7.2.3",
     "babel-loader": "6.2.5",
@@ -140,9 +141,9 @@
     "query-string": "^4.3.4",
     "randomstring": "1.1.5",
     "raw-loader": "^0.5.1",
-    "react": "15.3.2",
+    "react": "^15.6.1",
     "react-addons-css-transition-group": "15.3.2",
-    "react-dom": "15.3.2",
+    "react-dom": "^15.6.1",
     "react-dropzone": "3.6.0",
     "react-helmet": "3.1.0",
     "react-keydown": "^1.7.3",
@@ -157,9 +158,8 @@
     "sequelize": "^4.3.1",
     "sequelize-cli": "^2.7.0",
     "sequelize-encrypted": "0.1.0",
-    "slate": "^0.19.30",
+    "slate": "^0.21.4",
     "slate-collapse-on-escape": "^0.2.1",
-    "slate-drop-or-paste-images": "tommoor/slate-drop-or-paste-images#f599369ab83bed60f4a804d553d7889716bf9ec1",
     "slate-edit-code": "^0.10.2",
     "slate-edit-list": "^0.7.0",
     "slate-markdown-serializer": "tommoor/slate-markdown-serializer",