Merge pull request #7 from ymcatwincities/8.x-1.x

Update with the main branch

composer.json

@@ -113,6 +113,19 @@
                     "type": "zip"
                 }
             }
+        },
+        {
+            "type": "package",
+            "package": {
+                "name": "library-smonetti/btbutton",
+                "version": "1.0.1",
+                "type": "drupal-library",
+                "source": {
+                    "url": "https://github.com/smonetti/btbutton",
+                    "type": "git",
+                    "reference": "1620254d294a209bdf18cc0bc7b131d2ffaa10db"
+                }
+            }
         }
     ],
     "scripts": {
@@ -152,7 +165,7 @@
                 "2874811 - Add option to show/hide empty views": "https://www.drupal.org/files/issues/Option-added-to-hide-empty-views-2874811.patch"
             },
             "drupal/core": {
-                "2346893 - Fix duplicate AJAX wrapper around a file field issue": "https://www.drupal.org/files/issues/2346893-233.patch"
+                "1236098 - Notice: Undefined index in _color_rewrite_stylesheet()": "https://www.drupal.org/files/issues/undefined-index-in-_color_rewrite_stylesheet-1236098-37.patch"
             }
         }
     },
@@ -161,7 +174,7 @@
         "cweagans/composer-patches": "^1.5.0",
         "composer/installers": "^1.0",
         "drupal-composer/drupal-scaffold": "^2.0.0",
-        "drupal/core": "8.4.2",
+        "drupal/core": "8.4.5",
         "drupal/features": "3.5",
         "drupal/confi": "1.4",
         "drupal/config_update": "1.5",
@@ -187,6 +200,7 @@
         "drupal/plugin": "2.5",
         "drupal/migrate_plus": "3.0-beta1",
         "drupal/migrate_tools": "3.0-beta1",
+        "drupal/migrate_source_csv": "2.0",
         "drupal/verf": "1.0-beta6",
         "drupal/simple_menu_icons": "1.x-dev",
         "drupal/views_infinite_scroll": "1.5",
@@ -200,11 +214,12 @@
         "library-gdsmith/jquery.easing": "1.4.1",
         "library-ckeditor/panelbutton": "4.7.0",
         "library-ckeditor/colorbutton": "4.7.0",
+        "library-smonetti/btbutton": "1.0.1",
         "drupal/slick_views": "1.0-rc2",
         "drupal/libraries": "3.x-dev",
         "drupal/datalayer": "1.x-dev",
         "drupal/optimizely": "3.0",
-        "drupal/google_tag": "1.x-dev",
+        "drupal/google_tag": "1.0",
         "drupal/google_analytics": "2.2",
         "drupal/simple_sitemap": "2.9",
         "drupal/redirect": "1.0-beta1",
@@ -225,6 +240,9 @@
         "doctrine/inflector": "1.1.*",
         "drupal/crop": "1.3",
         "drupal/focal_point": "1.0-beta5",
-        "drupal/easy_breadcrumb": "^1.6"
+        "drupal/media_entity_video": "1.0-beta2",
+        "drupal/video": "1.2",
+        "drupal/easy_breadcrumb": "^1.6",
+        "drupal/ckeditor_bootstrap_buttons": "^1.1"
     }
 }