Skip to content
This repository has been archived by the owner on Nov 9, 2021. It is now read-only.

Commit

Permalink
Merge pull request #253 from govCMS/release/1.0-beta3
Browse files Browse the repository at this point in the history
Release v1.0-beta3
  • Loading branch information
fubarhouse committed Mar 18, 2019
2 parents ff9e74e + 2664c6b commit ff68b70
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 13 deletions.
6 changes: 4 additions & 2 deletions composer-lagoon.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@
"cweagans/composer-patches": "^1.6.5",
"drupal-composer/drupal-scaffold": "^2.5",
"drupal/console": "^1.0.2",
"drupal/core": "8.6.10",
"drupal/core": "8.6.12",
"drush/drush": "^9.0.0",
"govcms/govcms": "*",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3"
"webmozart/path-util": "^2.3",
"webflo/drupal-core-strict": "8.6.12"
},
"conflict": {
"drupal/drupal": "*"
Expand Down Expand Up @@ -62,6 +63,7 @@
"patchLevel": {
"drupal/core": "-p2"
},
"enable-patching": true,
"installer-types": ["bower-asset", "npm-asset"],
"installer-paths": {
"web/core": [
Expand Down
23 changes: 17 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@
"drupal/config_filter": "1.4",
"drupal/config_split": "1.4",
"drupal/config_update": "1.6",
"drupal/consumers": "1.4",
"drupal/consumers": "1.9",
"drupal/contact_storage": "1.0-beta9",
"drupal/context": "4.0-beta2",
"drupal/core": "8.6.10",
"drupal/core": "8.6.12",
"drupal/ctools": "3.0.0",
"drupal/dropzonejs": "2.0.0-alpha3",
"drupal/ds": "3.2",
"drupal/entity_browser": "2.0",
Expand All @@ -46,11 +47,12 @@
"drupal/entity_reference_display": "1.2.0",
"drupal/entity_reference_revisions": "1.6",
"drupal/environment_indicator": "3.5",
"drupal/facets": "1.2",
"drupal/events_log_track": "1.1",
"drupal/facets": "1.3",
"drupal/features": "3.8",
"drupal/field_group": "3.0-beta1",
"drupal/focal_point": "1.0-beta6",
"drupal/google_analytics": "3.0-beta1",
"drupal/google_analytics": "3.0",
"drupal/govcms8_ui": "1.0.0-alpha1",
"drupal/govcms8_uikit_starter": "1.0-alpha1",
"drupal/graphql": "3.0.0-rc2",
Expand Down Expand Up @@ -79,7 +81,7 @@
"drupal/search_api_solr": "2.2",
"drupal/seckit": "1.1",
"drupal/shield": "1.2",
"drupal/simple_oauth": "3.11",
"drupal/simple_oauth": "3.14",
"drupal/simple_sitemap": "2.12",
"drupal/swiftmailer": "1.0-beta2",
"drupal/token": "1.5",
Expand Down Expand Up @@ -129,7 +131,16 @@
"docroot/libraries/{$name}": ["type:drupal-library", "type:bower-asset", "type:npm-asset"],
"drush/contrib/{$name}": ["type:drupal-drush"]
},
"patches": {}
"enable-patching":true,
"patches": {
"drupal/events_log_track": {
"Events Log Track breaks Entity Browser #5 - https://www.drupal.org/project/events_log_track/issues/2934036": "https://www.drupal.org/files/issues/2018-04-19/2934036-check_empty_submit-5.patch",
"Entities with title longer than 50 characters - https://www.drupal.org/project/events_log_track/issues/2930817": "https://www.drupal.org/files/issues/increase-character-length-2930817-2.patch",
"Event logs for change in workflows - https://www.drupal.org/project/events_log_track/issues/2974170": "https://www.drupal.org/files/issues/2018-06-26/events_log_track-add-workflows-2974170-7.patch",
"Add handlers for file and media entities - https://www.drupal.org/project/events_log_track/issues/2959769": "https://www.drupal.org/files/issues/2018-06-26/events-log-track_add-file-media-2959769-9.patch",
"Skip password logging during failed authentication attempt - https://www.drupal.org/project/events_log_track/issues/3027463": "https://www.drupal.org/files/issues/2019-01-22/event-log-track-auth-3027463-2.patch"
}
}
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion drupal-org-core.make
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
core = 8.x
api = 2
projects[drupal][type] = core
projects[drupal][version] = 8.6.10
projects[drupal][version] = 8.6.12
15 changes: 11 additions & 4 deletions drupal-org.make
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ projects[config_split][version] = 1.4
projects[config_update][type] = module
projects[config_update][version] = 1.6
projects[consumers][type] = module
projects[consumers][version] = 1.4
projects[consumers][version] = 1.9
projects[contact_storage][type] = module
projects[contact_storage][version] = 1.0-beta9
projects[context][type] = module
Expand All @@ -47,16 +47,23 @@ projects[entity_reference_revisions][type] = module
projects[entity_reference_revisions][version] = 1.6
projects[environment_indicator][type] = module
projects[environment_indicator][version] = 3.5
projects[event_log_track][type] = module
projects[event_log_track][version] = 1.1
projects[event_log_track][patch][] = "https://www.drupal.org/files/issues/2018-04-19/2934036-check_empty_submit-5.patch"
projects[event_log_track][patch][] = "https://www.drupal.org/files/issues/increase-character-length-2930817-2.patch"
projects[event_log_track][patch][] = "https://www.drupal.org/files/issues/2018-06-26/events_log_track-add-workflows-2974170-7.patch"
projects[event_log_track][patch][] = "https://www.drupal.org/files/issues/2018-06-26/events-log-track_add-file-media-2959769-9.patch"
projects[event_log_track][patch][] = "https://www.drupal.org/files/issues/2019-01-22/event-log-track-auth-3027463-2.patch"
projects[facets][type] = module
projects[facets][version] = 1.2
projects[facets][version] = 1.3
projects[features][type] = module
projects[features][version] = 3.8
projects[field_group][type] = module
projects[field_group][version] = 3.0-beta1
projects[focal_point][type] = module
projects[focal_point][version] = 1.0-beta6
projects[google_analytics][type] = module
projects[google_analytics][version] = 3.0-beta1
projects[google_analytics][version] = 3.0
projects[google_analytics][patch][] = "https://www.drupal.org/files/issues/2018-06-18/patch_google_analytics.patch"
projects[govcms8_ui][type] = theme
projects[govcms8_ui][version] = 1.0-alpha1
Expand Down Expand Up @@ -117,7 +124,7 @@ projects[seckit][version] = 1.1
projects[shield][type] = module
projects[shield][version] = 1.2
projects[simple_oauth][type] = module
projects[simple_oauth][version] = 3.11
projects[simple_oauth][version] = 3.14
projects[simple_sitemap][type] = module
projects[simple_sitemap][version] = 2.12
projects[swiftmailer][type] = module
Expand Down
9 changes: 9 additions & 0 deletions govcms.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,15 @@ dependencies:
- components
- entity_browser
- entity_embed
- events_log_track:event_log_track
- events_log_track:event_log_track_auth
- events_log_track:event_log_track_node
- events_log_track:event_log_track_taxonomy
- events_log_track:event_log_track_menu
- events_log_track:event_log_track_file
- events_log_track:event_log_track_media
- events_log_track:event_log_track_user
- events_log_track:event_log_track_workflows
- features_ui
- field_group
- focal_point
Expand Down

0 comments on commit ff68b70

Please sign in to comment.