From: Jeff Veit <jeff.veit@gmail.com>
Date: Tue, 27 Jun 2017 01:58:50 +0000 (+0100)
Subject: Interim commit.
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=commitdiff_plain;h=93ef30d42f68e55d11d97312531118bbcd4cf318

Interim commit.
---

diff --git a/composer.json b/composer.json
index f66e96455..170256531 100644
--- a/composer.json
+++ b/composer.json
@@ -79,7 +79,8 @@
         "drupal/tocify": "^1.2",
         "drupal/ckeditor_templates": "^1.0",
         "drupal/layouter": "^1.0",
-        "drupal/layout_plugin": "^1.0@alpha"
+        "drupal/layout_plugin": "^1.0@alpha",
+        "drupal/draggableviews": "^1.0"
     },
     "require-dev": {
         "behat/mink": "~1.7",
diff --git a/composer.lock b/composer.lock
index 7c62306e8..260890c3d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "63797fba71aa2f0da494717fc82e48f6",
+    "content-hash": "b41cc0a1ec374b1fd8060b5b44b28848",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -2499,6 +2499,73 @@
                 "issues": "https://www.drupal.org/project/issues/diff"
             }
         },
+        {
+            "name": "drupal/draggableviews",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupal.org/project/draggableviews",
+                "reference": "8.x-1.0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/draggableviews-8.x-1.0.zip",
+                "reference": "8.x-1.0",
+                "shasum": "007082c2621b45bd8cf73fe5fdd4d292ee88a458"
+            },
+            "require": {
+                "drupal/core": "*"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.0",
+                    "datestamp": "1477076039"
+                },
+                "patches_applied": {
+                    "Sort order not saved when using bootstrap theme": "https://www.drupal.org/files/issues/classes-defined-in-array-2729935-2.patch",
+                    "DraggableViews displays multiple node instances when used in multiple views": "https://www.drupal.org/files/issues/2867159_fixed_problems_with_duplicates_0.patch"
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "dixon_",
+                    "homepage": "https://www.drupal.org/user/239911"
+                },
+                {
+                    "name": "ginc",
+                    "homepage": "https://www.drupal.org/user/332249"
+                },
+                {
+                    "name": "iStryker",
+                    "homepage": "https://www.drupal.org/user/303676"
+                },
+                {
+                    "name": "podarok",
+                    "homepage": "https://www.drupal.org/user/116002"
+                },
+                {
+                    "name": "sevi",
+                    "homepage": "https://www.drupal.org/user/199290"
+                },
+                {
+                    "name": "ygerasimov",
+                    "homepage": "https://www.drupal.org/user/257311"
+                }
+            ],
+            "description": "Complete rewrite of D7 draggableviews",
+            "homepage": "https://www.drupal.org/project/draggableviews",
+            "support": {
+                "source": "http://cgit.drupalcode.org/draggableviews"
+            }
+        },
         {
             "name": "drupal/dropzonejs",
             "version": "1.0.0-alpha7",
@@ -5242,7 +5309,8 @@
             "homepage": "https://www.drupal.org/project/security_review",
             "support": {
                 "source": "http://cgit.drupalcode.org/security_review"
-            }
+            },
+            "time": "2016-10-20 15:43:48"
         },
         {
             "name": "drupal/simple_sitemap",
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 7cd6c8819..0d5836728 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -4081,60 +4081,6 @@
         ],
         "description": "Provides a way to patch Composer packages."
     },
-    {
-        "name": "drupal/security_review",
-        "version": "dev-1.x",
-        "version_normalized": "dev-1.x",
-        "source": {
-            "type": "git",
-            "url": "https://git.drupal.org/project/security_review",
-            "reference": "35ebae445bb260e961e47c4c58efe7c50c228999"
-        },
-        "require": {
-            "drupal/core": "~8.0"
-        },
-        "type": "drupal-module",
-        "extra": {
-            "branch-alias": {
-                "dev-1.x": "1.x-dev"
-            },
-            "drupal": {
-                "version": "8.x-1.x-dev",
-                "datestamp": "1476978839"
-            },
-            "patches_applied": {
-                "Fix missing field review list": "https://www.drupal.org/files/issues/security_review-dangerous-tags-list-2744805-2.patch"
-            }
-        },
-        "installation-source": "source",
-        "notification-url": "https://packages.drupal.org/8/downloads",
-        "license": [
-            "GPL-2.0+"
-        ],
-        "authors": [
-            {
-                "name": "banviktor",
-                "homepage": "https://www.drupal.org/user/3176333"
-            },
-            {
-                "name": "coltrane",
-                "homepage": "https://www.drupal.org/user/91990"
-            },
-            {
-                "name": "dsnopek",
-                "homepage": "https://www.drupal.org/user/266527"
-            },
-            {
-                "name": "greggles",
-                "homepage": "https://www.drupal.org/user/36762"
-            }
-        ],
-        "description": "Site security and configuration review module.",
-        "homepage": "https://www.drupal.org/project/security_review",
-        "support": {
-            "source": "http://cgit.drupalcode.org/security_review"
-        }
-    },
     {
         "name": "drupal/entity",
         "version": "1.0.0-alpha4",
@@ -11319,5 +11265,128 @@
             "rest",
             "web service"
         ]
+    },
+    {
+        "name": "drupal/draggableviews",
+        "version": "1.0.0",
+        "version_normalized": "1.0.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://git.drupal.org/project/draggableviews",
+            "reference": "8.x-1.0"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://ftp.drupal.org/files/projects/draggableviews-8.x-1.0.zip",
+            "reference": "8.x-1.0",
+            "shasum": "007082c2621b45bd8cf73fe5fdd4d292ee88a458"
+        },
+        "require": {
+            "drupal/core": "*"
+        },
+        "type": "drupal-module",
+        "extra": {
+            "branch-alias": {
+                "dev-1.x": "1.x-dev"
+            },
+            "drupal": {
+                "version": "8.x-1.0",
+                "datestamp": "1477076039"
+            },
+            "patches_applied": {
+                "Sort order not saved when using bootstrap theme": "https://www.drupal.org/files/issues/classes-defined-in-array-2729935-2.patch",
+                "DraggableViews displays multiple node instances when used in multiple views": "https://www.drupal.org/files/issues/2867159_fixed_problems_with_duplicates_0.patch"
+            }
+        },
+        "installation-source": "dist",
+        "notification-url": "https://packages.drupal.org/8/downloads",
+        "license": [
+            "GPL-2.0+"
+        ],
+        "authors": [
+            {
+                "name": "dixon_",
+                "homepage": "https://www.drupal.org/user/239911"
+            },
+            {
+                "name": "ginc",
+                "homepage": "https://www.drupal.org/user/332249"
+            },
+            {
+                "name": "iStryker",
+                "homepage": "https://www.drupal.org/user/303676"
+            },
+            {
+                "name": "podarok",
+                "homepage": "https://www.drupal.org/user/116002"
+            },
+            {
+                "name": "sevi",
+                "homepage": "https://www.drupal.org/user/199290"
+            },
+            {
+                "name": "ygerasimov",
+                "homepage": "https://www.drupal.org/user/257311"
+            }
+        ],
+        "description": "Complete rewrite of D7 draggableviews",
+        "homepage": "https://www.drupal.org/project/draggableviews",
+        "support": {
+            "source": "http://cgit.drupalcode.org/draggableviews"
+        }
+    },
+    {
+        "name": "drupal/security_review",
+        "version": "dev-1.x",
+        "version_normalized": "dev-1.x",
+        "source": {
+            "type": "git",
+            "url": "https://git.drupal.org/project/security_review",
+            "reference": "35ebae445bb260e961e47c4c58efe7c50c228999"
+        },
+        "require": {
+            "drupal/core": "~8.0"
+        },
+        "type": "drupal-module",
+        "extra": {
+            "branch-alias": {
+                "dev-1.x": "1.x-dev"
+            },
+            "drupal": {
+                "version": "8.x-1.x-dev",
+                "datestamp": "1476978839"
+            },
+            "patches_applied": {
+                "Fix missing field review list": "https://www.drupal.org/files/issues/security_review-dangerous-tags-list-2744805-2.patch"
+            }
+        },
+        "installation-source": "source",
+        "notification-url": "https://packages.drupal.org/8/downloads",
+        "license": [
+            "GPL-2.0+"
+        ],
+        "authors": [
+            {
+                "name": "banviktor",
+                "homepage": "https://www.drupal.org/user/3176333"
+            },
+            {
+                "name": "coltrane",
+                "homepage": "https://www.drupal.org/user/91990"
+            },
+            {
+                "name": "dsnopek",
+                "homepage": "https://www.drupal.org/user/266527"
+            },
+            {
+                "name": "greggles",
+                "homepage": "https://www.drupal.org/user/36762"
+            }
+        ],
+        "description": "Site security and configuration review module.",
+        "homepage": "https://www.drupal.org/project/security_review",
+        "support": {
+            "source": "http://cgit.drupalcode.org/security_review"
+        }
     }
 ]
diff --git a/web/modules/contrib/security_review b/web/modules/contrib/security_review
deleted file mode 160000
index 007ade5ee..000000000
--- a/web/modules/contrib/security_review
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 007ade5ee3b27645078c9d1f96c9026896b29df8