Compare commits

...

26 commits

Author SHA1 Message Date
David Valdez
82509ba323 Add D9 in the composer.json file 2020-09-14 18:04:14 -05:00
David Valdez
8fd49b27f7 Update the drutopia reference in the lock file 2020-09-14 16:34:27 -05:00
David Valdez
10ea0431f6 Markdown module with D9 Upgrade 2020-09-14 14:43:55 -05:00
David Valdez
32f8e7373f Update markdown module to be usable at D9 2020-09-14 14:43:32 -05:00
David Valdez
e350adbafe Lock file with several more patches 2020-09-09 22:09:34 -05:00
David Valdez
a6caeba30a patches for markdown and webform_stripe modules
These patches make the modules compatible with D9
2020-09-09 22:09:05 -05:00
David Valdez
483138ae5e lock file wit hthe dev version of octavia 2020-09-09 14:36:38 -05:00
David Valdez
5079621e13 Updating octavia 2020-09-09 14:36:22 -05:00
David Valdez
c219eebb28 Lock file with more updates and patches 2020-09-09 12:56:09 -05:00
David Valdez
c3061fede2 New patches and updated of different modules 2020-09-09 12:55:51 -05:00
David Valdez
654f5793b4 composer.lock without the similar term patch
and with the block theme sync module
2020-09-07 22:28:50 -05:00
David Valdez
d632dd7aa3 Remove similartemrs patch (it was commited and released)
And add a new version of the block theme sync module patch to make it
compatible with D9
2020-09-07 22:28:10 -05:00
David Valdez
a5087a1d31 Lock file with the modules updated to work on D9 2020-09-07 16:17:50 -05:00
David Valdez
c99ee499ea Update several modules to make them work with D9
Also, several patches were added in some modules
2020-09-07 16:17:22 -05:00
David Valdez
2a08038d1a Merge branch 'D9-upgrade' of gitlab.com:agaric/sites/agaric-com into D9-upgrade 2020-08-28 21:18:31 -05:00
benjamin melançon
01a8ffd05d Call for Drupal 9 and use drutopia dev branch to allow it 2020-08-05 20:22:07 -04:00
benjamin melançon
f6791135ae Restore update ddev-generated .gitignore
From commit e4534b8

This was lost because git checkout --theirs -- flat out didn't work.  What?
2020-08-05 14:46:08 -04:00
David Valdez
7df2c30770 Add several patches to make the modules work with Drupal 9 2020-08-05 14:41:25 -04:00
David Valdez
0459c98cdd Add the patch to make textarea_widget_for_text work with D9 2020-08-05 14:41:25 -04:00
David Valdez
1ee678f81f Add the patch to make wyswyg_linebreaks D9 compatible 2020-08-05 14:41:25 -04:00
David Valdez
89ae9979ed First step to move the site to Drupal 9 2020-08-05 14:41:25 -04:00
benjamin melançon
c900bf8f92 Stick to 7.3 for now, says wolcen 2020-08-05 14:36:09 -04:00
David Valdez
f116820568 Add several patches to make the modules work with Drupal 9 2020-07-12 01:39:02 +00:00
David Valdez
cd7ff4df46 Add the patch to make textarea_widget_for_text work with D9 2020-07-12 01:38:32 +00:00
David Valdez
b431d07447 Add the patch to make wyswyg_linebreaks D9 compatible 2020-07-12 00:48:42 +00:00
David Valdez
30b49372f5 First step to move the site to Drupal 9 2020-07-06 23:20:43 +00:00
8 changed files with 3672 additions and 1264 deletions

1
.ddev/.gitignore vendored
View file

@ -1,7 +1,6 @@
#ddev-generated: Automatically generated ddev .gitignore.
# You can remove the above line if you want to edit and maintain this file yourself.
/.gitignore
/**/*.example
/.dbimageBuild
/.dbimageExtra

View file

@ -2,18 +2,19 @@ APIVersion: v1.13.1
name: agaric-coop
type: drupal8
docroot: web
php_version: "7.4"
php_version: "7.3"
webserver_type: nginx-fpm
router_http_port: "80"
router_https_port: "443"
xdebug_enabled: true
additional_hostnames: []
additional_fqdns: []
mariadb_version: "10.2"
mariadb_version: "10.3"
nfs_mount_enabled: false
provider: default
webimage_extra_packages: [rake, sassc]
use_dns_when_possible: false
php_version: "7.3"
timezone: ""

View file

@ -11,30 +11,33 @@
"drupal/admin_links_access_filter": "^1.0@alpha",
"drupal/allowed_formats": "^1.1",
"drupal/antibot": "^1.2",
"drupal/block_theme_sync": "^1.0@alpha",
"drupal/block_theme_sync": "1.x-dev",
"drupal/ckeditor_markdown": "^1.1",
"drupal/coffee": "1.x-dev",
"drupal/comment_notify": "dev-1.x",
"drupal/core-recommended": "^8.8",
"drupal/core-composer-scaffold": "^9.0.0",
"drupal/core-project-message": "^9.0.0",
"drupal/core-recommended": "^9.0.0",
"drupal/customerror": "1.x-dev",
"drupal/diff": "^1.0@RC",
"drupal/dropdown_language": "^2.2",
"drupal/drutopia_core": "1.x-dev",
"drupal/drutopia_core": "dev-update-to-drupal9 as 1.x-dev",
"drupal/drutopia_site": "dev-1.x",
"drupal/google_analytics": "^2.3",
"drupal/honeypot": "^1.29",
"drupal/honeypot": "^2.0",
"drupal/hotjar": "^1.2",
"drupal/http_cache_control": "^1.0",
"drupal/http_client_error_status": "^1.0",
"drupal/http_client_error_status": "^2.0",
"drupal/indieweb": "1.x-dev",
"drupal/mailchimp": "1.x-dev",
"drupal/mailsystem": "^4.3",
"drupal/markdown": "^1.2",
"drupal/markdown": "dev-2.x",
"drupal/menu_trail_by_path": "^1.1",
"drupal/migrate_plus": "^4.0",
"drupal/migrate_tools": "^4.0",
"drupal/mimemail": "^1.0@alpha",
"drupal/minimalhtml": "^1.0",
"drupal/multiline_config": "^1.0",
"drupal/minimalhtml": "1.x-dev",
"drupal/multiline_config": "dev-1.x",
"drupal/paragraphs_features": "^1.4",
"drupal/preview_link": "^1.1",
"drupal/redirect": "^1.2",
@ -42,24 +45,27 @@
"drupal/scheduler": "^1.0",
"drupal/scn": "^1.1",
"drupal/search404": "^1.0",
"drupal/stripe_webform": "^1.1",
"drupal/swiftmailer": "^1.0@beta",
"drupal/textarea_widget_for_text": "^1.1",
"drupal/stripe_webform": "1.x-dev",
"drupal/swiftmailer": "^2.0",
"drupal/textarea_widget_for_text": "1.x-dev",
"drupal/twigsuggest": "1.x-dev",
"drupal/ui_patterns": "^1.0@RC",
"drupal/viewsreference": "^1.2",
"drupal/webform": "^5.0@RC",
"drupal/ui_patterns": "1.x-dev",
"drupal/upgrade_status": "^2.0",
"drupal/viewsreference": "^2.0",
"drupal/webform": "^6.0",
"drupal/webform_mailchimp": "^5.4",
"drupal/wysiwyg_linebreaks": "^1.9",
"drush/drush": "^9.0",
"drutopia/drutopia": "^1.0-beta1",
"drupal/wysiwyg_linebreaks": "1.x-dev",
"drush/drush": "^10.0",
"drutopia/drutopia": "dev-update-to-drupal9",
"league/commonmark": "^1.5",
"wikimedia/composer-merge-plugin": "^1.4",
"zaporylie/composer-drupal-optimizations": "^1.0"
},
"require-dev": {
"behat/behat": "^3.4",
"behat/mink": "^1.7",
"behat/mink-goutte-driver": "^1.2"
"behat/mink-goutte-driver": "^1.2",
"phpunit/phpunit": "^7"
},
"repositories": {
"drupal": {
@ -68,7 +74,11 @@
},
"drutopia": {
"type": "vcs",
"url": "https://github.com/drutopia/drutopia"
"url": "https://gitlab.com/drutopia/drutopia"
},
"drutopia_core": {
"type": "vcs",
"url": "https://gitlab.com/drutopia/drutopia_core"
}
},
"config": {
@ -108,7 +118,35 @@
"Allow user to specify keyboard shortcut.": "https://www.drupal.org/files/issues/2018-11-11/1734898-14.coffee-hotkeys-plus-g.patch"
},
"drupal/wysiwyg_linebreaks": {
"Excess line breaks keep getting added": "https://www.drupal.org/files/issues/2018-11-18/excess-line-breaks-keep-getting-added-3013853-5.patch"
"Drupal 9 readiness and code standars": "https://www.drupal.org/files/issues/2020-04-21/drupal_9_readiness_and_code_standarts_3129608-7.patch",
"Excess line breaks keep getting added": "https://www.drupal.org/files/issues/2018-11-18/excess-line-breaks-keep-getting-added-3013853-5.patch"
},
"drupal/textarea_widget_for_text": {
"Automated Drupal Rector fixes":"https://www.drupal.org/files/issues/2020-05-23/textarea_widget_for_text.1.1.rector.patch"
},
"drupal/block_theme_sync": {
"Automated Drupal 9 compatibility fixes": "https://www.drupal.org/files/issues/2020-09-07/3146266-3.patch"
},
"drupal/config_actions_provider": {
"Automated Drupal Rector fixes": "https://www.drupal.org/files/issues/2020-05-23/config_actions_provider.1.x-dev.rector.patch"
},
"drupal/multiline_config": {
"Drupal 9 readiness for Multiline Config": "https://www.drupal.org/files/issues/2020-07-22/3109713-Drupal-support-13.patch"
},
"drupal/mailchimp": {
"Drupal 9 compatibility": "https://www.drupal.org/files/issues/2020-07-16/mailchimp-d9-3138909-9.patch"
},
"drupal/minimalhtml": {
"Automated Drupal Rector fixes": "https://www.drupal.org/files/issues/2020-09-09/3141144-4.txt"
},
"drupal/regionincontent": {
"Region In Content Template": "https://www.drupal.org/files/issues/2020-06-06/regionincontent.1.x-dev.rector.patch"
},
"drupal/stripe_webform": {
"Automated Drupal 9 compatibility fixes": "https://www.drupal.org/files/issues/2020-09-09/stripe_webform.1.x-dev.rector.patch"
},
"drupal/markdown": {
"[markdown] Drupal 9 Support": "https://www.drupal.org/files/issues/2020-05-14/3103679-18.patch"
}
}
},

4843
composer.lock generated

File diff suppressed because it is too large Load diff

View file

@ -2,7 +2,7 @@ name: Agaric Migration
description: Migrate the content from the D7 version of the site.
package: Custom
type: module
core: 8.x
core_version_requirement: ^8 || ^9
dependencies:
- drupal:migrate
- drupal:migrate_drupal

View file

@ -1,7 +1,7 @@
name: 'Drutopia Case Study'
description: 'A Case Study highlights work done on a project.'
type: module
core: 8.x
core_version_requirement: ^8 || ^9
dependencies:
- config_snapshot
- drutopia_case_study

View file

@ -1,7 +1,7 @@
name: 'Creative License'
type: module
core: 8.x
package: Drutopia
core_version_requirement: ^8 || ^9
dependencies:
- config_actions
- config_snapshot

View file

@ -3,8 +3,7 @@ description: An Octavia-based subtheme.
type: theme
base theme: octavia
package: Custom
core: 8.x
core_version_requirement: ^8 || ^9
regions:
header: 'Header'
navbar_branding: 'Branding'