Merge branch 'master' of gitlab.com:agaric/sites/geo

This commit is contained in:
David Valdez 2019-07-19 11:16:14 -05:00
commit 588cf932c9
478 changed files with 131 additions and 552 deletions

View file

@ -1,15 +1,27 @@
This is a composer based installer for the [Drutopia distribution](http://www.drupal.org/project/drutopia). # GEO.coop README
# Prerequisites This project is based on Drutopia, which means it is compatible with
existing and future Drutopia features. We will be diverging from
Drutopia for special functionality, however.
1. [Prepare a local server for Drupal](https://www.drupal.org/docs/develop/local-server-setup) ## Getting started
2. [Install Composer](https://getcomposer.org/download/)
One time:
## Installation of Drutopia basic
``` ```
composer create-project drutopia/drutopia_template:dev-master --no-interaction DIRECTORY git clone git@gitlab.com:agaric/sites/geo.git
cd geo
``` ```
Composer will create a new directory called DIRECTORY (change to whatever presumably lower-case name you would like). Inside you will find the web directory with the entire code base of [Drutopia distribution](http://www.drupal.org/project/drutopia). You should be able to install it like any other Drupal site. [Install DDEV](https://ddev.readthedocs.io/en/latest/#installation) for
the following steps to work.
Whenever you want a fresh start:
```
git pull
ddev start
ddev composer update
ddev . drush -y site:install minimal --existing-config
```

View file

@ -13,7 +13,8 @@
"drush/drush": "^9.0", "drush/drush": "^9.0",
"drupal/migrate_plus": "^4.2", "drupal/migrate_plus": "^4.2",
"drupal/migrate_upgrade": "^3", "drupal/migrate_upgrade": "^3",
"drupal/migrate_tools": "^4.1" "drupal/migrate_tools": "^4.1",
"drupal/config_actions": "1.x-dev"
}, },
"repositories": { "repositories": {
"drupal": { "drupal": {
@ -52,14 +53,17 @@
"type:drupal-drush" "type:drupal-drush"
] ]
}, },
"enable-patching": true,
"patches": { "patches": {
"drupal/core": {
"Allow an install hook in profiles installing from configuration": "https://www.drupal.org/files/issues/2018-11-27/2982052-22.patch"
},
"drutopia/drutopia": { "drutopia/drutopia": {
"Remove default content": "patches/drutopia-remove-default-content.patch" "Remove default content": "patches/drutopia-remove-default-content.patch"
}, },
"drupal/drutopia_core": { "drupal/drutopia_core": {
"Remove default content": "patches/drutopia-core-remove-default-content.patch" "Remove default content": "patches/drutopia-core-remove-default-content.patch"
} }
}, }
"enable-patching": true
} }
} }

50
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "5ab9bcf2e25d6ff9012f75b462013e1e", "content-hash": "44e3defbefe14c4070d9f144fedde427",
"packages": [ "packages": [
{ {
"name": "asm89/stack-cors", "name": "asm89/stack-cors",
@ -2515,17 +2515,11 @@
}, },
{ {
"name": "drupal/config_actions", "name": "drupal/config_actions",
"version": "1.1.0", "version": "dev-1.x",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://git.drupalcode.org/project/config_actions.git", "url": "https://git.drupalcode.org/project/config_actions.git",
"reference": "8.x-1.1" "reference": "026055919eb73f9e79aac2f2b9ec0fc85d195569"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/config_actions-8.x-1.1.zip",
"reference": "8.x-1.1",
"shasum": "c3493a02af86fd6e72d00eae9265f697a80b5edd"
}, },
"require": { "require": {
"drupal/core": "~8.0" "drupal/core": "~8.0"
@ -2536,11 +2530,11 @@
"dev-1.x": "1.x-dev" "dev-1.x": "1.x-dev"
}, },
"drupal": { "drupal": {
"version": "8.x-1.1", "version": "8.x-1.1+1-dev",
"datestamp": "1553005385", "datestamp": "1556823781",
"security-coverage": { "security-coverage": {
"status": "covered", "status": "not-covered",
"message": "Covered by Drupal's security advisory policy" "message": "Dev releases are not covered by Drupal security advisories."
} }
}, },
"drush": { "drush": {
@ -2575,7 +2569,8 @@
"homepage": "https://www.drupal.org/project/config_actions", "homepage": "https://www.drupal.org/project/config_actions",
"support": { "support": {
"source": "https://git.drupalcode.org/project/config_actions" "source": "https://git.drupalcode.org/project/config_actions"
} },
"time": "2019-05-03T15:13:24+00:00"
}, },
{ {
"name": "drupal/config_actions_provider", "name": "drupal/config_actions_provider",
@ -3417,6 +3412,9 @@
"recurse": false, "recurse": false,
"replace": false, "replace": false,
"merge-extra": false "merge-extra": false
},
"patches_applied": {
"Allow an install hook in profiles installing from configuration": "https://www.drupal.org/files/issues/2018-11-27/2982052-22.patch"
} }
}, },
"autoload": { "autoload": {
@ -6043,7 +6041,7 @@
}, },
{ {
"name": "drupal/gnode", "name": "drupal/gnode",
"version": "1.0.0-rc3", "version": "1.0.0-rc4",
"require": { "require": {
"drupal/core": "*", "drupal/core": "*",
"drupal/group": "self.version" "drupal/group": "self.version"
@ -6054,8 +6052,8 @@
"dev-1.x": "1.x-dev" "dev-1.x": "1.x-dev"
}, },
"drupal": { "drupal": {
"version": "8.x-1.0-rc3", "version": "8.x-1.0-rc4",
"datestamp": "1560345781", "datestamp": "1563460085",
"security-coverage": { "security-coverage": {
"status": "not-covered", "status": "not-covered",
"message": "RC releases are not covered by Drupal security advisories." "message": "RC releases are not covered by Drupal security advisories."
@ -6084,17 +6082,17 @@
}, },
{ {
"name": "drupal/group", "name": "drupal/group",
"version": "1.0.0-rc3", "version": "1.0.0-rc4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://git.drupalcode.org/project/group.git", "url": "https://git.drupalcode.org/project/group.git",
"reference": "8.x-1.0-rc3" "reference": "8.x-1.0-rc4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://ftp.drupal.org/files/projects/group-8.x-1.0-rc3.zip", "url": "https://ftp.drupal.org/files/projects/group-8.x-1.0-rc4.zip",
"reference": "8.x-1.0-rc3", "reference": "8.x-1.0-rc4",
"shasum": "e697310cbe99219c9f8af7858d17303c7c0a6ac0" "shasum": "d5d55167523a3ddccef7f66159b4c417d950d6f5"
}, },
"require": { "require": {
"drupal/core": "^8.6", "drupal/core": "^8.6",
@ -6106,8 +6104,8 @@
"dev-1.x": "1.x-dev" "dev-1.x": "1.x-dev"
}, },
"drupal": { "drupal": {
"version": "8.x-1.0-rc3", "version": "8.x-1.0-rc4",
"datestamp": "1560345781", "datestamp": "1563460085",
"security-coverage": { "security-coverage": {
"status": "not-covered", "status": "not-covered",
"message": "RC releases are not covered by Drupal security advisories." "message": "RC releases are not covered by Drupal security advisories."
@ -10747,7 +10745,9 @@
"packages-dev": [], "packages-dev": [],
"aliases": [], "aliases": [],
"minimum-stability": "dev", "minimum-stability": "dev",
"stability-flags": [], "stability-flags": {
"drupal/config_actions": 20
},
"prefer-stable": true, "prefer-stable": true,
"prefer-lowest": false, "prefer-lowest": false,
"platform": [], "platform": [],

Some files were not shown because too many files have changed in this diff Show more