From 66aaee26dad8b3c0cd53975790a90bce4dddacac Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Thu, 31 Aug 2017 19:36:47 -0700 Subject: [PATCH 1/2] Update slate drag or drop --- package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 197f02b7c..446775d2c 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,7 @@ "sequelize-encrypted": "0.1.0", "slate": "^0.19.30", "slate-collapse-on-escape": "^0.2.1", - "slate-drop-or-paste-images": "tommoor/slate-drop-or-paste-images#dev", + "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", diff --git a/yarn.lock b/yarn.lock index 02cbb23b2..c010a0cdb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8019,9 +8019,9 @@ slate-collapse-on-escape@^0.2.1: dependencies: to-pascal-case "^1.0.0" -slate-drop-or-paste-images@tommoor/slate-drop-or-paste-images#dev: +slate-drop-or-paste-images@tommoor/slate-drop-or-paste-images#f599369ab83bed60f4a804d553d7889716bf9ec1: version "0.5.0" - resolved "https://codeload.github.com/tommoor/slate-drop-or-paste-images/tar.gz/935894631acb528b1eec6a8a1a78857da9d0d1da" + resolved "https://codeload.github.com/tommoor/slate-drop-or-paste-images/tar.gz/f599369ab83bed60f4a804d553d7889716bf9ec1" dependencies: data-uri-to-blob "0.0.4" es6-promise "^4.0.5" From 41f47f3f2f08dee4242ea160fc667e4c05a3b70e Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Thu, 31 Aug 2017 19:41:10 -0700 Subject: [PATCH 2/2] Migrations fix --- server/migrations/20170827182423-improve-references.js | 1 + 1 file changed, 1 insertion(+) diff --git a/server/migrations/20170827182423-improve-references.js b/server/migrations/20170827182423-improve-references.js index 788f3b60c..a8bd04df1 100644 --- a/server/migrations/20170827182423-improve-references.js +++ b/server/migrations/20170827182423-improve-references.js @@ -1,5 +1,6 @@ module.exports = { up: async function(queryInterface, Sequelize) { + await queryInterface.removeIndex('documents', 'atlasId_foreign_idx'); await queryInterface.changeColumn('documents', 'atlasId', { type: Sequelize.UUID, allowNull: true,