diff --git a/.travis.yml b/.travis.yml index e5572c2ad..de182adc1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,10 +13,10 @@ php: - 7.0.22 env: - VERSION=HEAD + - VERSION=2.2.6 - VERSION=2.2.5 - VERSION=2.2.4 - VERSION=2.2.3 - - VERSION=2.2.2 addons: apt: diff --git a/CHANGELOG.md b/CHANGELOG.md index 81a5e1ace..da0a95347 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +## 2.2.6 +* Fixed a problem that caused errors when placing blocks that contained date + fields via IPE. (Issue #2825028) +* Fixed a problem with CKEditor caused by a bug in the new Lightning Scheduler. + (Issue #2929997) +* Lightning and Lightning Project no longer override the default location of + Composer's "bin" directory. (Issue #2927504) +* Made the Moderation History view compatible with Content Moderation. + (Issue #2930288) +* Added a Console command that will return the current version of Lightning in + SemVer format. (GitHub #543) +* Upadated the following modules: + * DropzoneJS + * Media Entity (Only used by sites that have not migrated to core Media.) + * JSON API + * Simple OAuth + * Video Embed Field + ## 2.2.5 * The `since` option used with the `update:lightning` console command has been converted to an argument and is now required. See diff --git a/README.md b/README.md index 7d8993f49..4cfe9f4fe 100644 --- a/README.md +++ b/README.md @@ -144,14 +144,12 @@ your environment, but generally you will not need to do this. result in some images not being saved. ### Inherited profiles -Neither Drush nor Drupal Console are aware of the concept of inherited profiles -and as a result, you will be unable to uninstall dependencies of any parent -profile using either of those tools. You can still uninstall these dependencies -via the UI at "/admin/modules/uninstall". We have provided patches [here](https://www.drupal.org/node/2902643) -for both Drush and Drupal Console which allow you to uninstall dependencies of -parent profiles. - -* [Drupal Console inherited profile dependencies patch](https://www.drupal.org/files/issues/2902643-3-drupalconsole-master.patch). +Drush is not aware of the concept of inherited profiles and as a result, you +will be unable to uninstall dependencies of any parent profile using Drush. You +can still uninstall these dependencies via the UI at "/admin/modules/uninstall". +We have provided patches [here](https://www.drupal.org/node/2902643) +for Drush which allow you to uninstall dependencies of parent profiles. + * [Drush 9 inherited profile dependencies patch](https://www.drupal.org/files/issues/2902643-2--drush-master.patch). [issue_queue]: https://www.drupal.org/project/issues/lightning "Lightning Issue Queue" diff --git a/UPDATE.md b/UPDATE.md index 771a14c09..090f362df 100644 --- a/UPDATE.md +++ b/UPDATE.md @@ -80,6 +80,9 @@ are currently running Beta 1 and are trying to update to Beta 3, you will need to follow the instructions for updating from Beta 1 to Beta 2, then from Beta 2 to Beta 3, in that order. +### 2.2.5 to 2.2.6 +There are no manual update steps for this version. + ### 2.2.4 to 2.2.5 There are no manual update steps for this version. diff --git a/build-lightning.make b/build-lightning.make index d4b8b2ef4..941db1340 100644 --- a/build-lightning.make +++ b/build-lightning.make @@ -4,4 +4,4 @@ includes[] = drupal-org-core.make projects[lightning][type] = profile projects[lightning][download][type] = git projects[lightning][download][branch] = 8.x-2.x -projects[lightning][download][tag] = 8.x-2.26-dev \ No newline at end of file +projects[lightning][download][tag] = 8.x-2.26 \ No newline at end of file diff --git a/lightning.info.yml b/lightning.info.yml index a78b9b249..83b7c966b 100644 --- a/lightning.info.yml +++ b/lightning.info.yml @@ -2,7 +2,7 @@ name: Lightning core: 8.x type: profile description: 'A fast and feature-rich Drupal distribution.' -version: '8.x-2.26-dev' +version: '8.x-2.26' distribution: name: Lightning dependencies: @@ -58,4 +58,4 @@ themes: - bartik - seven project: lightning -datestamp: '1513262037' +datestamp: '1513789592' diff --git a/modules/lightning_features/lightning_api/lightning_api.info.yml b/modules/lightning_features/lightning_api/lightning_api.info.yml index 153df6538..8074654f6 100644 --- a/modules/lightning_features/lightning_api/lightning_api.info.yml +++ b/modules/lightning_features/lightning_api/lightning_api.info.yml @@ -3,7 +3,7 @@ core: 8.x type: module package: Lightning description: 'Progressive decoupling? No problem.' -version: '8.x-2.26-dev' +version: '8.x-2.26' dependencies: - jsonapi - openapi_redoc diff --git a/modules/lightning_features/lightning_api/modules/api_test/api_test.info.yml b/modules/lightning_features/lightning_api/modules/api_test/api_test.info.yml index e4def9c48..05cdbdbc0 100644 --- a/modules/lightning_features/lightning_api/modules/api_test/api_test.info.yml +++ b/modules/lightning_features/lightning_api/modules/api_test/api_test.info.yml @@ -5,4 +5,4 @@ description: 'Contains configuration and support code for testing Headless Light hidden: true dependencies: - lightning_api -version: '8.x-2.26-dev' +version: '8.x-2.26' diff --git a/modules/lightning_features/lightning_core/lightning_core.info.yml b/modules/lightning_features/lightning_core/lightning_core.info.yml index 594dc13f8..ac2ed711f 100644 --- a/modules/lightning_features/lightning_core/lightning_core.info.yml +++ b/modules/lightning_features/lightning_core/lightning_core.info.yml @@ -3,7 +3,7 @@ core: 8.x type: module package: Lightning description: 'Shared functionality for the Lightning distribution.' -version: '8.x-2.26-dev' +version: '8.x-2.26' dependencies: - node - path diff --git a/modules/lightning_features/lightning_core/modules/lightning_contact_form/lightning_contact_form.info.yml b/modules/lightning_features/lightning_core/modules/lightning_contact_form/lightning_contact_form.info.yml index bf23699f7..181871c5c 100644 --- a/modules/lightning_features/lightning_core/modules/lightning_contact_form/lightning_contact_form.info.yml +++ b/modules/lightning_features/lightning_core/modules/lightning_contact_form/lightning_contact_form.info.yml @@ -3,6 +3,6 @@ core: 8.x type: module package: Lightning description: 'Provides a site-wide contact form with basic default configuration.' -version: '8.x-2.26-dev' +version: '8.x-2.26' dependencies: - contact_storage diff --git a/modules/lightning_features/lightning_core/modules/lightning_dev/lightning_dev.info.yml b/modules/lightning_features/lightning_core/modules/lightning_dev/lightning_dev.info.yml index 3dee4a451..b16f688c0 100644 --- a/modules/lightning_features/lightning_core/modules/lightning_dev/lightning_dev.info.yml +++ b/modules/lightning_features/lightning_core/modules/lightning_dev/lightning_dev.info.yml @@ -3,7 +3,7 @@ core: 8.x type: module package: Lightning description: 'Development tools for working on the Lightning distribution itself.' -version: '8.x-2.26-dev' +version: '8.x-2.26' hidden: true dependencies: - devel_generate diff --git a/modules/lightning_features/lightning_core/modules/lightning_page/lightning_page.info.yml b/modules/lightning_features/lightning_core/modules/lightning_page/lightning_page.info.yml index 3f40b73cb..a0480345c 100644 --- a/modules/lightning_features/lightning_core/modules/lightning_page/lightning_page.info.yml +++ b/modules/lightning_features/lightning_core/modules/lightning_page/lightning_page.info.yml @@ -3,6 +3,6 @@ package: Lightning core: 8.x type: module description: 'Provides a "Basic Page" content type that is, indeed, very basic.' -version: '8.x-2.26-dev' +version: '8.x-2.26' dependencies: - lightning_core diff --git a/modules/lightning_features/lightning_core/modules/lightning_roles/lightning_roles.info.yml b/modules/lightning_features/lightning_core/modules/lightning_roles/lightning_roles.info.yml index 8ebbe72b5..b7850d731 100644 --- a/modules/lightning_features/lightning_core/modules/lightning_roles/lightning_roles.info.yml +++ b/modules/lightning_features/lightning_core/modules/lightning_roles/lightning_roles.info.yml @@ -3,4 +3,4 @@ core: 8.x type: module package: Lightning description: 'Automatically manages user roles and permissions.' -version: '8.x-2.26-dev' +version: '8.x-2.26' diff --git a/modules/lightning_features/lightning_core/modules/lightning_search/lightning_search.info.yml b/modules/lightning_features/lightning_core/modules/lightning_search/lightning_search.info.yml index 37095cf2b..87948fe77 100644 --- a/modules/lightning_features/lightning_core/modules/lightning_search/lightning_search.info.yml +++ b/modules/lightning_features/lightning_core/modules/lightning_search/lightning_search.info.yml @@ -3,7 +3,7 @@ core: 8.x type: module package: Lightning description: 'A basic but powerful set of default configuration for searching your site.' -version: '8.x-2.26-dev' +version: '8.x-2.26' dependencies: - lightning_core - search_api diff --git a/modules/lightning_features/lightning_core/modules/lightning_test/lightning_test.info.yml b/modules/lightning_features/lightning_core/modules/lightning_test/lightning_test.info.yml index b6453ccef..87bdcf193 100644 --- a/modules/lightning_features/lightning_core/modules/lightning_test/lightning_test.info.yml +++ b/modules/lightning_features/lightning_core/modules/lightning_test/lightning_test.info.yml @@ -3,5 +3,5 @@ core: 8.x type: module description: 'Contains configuration and support code for running Lightning functional tests.' package: Lightning -version: '8.x-2.26-dev' +version: '8.x-2.26' hidden: true diff --git a/modules/lightning_features/lightning_layout/lightning_layout.info.yml b/modules/lightning_features/lightning_layout/lightning_layout.info.yml index 139387f71..b9d34764d 100644 --- a/modules/lightning_features/lightning_layout/lightning_layout.info.yml +++ b/modules/lightning_features/lightning_layout/lightning_layout.info.yml @@ -2,7 +2,7 @@ name: 'Lightning Layout' core: 8.x type: module description: 'Provides the tools to take control of your layout.' -version: '8.x-2.26-dev' +version: '8.x-2.26' package: Lightning dependencies: - lightning_core diff --git a/modules/lightning_features/lightning_layout/modules/lightning_landing_page/lightning_landing_page.info.yml b/modules/lightning_features/lightning_layout/modules/lightning_landing_page/lightning_landing_page.info.yml index 02c9eb59c..bd4e3ac48 100644 --- a/modules/lightning_features/lightning_layout/modules/lightning_landing_page/lightning_landing_page.info.yml +++ b/modules/lightning_features/lightning_layout/modules/lightning_landing_page/lightning_landing_page.info.yml @@ -3,6 +3,6 @@ package: Lightning core: 8.x type: module description: 'Provides a content type which allows you to build free-form one-off landing pages.' -version: '8.x-2.26-dev' +version: '8.x-2.26' dependencies: - lightning_layout diff --git a/modules/lightning_features/lightning_media/lightning_media.info.yml b/modules/lightning_features/lightning_media/lightning_media.info.yml index 438798651..a550f2cb4 100644 --- a/modules/lightning_features/lightning_media/lightning_media.info.yml +++ b/modules/lightning_features/lightning_media/lightning_media.info.yml @@ -2,7 +2,7 @@ name: 'Lightning Media' core: 8.x type: module description: 'Slick media handling for Lightning. So cool you''ll make the A/C jealous.' -version: '8.x-2.26-dev' +version: '8.x-2.26' package: Lightning dependencies: - ckeditor diff --git a/modules/lightning_features/lightning_media/modules/lightning_media_bulk_upload/lightning_media_bulk_upload.info.yml b/modules/lightning_features/lightning_media/modules/lightning_media_bulk_upload/lightning_media_bulk_upload.info.yml index 788ae6660..a09a1ac9e 100644 --- a/modules/lightning_features/lightning_media/modules/lightning_media_bulk_upload/lightning_media_bulk_upload.info.yml +++ b/modules/lightning_features/lightning_media/modules/lightning_media_bulk_upload/lightning_media_bulk_upload.info.yml @@ -2,7 +2,7 @@ name: 'Bulk Media Upload' core: 8.x type: module description: 'Provides a form to upload many media items at once.' -version: '8.x-2.26-dev' +version: '8.x-2.26' package: Lightning dependencies: - dropzonejs diff --git a/modules/lightning_features/lightning_media/modules/lightning_media_document/lightning_media_document.info.yml b/modules/lightning_features/lightning_media/modules/lightning_media_document/lightning_media_document.info.yml index f1657d60a..282c0c30e 100644 --- a/modules/lightning_features/lightning_media/modules/lightning_media_document/lightning_media_document.info.yml +++ b/modules/lightning_features/lightning_media/modules/lightning_media_document/lightning_media_document.info.yml @@ -2,7 +2,7 @@ name: 'Media Document' core: 8.x type: module description: 'Locally hosted document support for Lightning Media.' -version: '8.x-2.26-dev' +version: '8.x-2.26' package: Lightning dependencies: - lightning_media diff --git a/modules/lightning_features/lightning_media/modules/lightning_media_image/lightning_media_image.info.yml b/modules/lightning_features/lightning_media/modules/lightning_media_image/lightning_media_image.info.yml index 447e1d36d..9ba21fc80 100644 --- a/modules/lightning_features/lightning_media/modules/lightning_media_image/lightning_media_image.info.yml +++ b/modules/lightning_features/lightning_media/modules/lightning_media_image/lightning_media_image.info.yml @@ -3,6 +3,6 @@ core: 8.x type: module package: Lightning description: 'Image support for Lightning Media.' -version: '8.x-2.26-dev' +version: '8.x-2.26' dependencies: - lightning_media diff --git a/modules/lightning_features/lightning_media/modules/lightning_media_instagram/lightning_media_instagram.info.yml b/modules/lightning_features/lightning_media/modules/lightning_media_instagram/lightning_media_instagram.info.yml index f2177883b..fdf0b701a 100644 --- a/modules/lightning_features/lightning_media/modules/lightning_media_instagram/lightning_media_instagram.info.yml +++ b/modules/lightning_features/lightning_media/modules/lightning_media_instagram/lightning_media_instagram.info.yml @@ -2,7 +2,7 @@ name: 'Media Instagram' core: 8.x type: module description: 'Instagram support for Lightning Media.' -version: '8.x-2.26-dev' +version: '8.x-2.26' package: Lightning dependencies: - lightning_media diff --git a/modules/lightning_features/lightning_media/modules/lightning_media_twitter/lightning_media_twitter.info.yml b/modules/lightning_features/lightning_media/modules/lightning_media_twitter/lightning_media_twitter.info.yml index e79a9f701..2464322cd 100644 --- a/modules/lightning_features/lightning_media/modules/lightning_media_twitter/lightning_media_twitter.info.yml +++ b/modules/lightning_features/lightning_media/modules/lightning_media_twitter/lightning_media_twitter.info.yml @@ -3,7 +3,7 @@ core: 8.x type: module package: Lightning description: 'Twitter support for Lightning Media.' -version: '8.x-2.26-dev' +version: '8.x-2.26' dependencies: - lightning_media - media_entity_twitter diff --git a/modules/lightning_features/lightning_media/modules/lightning_media_video/lightning_media_video.info.yml b/modules/lightning_features/lightning_media/modules/lightning_media_video/lightning_media_video.info.yml index f9ab84679..84b91d330 100644 --- a/modules/lightning_features/lightning_media/modules/lightning_media_video/lightning_media_video.info.yml +++ b/modules/lightning_features/lightning_media/modules/lightning_media_video/lightning_media_video.info.yml @@ -3,7 +3,7 @@ core: 8.x type: module package: Lightning description: 'Video support for Lightning Media.' -version: '8.x-2.26-dev' +version: '8.x-2.26' dependencies: - lightning_media - video_embed_media diff --git a/modules/lightning_features/lightning_workflow/lightning_workflow.info.yml b/modules/lightning_features/lightning_workflow/lightning_workflow.info.yml index 3280e05e5..414372721 100644 --- a/modules/lightning_features/lightning_workflow/lightning_workflow.info.yml +++ b/modules/lightning_features/lightning_workflow/lightning_workflow.info.yml @@ -2,7 +2,7 @@ name: 'Lightning Workflow' core: 8.x type: module description: 'Tools to improve your content workflow.' -version: '8.x-2.26-dev' +version: '8.x-2.26' package: Lightning dependencies: - content_moderation diff --git a/modules/lightning_features/lightning_workflow/modules/lightning_scheduled_updates/lightning_scheduled_updates.info.yml b/modules/lightning_features/lightning_workflow/modules/lightning_scheduled_updates/lightning_scheduled_updates.info.yml index 69e8ed84a..a63bcf647 100644 --- a/modules/lightning_features/lightning_workflow/modules/lightning_scheduled_updates/lightning_scheduled_updates.info.yml +++ b/modules/lightning_features/lightning_workflow/modules/lightning_scheduled_updates/lightning_scheduled_updates.info.yml @@ -2,6 +2,6 @@ name: 'Schedule Publication' core: 8.x type: module description: 'Allows authors to schedule publication of content.' -version: '8.x-2.26-dev' +version: '8.x-2.26' package: Lightning hidden: true diff --git a/modules/lightning_features/lightning_workflow/modules/lightning_scheduler/lightning_scheduler.info.yml b/modules/lightning_features/lightning_workflow/modules/lightning_scheduler/lightning_scheduler.info.yml index 3ed4b071d..5d2a6149b 100644 --- a/modules/lightning_features/lightning_workflow/modules/lightning_scheduler/lightning_scheduler.info.yml +++ b/modules/lightning_features/lightning_workflow/modules/lightning_scheduler/lightning_scheduler.info.yml @@ -2,7 +2,7 @@ name: Scheduler core: 8.x type: module description: 'Allows you to schedule changes in moderation state.' -version: '8.x-2.26-dev' +version: '8.x-2.26' package: Lightning dependencies: - content_moderation diff --git a/tests/config/views.view.moderation_history.yml b/tests/config/views.view.moderation_history.yml index 076bf60b3..7860b4d49 100644 --- a/tests/config/views.view.moderation_history.yml +++ b/tests/config/views.view.moderation_history.yml @@ -2,6 +2,7 @@ langcode: en status: true dependencies: module: + - content_moderation - node - user _core: { } @@ -68,7 +69,7 @@ display: field: uid relationship: none group_type: group - admin_label: '' + admin_label: 'Authored by' label: '' exclude: true alter: @@ -133,7 +134,7 @@ display: field: created relationship: none group_type: group - admin_label: '' + admin_label: 'Authored on' label: '' exclude: true alter: @@ -196,11 +197,11 @@ display: plugin_id: field moderation_state: id: moderation_state - table: node_field_revision + table: content_moderation_state_field_revision field: moderation_state - relationship: none + relationship: moderation_state group_type: group - admin_label: '' + admin_label: 'Moderation state' label: '' exclude: false alter: @@ -242,11 +243,10 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - click_sort_column: target_id - type: entity_reference_label - settings: - link: false - group_column: target_id + click_sort_column: value + type: content_moderation_state + settings: { } + group_column: value group_columns: { } group_rows: true delta_limit: 0 @@ -256,7 +256,7 @@ display: multi_type: separator separator: ', ' field_api_classes: false - entity_type: node + entity_type: content_moderation_state entity_field: moderation_state plugin_id: field filters: { } @@ -280,7 +280,17 @@ display: header: { } footer: { } empty: { } - relationships: { } + relationships: + moderation_state: + id: moderation_state + table: node_field_revision + field: moderation_state + relationship: none + group_type: group + admin_label: 'Moderation state' + required: true + entity_type: node + plugin_id: standard arguments: nid: id: nid @@ -289,16 +299,15 @@ display: relationship: none group_type: group admin_label: '' - default_action: 'not found' + default_action: default exception: value: all title_enable: false title: All title_enable: false title: '' - default_argument_type: fixed - default_argument_options: - argument: '' + default_argument_type: node + default_argument_options: { } default_argument_skip_url: false summary_options: base_path: '' @@ -340,7 +349,16 @@ display: position: 1 display_options: display_extenders: { } - path: node/%/moderation-history + path: node/%node/moderation-history + menu: + type: tab + title: History + description: '' + expanded: false + parent: '' + weight: 0 + context: '0' + menu_name: main cache_metadata: max-age: -1 contexts: diff --git a/tests/features/media/filters.feature b/tests/features/media/admin_list.feature similarity index 53% rename from tests/features/media/filters.feature rename to tests/features/media/admin_list.feature index 93121ff1d..7bcbe0d5f 100644 --- a/tests/features/media/filters.feature +++ b/tests/features/media/admin_list.feature @@ -1,6 +1,32 @@ @lightning @api @media Feature: Media content list page + @181ec740 + Scenario: Media filters are present + Given I am logged in as a user with the "media_creator" role + And media entities: + | bundle | name | embed_code | status | field_media_in_library | + | tweet | I'm a tweet | https://twitter.com/50NerdsofGrey/status/757319527151636480 | 1 | 1 | + | instagram | I'm an instagram | https://www.instagram.com/p/BaecNGYAYyP/ | 1 | 1 | + When I visit "/admin/content/media" + Then I should see "Published status" + And I should see "Source" + And I should see "Media name" + And I should see "Language" + + @bd2a222b + Scenario: Media filters are functional + Given I am logged in as a user with the "media_creator" role + And media entities: + | bundle | name | embed_code | status | field_media_in_library | + | tweet | I'm a tweet | https://twitter.com/50NerdsofGrey/status/757319527151636480 | 1 | 1 | + | instagram | I'm an instagram | https://www.instagram.com/p/BaecNGYAYyP/ | 1 | 1 | + When I visit "/admin/content/media" + And I select "Tweet" from "Source" + And I apply the exposed filters + Then I should see "I'm a tweet" + And I should not see "I'm an instagram" + @0207232c Scenario: Media actions are present Given I am logged in as a user with the "media_creator" role diff --git a/tests/fixtures/2.2.2.sql.bz2 b/tests/fixtures/2.2.2.sql.bz2 deleted file mode 100644 index c39201955..000000000 Binary files a/tests/fixtures/2.2.2.sql.bz2 and /dev/null differ diff --git a/tests/fixtures/2.2.6.sql.bz2 b/tests/fixtures/2.2.6.sql.bz2 new file mode 100644 index 000000000..5c80118cd Binary files /dev/null and b/tests/fixtures/2.2.6.sql.bz2 differ diff --git a/tests/modules/upload_bundles_test/upload_bundles_test.info.yml b/tests/modules/upload_bundles_test/upload_bundles_test.info.yml index c50a2897c..f120ae38a 100644 --- a/tests/modules/upload_bundles_test/upload_bundles_test.info.yml +++ b/tests/modules/upload_bundles_test/upload_bundles_test.info.yml @@ -6,4 +6,4 @@ hidden: true dependencies: - lightning_media_image - lightning_page -version: '8.x-2.26-dev' +version: '8.x-2.26' diff --git a/tests/modules/view_mode_test/view_mode_test.info.yml b/tests/modules/view_mode_test/view_mode_test.info.yml index eb62dab5f..33867806a 100644 --- a/tests/modules/view_mode_test/view_mode_test.info.yml +++ b/tests/modules/view_mode_test/view_mode_test.info.yml @@ -6,4 +6,4 @@ hidden: true dependencies: - lightning_core - node -version: '8.x-2.26-dev' +version: '8.x-2.26'